[MPlayer-dev-eng] [PATCH]Play svq3 in X-QT over rtsp

[Carl Eugen Hoyos]

Hi!

Attached patch allows video playback for following stream (SVQ3 in X-QT):
rtsp://quick.global.playstream.com/esurancemedia/green_256k.mov

Carl Eugen
-------------- next part --------------
Index: libmpdemux/demux_rtp_codec.cpp
===================================================================
--- libmpdemux/demux_rtp_codec.cpp	(Revision 22001)
+++ libmpdemux/demux_rtp_codec.cpp	(Arbeitskopie)
@@ -88,16 +88,17 @@
     } while (!parseQTState_video(qtRTPSource->qtState, fourcc));
 
     bih->biCompression = sh_video->format = fourcc;
-    bih->biWidth = qtRTPSource->qtState.width;
-    bih->biHeight = qtRTPSource->qtState.height;
-    if (bih->biCompression == mmioFOURCC('a','v','c','1')) {
+    bih->biWidth = sh_video->disp_w = qtRTPSource->qtState.width;
+    bih->biHeight = sh_video->disp_h = qtRTPSource->qtState.height;
+    if (bih->biCompression == mmioFOURCC('a','v','c','1') ||
+        bih->biCompression == mmioFOURCC('S','V','Q','3')) {
       uint8_t *pos = (uint8_t*)qtRTPSource->qtState.sdAtom + 86;
       uint8_t *endpos = (uint8_t*)qtRTPSource->qtState.sdAtom
                         + qtRTPSource->qtState.sdAtomSize;
       while (pos+8 < endpos) {
         unsigned atomLength = pos[0]<<24 | pos[1]<<16 | pos[2]<<8 | pos[3];
         if (atomLength == 0 || atomLength > endpos-pos) break;
-        if (memcmp(pos+4, "avcC", 4) == 0 &&
+        if ((memcmp(pos+4, "avcC", 4) == 0 || memcmp(pos+4, "SMI ", 4) == 0) &&
             atomLength > 8 &&
             atomLength <= INT_MAX-sizeof(BITMAPINFOHEADER)) {
           bih->biSize = sizeof(BITMAPINFOHEADER)+atomLength-8;