Mercurial > mplayer.hg

changeset 21871:8f5c762ca6d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add support for avc1 in X-QT over RTSP patch by Carl Eugen Hoyos cehoyos at ag.or.at
author gpoirier
date Fri, 12 Jan 2007 19:59:47 +0000
parents cad3e015ddde
children f90e9e0bafa3
files libmpdemux/demux_rtp_codec.cpp
diffstat 1 files changed, 21 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_rtp_codec.cpp	Fri Jan 12 15:45:47 2007 +0000
+++ b/libmpdemux/demux_rtp_codec.cpp	Fri Jan 12 19:59:47 2007 +0000
@@ -86,6 +86,27 @@
     } 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')) {
+      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 &&
+            atomLength > 8 &&
+            atomLength <= INT_MAX-sizeof(BITMAPINFOHEADER)) {
+          bih->biSize = sizeof(BITMAPINFOHEADER)+atomLength-8;
+          sh_video->bih = bih = (BITMAPINFOHEADER*)realloc(bih, bih->biSize);
+          memcpy(bih+1, pos+8, atomLength-8);
+          break;
+        }
+        pos += atomLength;
+      }
+      needVideoFrameRate(demuxer, subsession);
+    }
   } else {
     fprintf(stderr,
 	    "Unknown MPlayer format code for MIME type \"video/%s\"\n",