Changeset 853

Timestamp:

04/19/08 23:46:50 (3 months ago)

Author:

astrange

Message:

ff_private: By popular request, anamorphic AVI!
Matroska: Merge duplicate code, delete a comment I accidentally copied.

Files:

• trunk/MatroskaCodecIDs.cpp (modified) (1 diff)
• trunk/MatroskaImportPrivate.cpp (modified) (4 diffs)
• trunk/ff_private.c (modified) (3 diffs)
• trunk/ff_private.h (modified) (1 diff)

trunk/MatroskaCodecIDs.cpp

@@ -143 +143 @@
-        
-        if (dir == kToSampleDescription) {
-                // WAVFORMATEX is stored in the private data, and some codecs (WMA) need it to decode
-                KaxCodecPrivate & codecPrivate = GetChild<KaxCodecPrivate>(*tr_entry);
-                

trunk/MatroskaImportPrivate.cpp

@@ -51 +51 @@
-extern "C" {
-#include "avutil.h"
+#define CodecType AVCodecType
+#include "ff_private.h"
+#undef CodecType        
-}
-
@@ -406 +409 @@
-        ComponentResult err = noErr;
-        ImageDescriptionHandle imgDesc;
-        CleanApertureImageDescriptionExtension **clap = (CleanApertureImageDescriptionExtension**)NewHandle(sizeof(CleanApertureImageDescriptionExtension));
-        Fixed width, height;
-        
@@ -439 +441 @@
-                return invalidTrack;
-        }
-
-
-
+
-        mkvTrack.theTrack = NewMovieTrack(theMovie, width, height, kNoVolume);
-        if (mkvTrack.theTrack == NULL)
@@ -461 +461 @@
-    (*imgDesc)->clutID = -1;
-        
-
-
-
-
+
-        mkvTrack.desc = (SampleDescriptionHandle) imgDesc;
-        

trunk/ff_private.c

@@ -518 +518 @@
-}
-
+static void get_track_dimensions_for_codec(AVCodecContext *codec, Fixed *fixedWidth, Fixed *fixedHeight)
+{       
+        *fixedHeight = IntToFixed(codec->height);
+
+        if (!codec->sample_aspect_ratio.num) *fixedWidth = IntToFixed(codec->width);
+        else *fixedWidth = FloatToFixed(codec->width * av_q2d(codec->sample_aspect_ratio));
+}
+
+void set_track_clean_aperture_ext(ImageDescriptionHandle imgDesc, Fixed cleanW, Fixed cleanH)
+{
+        CleanApertureImageDescriptionExtension **clap = (CleanApertureImageDescriptionExtension**)NewHandle(sizeof(CleanApertureImageDescriptionExtension));
+        
+        int wN, wD, hN, hD;
+        
+        av_reduce(&wN, &wD, cleanW, fixed1, UINT_MAX);
+        av_reduce(&hN, &hD, cleanH, fixed1, UINT_MAX);
+        
+        **clap = (CleanApertureImageDescriptionExtension){EndianU32_NtoB(wN), EndianU32_NtoB(wD),
+                                                                                                      EndianU32_NtoB(hN), EndianU32_NtoB(hD), 
+                                                                                                          EndianU32_NtoB(0), EndianU32_NtoB(1),
+                                                                                                          EndianU32_NtoB(0), EndianU32_NtoB(1)};
+        
+        AddImageDescriptionExtension(imgDesc, (Handle)clap, kCleanApertureImageDescriptionExtension);
+        
+        DisposeHandle((Handle)clap);
+}
+
-/* This function prepares the movie to receivve the movie data,
- * After success, *out_map points to a valid stream maping
@@ -544 +571 @@
-                
-                if(st->codec->codec_type == CODEC_TYPE_VIDEO) {
-
+
+
+
+
-
-            // XXX Support for 'old' NUV files, that didn't put the codec_tag in the file. 
@@ -552 +582 @@
-                        
-                        initialize_video_map(&map[j], track, dataRef, dataRefType, storage->firstFrames + j);
+                        set_track_clean_aperture_ext((ImageDescriptionHandle)map[j].sampleHdl, width, height);
-                } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
-                        if (st->codec->sample_rate > 0) {

trunk/ff_private.h

@@ -111 +111 @@
-uint8_t *create_cookie(AVCodecContext *codec, size_t *cookieSize, UInt32 formatID);
-Handle create_strf_ext(AVCodecContext *codec);
+void set_track_clean_aperture_ext(ImageDescriptionHandle imgDesc, Fixed cleanW, Fixed cleanH);
-
-uint8_t *write_int32(uint8_t *target, int32_t data);