Changeset 163

Timestamp:

10/15/06 17:42:46 (2 years ago)

Author:

dconrad

Message:

Native MPEG4 video requires the esds atom, so create it from what we have in the Matroska track entry

Files:

• trunk/CommonUtils.c (modified) (1 diff)
• trunk/CommonUtils.h (modified) (1 diff)
• trunk/MatroskaCodecIDs.cpp (modified) (1 diff)
• trunk/MatroskaCodecIDs.h (modified) (6 diffs)
• trunk/ff_private.c (modified) (2 diffs)

trunk/CommonUtils.c

@@ -182 +182 @@
-}
-
+/* write the int32_t data to target & then return a pointer which points after that data */
+uint8_t *write_int32(uint8_t *target, int32_t data)
+{
+        return write_data(target, (uint8_t*)&data, sizeof(data));
+} /* write_int32() */
+
+/* write the int16_t data to target & then return a pointer which points after that data */
+uint8_t *write_int16(uint8_t *target, int16_t data)
+{
+        return write_data(target, (uint8_t*)&data, sizeof(data));
+} /* write_int16() */
+
+/* write the data to the target adress & then return a pointer which points after the written data */
+uint8_t *write_data(uint8_t *target, uint8_t* data, int32_t data_size)
+{
+        if(data_size > 0)
+                memcpy(target, data, data_size);
+        return (target + data_size);
+} /* write_data() */
+

trunk/CommonUtils.h

@@ -22 +22 @@
-short ThreeCharLangCodeToQTLangCode(char *lang);
-
+/* write the int32_t data to target & then return a pointer which points after that data */
+uint8_t *write_int32(uint8_t *target, int32_t data);
+
+/* write the int16_t data to target & then return a pointer which points after that data */
+uint8_t *write_int16(uint8_t *target, int16_t data);
+
+/* write the data to the target adress & then return a pointer which points after the written data */
+uint8_t *write_data(uint8_t *target, uint8_t* data, int32_t data_size);
+
-#ifdef __cplusplus
-}

trunk/MatroskaCodecIDs.cpp

@@ -242 +242 @@
-                
-                AddImageDescriptionExtension(imgDesc, imgDescExt, kSampleDescriptionExtensionReal);
+                
+                DisposeHandle((Handle) imgDescExt);
+        }
+        return noErr;
+}
+
+// the esds atom creation is based off of the routines for it in ffmpeg's movenc.c
+static unsigned int descrLength(unsigned int len)
+{
+    int i;
+    for(i=1; len>>(7*i); i++);
+    return len + 1 + i;
+}
+
+static uint8_t* putDescr(uint8_t *buffer, int tag, unsigned int size)
+{
+    int i= descrLength(size) - size - 2;
+    *buffer++ = tag;
+    for(; i>0; i--)
+       *buffer++ = (size>>(7*i)) | 0x80;
+    *buffer++ = size & 0x7F;
+        return buffer;
+}
+
+// ESDS layout:
+//  + version             (4 bytes)
+//  + ES descriptor 
+//   + Track ID            (2 bytes)
+//   + Flags               (1 byte)
+//   + DecoderConfig descriptor
+//    + Object Type         (1 byte)
+//    + Stream Type         (1 byte)
+//    + Buffersize DB       (3 bytes)
+//    + Max bitrate         (4 bytes)
+//    + VBR/Avg bitrate     (4 bytes)
+//    + DecoderSpecific info descriptor
+//     + codecPrivate        (codecPrivate->GetSize())
+//   + SL descriptor
+//    + dunno               (1 byte)
+
+ComponentResult DescExt_mp4v(KaxTrackEntry *tr_entry, SampleDescriptionHandle desc, DescExtDirection dir)
+{
+        if (!tr_entry || !desc) return paramErr;
+        ImageDescriptionHandle imgDesc = (ImageDescriptionHandle) desc;
+        
+        if (dir == kToSampleDescription) {
+                KaxCodecPrivate *codecPrivate = FindChild<KaxCodecPrivate>(*tr_entry);
+                KaxTrackNumber *trackNum = FindChild<KaxTrackNumber>(*tr_entry);
+                
+                int vosLen = codecPrivate ? codecPrivate->GetSize() : 0;
+                int trackID = trackNum ? uint16(*trackNum) : 1;
+                int decoderSpecificInfoLen = vosLen ? descrLength(vosLen) : 0;
+                
+                Handle imgDescExt = NewHandle(4 + descrLength(3 + descrLength(13 + decoderSpecificInfoLen) + descrLength(1)));
+                UInt8 *pos = (UInt8 *) *imgDescExt;
+                
+                pos = write_int32(pos, 0);              // version
+                
+                // ES Descriptor
+                pos = putDescr(pos, 0x03, 3 + descrLength(13 + decoderSpecificInfoLen) + descrLength(1));
+                pos = write_int16(pos, EndianS16_NtoB(trackID));
+                *pos++ = 0;             // no flags
+                
+                // DecoderConfig descriptor
+                pos = putDescr(pos, 0x04, 13 + decoderSpecificInfoLen);
+                
+                // Object type indication, see http://gpac.sourceforge.net/tutorial/mediatypes.htm
+                *pos++ = 0x20;
+                
+                // streamtype (video)
+                *pos++ = 0x11;
+                
+                // 3 bytes: buffersize DB (not sure how to get easily)
+                *pos++ = 0;
+                pos = write_int16(pos, 0);
+                
+                // max bitrate, not sure how to get easily
+                pos = write_int32(pos, 0);
+                
+                // vbr
+                pos = write_int32(pos, 0);
+                
+                if (vosLen) {
+                        pos = putDescr(pos, 0x05, vosLen);
+                        pos = write_data(pos, codecPrivate->GetBuffer(), vosLen);
+                }
+                
+                // SL descriptor
+                pos = putDescr(pos, 0x06, 1);
+                *pos++ = 0x02;
+                
+                AddImageDescriptionExtension(imgDesc, imgDescExt, 'esds');
-                
-                DisposeHandle((Handle) imgDescExt);

trunk/MatroskaCodecIDs.h

@@ -85 +85 @@
-        kSubFormatVobSub                        = 'SPU ',
-        
-aren't official, nor have any decoder suppor
+don't have decoder support ye
-        kMPEG1VisualCodecType                   = 'mp1v',
-        kMPEG2VisualCodecType                   = 'mp2v',
@@ -115 +115 @@
-
-
-
-// these functions modify the AudioStreamBasicDescription properly for the audio format
-ComponentResult ASBDExt_AC3(KaxTrackEntry *tr_entry, AudioStreamBasicDescription *asbd);
-ComponentResult ASBDExt_LPCM(KaxTrackEntry *tr_entry, AudioStreamBasicDescription *asbd);
-ComponentResult ASBDExt_AAC(KaxTrackEntry *tr_entry, AudioStreamBasicDescription *asbd);
+
-
-struct ASBDExtensionFunc {
@@ -126 +126 @@
-};
-
-static 
+
-        { kAudioFormatMPEG4AAC, ASBDExt_AAC },
-        { kAudioFormatAC3, ASBDExt_AC3 },
@@ -144 +144 @@
-ComponentResult DescExt_VobSub(KaxTrackEntry *tr_entry, SampleDescriptionHandle desc, DescExtDirection dir);
-ComponentResult DescExt_Real(KaxTrackEntry *tr_entry, SampleDescriptionHandle desc, DescExtDirection dir);
+ComponentResult DescExt_mp4v(KaxTrackEntry *tr_entry, SampleDescriptionHandle desc, DescExtDirection dir);
+
-
-struct CodecDescExtFunc {
@@ -150 +152 @@
-};
-
-static 
+
-        { kH264CodecType, DescExt_H264 },
-        { kAudioFormatXiphVorbis, DescExt_XiphVorbis },
@@ -159 +161 @@
-        { kVideoFormatReal8, DescExt_Real },
-        { kVideoFormatReal9, DescExt_Real },
+        { kMPEG4VisualCodecType, DescExt_mp4v },
-};
+
-
-short GetTrackLanguage(KaxTrackEntry *tr_entry);

trunk/ff_private.c

@@ -24 +24 @@
-#include "avcodec.h"
-#include "Codecprintf.h"
+#include "CommonUtils.h"
-
-#include <CoreServices/CoreServices.h>
@@ -423 +424 @@
-        return result;
-} /* create_extension() */
-
-/* write the int32_t data to target & then return a pointer which points after that data */
-uint8_t *write_int32(uint8_t *target, int32_t data)
-{
-        return write_data(target, (uint8_t*)&data, sizeof(data));
-} /* write_int32() */
-
-/* write the int16_t data to target & then return a pointer which points after that data */
-uint8_t *write_int16(uint8_t *target, int16_t data)
-{
-        return write_data(target, (uint8_t*)&data, sizeof(data));
-} /* write_int16() */
-
-/* write the data to the target adress & then return a pointer which points after the written data */
-uint8_t *write_data(uint8_t *target, uint8_t* data, int32_t data_size)
-{
-        if(data_size > 0)
-                memcpy(target, data, data_size);
-        return (target + data_size);
-} /* write_data() */
-
-
-/* Add the meta data that lavf exposes to the movie */