Changeset 857

Timestamp:

04/20/08 13:09:23 (5 months ago)

Author:

astrange

Message:

Write the correct clap/pasp atoms, fixing 16:9 video when people turn on clean aperture mode. There are still problems with anamorphic 4:3, subtitles, and clean aperture, so don't do that.
Some experiment in recovering from stupidly rounded fractions in AVI video headers, but I don't know if we can change timebases randomly like this...

Files:

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

trunk/MatroskaImportPrivate.cpp

@@ -421 +421 @@
-                        width = IntToFixed(uint32(disp_width));
-                        height = IntToFixed(uint32(disp_height));
-
+               
-        } else if (pxl_width.ValueIsSet() && pxl_height.ValueIsSet()) {
-                width = IntToFixed(uint32(pxl_width));
@@ -449 +449 @@
-    (*imgDesc)->clutID = -1;
-        
-
+, IntToFixed(uint32(pxl_width)), IntToFixed(uint32(pxl_height))
-        mkvTrack.desc = (SampleDescriptionHandle) imgDesc;
-        

trunk/ff_private.c

@@ -117 +117 @@
-} /* prepare_track() */
-
+/* A very large percent of movies have NTSC timebases (30/1.001) with misrounded fractions, so let's recover them. */
+static void rescue_ntsc_timebase(AVRational *base)
+{
+        av_reduce(&base->num, &base->den, base->num, base->den, INT_MAX);
+        
+        double fTimebase = av_q2d(*base), nearest_ntsc = floor(fTimebase * 1001. + .5) / 1001.;
+        const double small_interval = 1./120.;
+        
+        if (fabs(fTimebase - nearest_ntsc) < small_interval)
+        {
+                base->num = 1001;
+                base->den = (1001. / fTimebase) + .5;
+        }
+}
+
-/* Initializes the map & targetTrack to receive video data */
-void initialize_video_map(NCStream *map, Track targetTrack, Handle dataRef, OSType dataRefType, AVPacket *firstFrame)
@@ -129 +144 @@
-        
-        map->base = map->str->time_base;
-
+
+
+
-                /* if that's the case, then we probably ran out of timevalues!
-                * a timescale of 100000 allows a movie duration of 5-6 hours
@@ -530 +547 @@
-}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        
-        **clap = (CleanApertureImageDescriptionExtension){EndianU32_NtoB(wN), EndianU32_NtoB(wD),
-                                                                                                      EndianU32_NtoB(hN), EndianU32_NtoB(hD), 
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        AddImageDescriptionExtension(imgDesc, (Handle)clap, kCleanApertureImageDescriptionExtension);
+        AddImageDescriptionExtension(imgDesc, (Handle)pasp, kPixelAspectRatioImageDescriptionExtension);
-        
-        DisposeHandle((Handle)clap);
+        DisposeHandle((Handle)pasp);
-}
-
@@ -586 +616 @@
-                        
-                        initialize_video_map(&map[j], track, dataRef, dataRefType, storage->firstFrames + j);
-
+, IntToFixed(st->codec->width), IntToFixed(st->codec->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);
-cleanW, Fixed clean
+displayW, Fixed displayH, Fixed pixelW, Fixed pixel
-
-uint8_t *write_int32(uint8_t *target, int32_t data);