Changeset 1237

Timestamp:

12/16/09 18:53:22 (8 months ago)

Author:

astrange

Message:

Merge trunk's last-minute fixes to release branch.

Location:

branches/perian-1.2

Files:

• . (modified) (1 prop)
• CommonUtils.c (modified) (1 diff)
• FFissionCodec/FFissionDecoder.cpp (modified) (6 diffs)
• MatroskaImportPrivate.cpp (modified) (9 diffs)
• Subtitles/SubImport.mm (modified) (1 diff)

branches/perian-1.2/CommonUtils.c

@@ -572 +572 @@
         static CGColorSpaceRef sRGBColorSpace;
         int unlock = PerianInitEnter(&loaded);
-        CFStringRef *srgb;
 
         if (!loaded) {
                 loaded = TRUE;
 
-                if ((srgb = dlsym(RTLD_NEXT, "kCGColorSpaceSRGB"))) {
-                        sRGBColorSpace = CGColorSpaceCreateWithName(*srgb); // does not exist on 10.4
+                if (kCGColorSpaceSRGB) {
+                        sRGBColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); // does not exist on 10.4
                 } else {
                         sRGBColorSpace = CreateColorSpaceFromSystemICCProfileName(CFSTR("sRGB Profile.icc"));

branches/perian-1.2/FFissionCodec/FFissionDecoder.cpp

@@ -129 +129 @@
         int initialMap[6] = {0, 1, 2, 3, 4, 5};
         memcpy(fullChannelMap, initialMap, sizeof(initialMap));
+        
+        avcodec_get_context_defaults2(avContext, CODEC_TYPE_AUDIO);
 }
 
@@ -141 +143 @@
 void FFissionDecoder::Initialize(const AudioStreamBasicDescription* inInputFormat, const AudioStreamBasicDescription* inOutputFormat, const void* inMagicCookie, UInt32 inMagicCookieByteSize)
 {
-        if (inMagicCookieByteSize > 0)
+        if (inMagicCookie)
                 SetMagicCookie(inMagicCookie, inMagicCookieByteSize);
                 
@@ -181 +183 @@
         
         CloseAVCodec();
+        
+        avContext->extradata_size = 0;
+        avContext->extradata = NULL;
 }
 
@@ -201 +206 @@
                         
                 case kAudioFormatXiphVorbis:
-                        avContext->extradata_size = ConvertXiphVorbisCookie();
-                        avContext->extradata = magicCookie;
+                        if (!avContext->extradata) {
+                                avContext->extradata_size = ConvertXiphVorbisCookie();
+                                avContext->extradata = magicCookie;
+                        }
                         break;
                         
@@ -251 +258 @@
         
         int len = headerSize[0] + headerSize[1] + headerSize[2];
-        Byte *newCookie = new Byte[len + len/255 + 64];
+        Byte *newCookie = new Byte[len + len/255 + 64 + FF_INPUT_BUFFER_PADDING_SIZE];
         ptr = newCookie;
         
@@ -336 +343 @@
         CodecID codecID = GetCodecID(mInputFormat.mFormatID);
         avCodec = avcodec_find_decoder(codecID);
-        
-        avcodec_get_context_defaults2(avContext, CODEC_TYPE_AUDIO);
         
         avContext->sample_rate = mInputFormat.mSampleRate;

branches/perian-1.2/MatroskaImportPrivate.cpp

@@ -235 +235 @@
 ComponentResult MatroskaImport::ReadTracks(KaxTracks &trackEntries)
 {
-        Track firstVideoTrack = NULL;
-        Track firstAudioTrack = NULL;
-        Track firstSubtitleTrack = NULL;
+        Track firstVideoTrack = NULL; short firstVideoTrackLang = 0;
+        Track firstAudioTrack = NULL; short firstAudioTrackLang = 0;
+        Track firstSubtitleTrack = NULL; short firstSubtitleTrackLang = 0;
         ComponentResult err = noErr;
+        bool foundAnEnabledTrack = false;
         
         if (seenTracks)
@@ -262 +263 @@
                         mkvTrack.defaultDuration = uint32(defaultDuration) / float(timecodeScale) + .5;
                         
+                        KaxTrackLanguage & trackLang = GetChild<KaxTrackLanguage>(track);
+                        KaxTrackName & trackName = GetChild<KaxTrackName>(track);
+                        KaxContentEncodings * encodings = FindChild<KaxContentEncodings>(track);
+                        
+                        short qtLang = ISO639_2ToQTLangCode(string(trackLang).c_str());
+                        SetMediaLanguage(mkvTrack.theMedia, qtLang);
+                        
                         switch (uint8(type)) {
                                 case track_video:
@@ -268 +276 @@
                                         if (err) return err;
                                         
-                                        if (firstVideoTrack)
+                                        if (firstVideoTrack && qtLang != firstVideoTrackLang)
                                                 SetTrackAlternate(firstVideoTrack, mkvTrack.theTrack);
-                                        else
+                                        else {
                                                 firstVideoTrack = mkvTrack.theTrack;
+                                                firstVideoTrackLang = qtLang;
+                                        }
                                         break;
                                         
@@ -279 +289 @@
                                         if (err) return err;
                                         
-                                        if (firstAudioTrack)
+                                        if (firstAudioTrack && qtLang != firstAudioTrackLang)
                                                 SetTrackAlternate(firstAudioTrack, mkvTrack.theTrack);
-                                        else
+                                        else {
                                                 firstAudioTrack = mkvTrack.theTrack;
+                                                firstAudioTrackLang = qtLang;
+                                        }
                                         break;
                                         
@@ -291 +303 @@
                                         if (mkvTrack.theTrack == NULL) continue;
                                         
-                                        if (firstSubtitleTrack)
+                                        if (firstSubtitleTrack && qtLang != firstSubtitleTrackLang)
                                                 SetTrackAlternate(firstSubtitleTrack, mkvTrack.theTrack);
-                                        else
+                                        else {
                                                 firstSubtitleTrack = mkvTrack.theTrack;
+                                                firstSubtitleTrackLang = qtLang;
+                                        }
                                         break;
                                         
@@ -306 +320 @@
                         }
                         
-                        KaxTrackLanguage & trackLang = GetChild<KaxTrackLanguage>(track);
-                        KaxTrackName & trackName = GetChild<KaxTrackName>(track);
-                        KaxContentEncodings * encodings = FindChild<KaxContentEncodings>(track);
+                        mkvTrack.isEnabled = uint8(enabled);
+                        mkvTrack.usesLacing = uint8(lacing);
                         
                         if (encodings) {
@@ -315 +328 @@
                                 if (err) continue;
                         }
-                        
-                        long qtLang = ISO639_2ToQTLangCode(string(trackLang).c_str());
-                        SetMediaLanguage(mkvTrack.theMedia, qtLang);
-                        
-                        mkvTrack.isEnabled = uint8(enabled);
-                        mkvTrack.usesLacing = uint8(lacing);
                         
                         if (!trackName.IsDefaultValue()) {
@@ -355 +362 @@
         for (int i = 0; i < tracks.size(); i++) {
                 SetTrackEnabled(tracks[i].theTrack, tracks[i].isEnabled);
-        }
-        // ensure that at least one track in each alternate group (type) is enabled
+                if (tracks[i].isEnabled)
+                        foundAnEnabledTrack = true;
+        }
         // ffmpeg used to write a TrackDefault of 0 for all tracks
-        for (int i = 0; i < tracks.size(); i++) {
-                if (!GetTrackEnabled(tracks[i].theTrack)) {
-                        Track alternate = GetTrackAlternate(tracks[i].theTrack);
-                        while (alternate != tracks[i].theTrack && !GetTrackEnabled(alternate))
-                                alternate = GetTrackAlternate(alternate);
-                        if (alternate == tracks[i].theTrack)
-                                SetTrackEnabled(tracks[i].theTrack, 1);
-                }
-        }
+        // ensure that at least one track of each media type is enabled, if none were originally
+        // this picks the first track, which may not be the best, but the situation is quite rare anyway
+        if (!foundAnEnabledTrack) {
+                if (firstVideoTrack)
+                        SetTrackEnabled(firstVideoTrack, 1);
+                if (firstAudioTrack)
+                        SetTrackEnabled(firstAudioTrack, 1);
+                if (firstSubtitleTrack)
+                        SetTrackEnabled(firstSubtitleTrack, 1);
+        }
+        
         seenTracks = true;
         return noErr;
@@ -626 +636 @@
                 
                 PtrAndHand(&emptyDataRefExtension[0], mkvTrack.subDataRefHandler, sizeof(emptyDataRefExtension));
-                                
+
                 mkvTrack.theTrack = CreatePlaintextSubTrack(theMovie, imgDesc, GetMovieTimeScale(theMovie), mkvTrack.subDataRefHandler, HandleDataHandlerSubType, (*imgDesc)->cType, NULL, movieBox);
                 if (mkvTrack.theTrack == NULL)

branches/perian-1.2/Subtitles/SubImport.mm

@@ -71 +71 @@
 static void AppendSRGBProfile(ImageDescriptionHandle imgDesc)
 {
+        if (!(*CGColorSpaceCopyICCProfile))
+                return; //10.4 weak symbol check
+        
         CGColorSpaceRef cSpace = GetSRGBColorSpace();
         CFDataRef cSpaceICC = CGColorSpaceCopyICCProfile(cSpace);