Changeset 157

Timestamp:

10/13/06 19:04:45 (2 years ago)

Author:

dconrad

Message:

Add the stuff in CodecPrivate? for Real Video as an ImageDescriptionExtension?

Files:

• trunk/MatroskaCodecIDs.cpp (modified) (1 diff)
• trunk/MatroskaCodecIDs.h (modified) (3 diffs)

trunk/MatroskaCodecIDs.cpp

@@ -222 +222 @@
-                
-                AddImageDescriptionExtension(imgDesc, imgDescExt, kSampleDescriptionExtensionVobSubIdx);
+                
+                DisposeHandle((Handle) imgDescExt);
+        }
+        return noErr;
+}
+
+ComponentResult DescExt_Real(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);
+                if (codecPrivate == NULL)
+                        return invalidAtomErr;
+                
+                Handle imgDescExt = NewHandle(codecPrivate->GetSize());
+                memcpy(*imgDescExt, codecPrivate->GetBuffer(), codecPrivate->GetSize());
+                
+                AddImageDescriptionExtension(imgDesc, imgDescExt, kSampleDescriptionExtensionReal);
-                
-                DisposeHandle((Handle) imgDescExt);

trunk/MatroskaCodecIDs.h

@@ -66 +66 @@
-        kSampleDescriptionExtensionTheora = 'XdxT',
-        kSampleDescriptionExtensionVobSubIdx = '.IDX',
+        kSampleDescriptionExtensionReal = 'RVex',
-};
-
@@ -142 +143 @@
-ComponentResult DescExt_XiphFLAC(KaxTrackEntry *tr_entry, SampleDescriptionHandle desc, DescExtDirection dir);
-ComponentResult DescExt_VobSub(KaxTrackEntry *tr_entry, SampleDescriptionHandle desc, DescExtDirection dir);
+ComponentResult DescExt_Real(KaxTrackEntry *tr_entry, SampleDescriptionHandle desc, DescExtDirection dir);
-
-struct CodecDescExtFunc {
@@ -153 +155 @@
-        { kAudioFormatXiphFLAC, DescExt_XiphFLAC },
-        { kSubFormatVobSub, DescExt_VobSub },
+        { kVideoFormatReal5, DescExt_Real },
+        { kVideoFormatRealG2, DescExt_Real },
+        { kVideoFormatReal8, DescExt_Real },
+        { kVideoFormatReal9, DescExt_Real },
-};
-