mirror of https://github.com/mpv-player/mpv
Handle X-QT extradata in a slightly more correct way
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22827 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
91e150c019
commit
927cde6251
|
@ -106,18 +106,15 @@ void rtpCodecInitialize_video(demuxer_t* demuxer,
|
||||||
bih->biCompression = sh_video->format = fourcc;
|
bih->biCompression = sh_video->format = fourcc;
|
||||||
bih->biWidth = qtRTPSource->qtState.width;
|
bih->biWidth = qtRTPSource->qtState.width;
|
||||||
bih->biHeight = qtRTPSource->qtState.height;
|
bih->biHeight = qtRTPSource->qtState.height;
|
||||||
if (bih->biCompression == mmioFOURCC('a','v','c','1') ||
|
|
||||||
bih->biCompression == mmioFOURCC('m','p','4','v') ||
|
|
||||||
bih->biCompression == mmioFOURCC('S','V','Q','3')) {
|
|
||||||
uint8_t *pos = (uint8_t*)qtRTPSource->qtState.sdAtom + 86;
|
uint8_t *pos = (uint8_t*)qtRTPSource->qtState.sdAtom + 86;
|
||||||
uint8_t *endpos = (uint8_t*)qtRTPSource->qtState.sdAtom
|
uint8_t *endpos = (uint8_t*)qtRTPSource->qtState.sdAtom
|
||||||
+ qtRTPSource->qtState.sdAtomSize;
|
+ qtRTPSource->qtState.sdAtomSize;
|
||||||
while (pos+8 < endpos) {
|
while (pos+8 < endpos) {
|
||||||
unsigned atomLength = pos[0]<<24 | pos[1]<<16 | pos[2]<<8 | pos[3];
|
unsigned atomLength = pos[0]<<24 | pos[1]<<16 | pos[2]<<8 | pos[3];
|
||||||
if (atomLength == 0 || atomLength > endpos-pos) break;
|
if (atomLength == 0 || atomLength > endpos-pos) break;
|
||||||
if ((!memcmp(pos+4, "avcC", 4) ||
|
if ((!memcmp(pos+4, "avcC", 4) && fourcc==mmioFOURCC('a','v','c','1') ||
|
||||||
!memcmp(pos+4, "esds", 4) ||
|
!memcmp(pos+4, "esds", 4) ||
|
||||||
!memcmp(pos+4, "SMI ", 4)) &&
|
!memcmp(pos+4, "SMI ", 4) && fourcc==mmioFOURCC('S','V','Q','3')) &&
|
||||||
atomLength > 8) {
|
atomLength > 8) {
|
||||||
sh_video->bih = bih =
|
sh_video->bih = bih =
|
||||||
insertVideoExtradata(bih, pos+8, atomLength-8);
|
insertVideoExtradata(bih, pos+8, atomLength-8);
|
||||||
|
@ -125,7 +122,6 @@ void rtpCodecInitialize_video(demuxer_t* demuxer,
|
||||||
}
|
}
|
||||||
pos += atomLength;
|
pos += atomLength;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
needVideoFrameRate(demuxer, subsession);
|
needVideoFrameRate(demuxer, subsession);
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
|
|
Loading…
Reference in New Issue