[MPlayer-cvslog] r22354 - trunk/libmpdemux/demux_rtp_codec.cpp

nicodvb subversion at mplayerhq.hu
Mon Feb 26 22:54:53 CET 2007


Author: nicodvb
Date: Mon Feb 26 22:54:52 2007
New Revision: 22354

Modified:
   trunk/libmpdemux/demux_rtp_codec.cpp

Log:
copy the content of QDM2 atom as extradata for ffqdm2 playback; patch by Carl Eugen Hoyos

Modified: trunk/libmpdemux/demux_rtp_codec.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp_codec.cpp	(original)
+++ trunk/libmpdemux/demux_rtp_codec.cpp	Mon Feb 26 22:54:52 2007
@@ -238,6 +238,25 @@ void rtpCodecInitialize_audio(demuxer_t*
 
     wf->wFormatTag = sh_audio->format = fourcc;
     wf->nChannels = numChannels;
+
+    uint8_t *pos = (uint8_t*)qtRTPSource->qtState.sdAtom + 52;
+    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, "wave", 4) && fourcc==mmioFOURCC('Q','D','M','2') &&
+          atomLength > 8 &&
+          atomLength <= INT_MAX) {
+        sh_audio->codecdata = (unsigned char*) malloc(atomLength-8);
+        if (sh_audio->codecdata) {
+          memcpy(sh_audio->codecdata, pos+8, atomLength-8);
+          sh_audio->codecdata_len = atomLength-8;
+        }
+        break;
+      }
+      pos += atomLength;
+    }
   } else {
     fprintf(stderr,
 	    "Unknown MPlayer format code for MIME type \"audio/%s\"\n",



More information about the MPlayer-cvslog mailing list