Changeset 1243

Timestamp:

01/09/10 03:35:20 (8 months ago)

Author:

astrange

Message:

Make MKV import track-enabling code match its comment.

It turns out that many MKV files have no tracks of some
type with 'default' set, so we really do want to always
enable one. This restores the track enabled behavior of
1.1.4, but using the first instead of the last track of
the type.

We still need to respect the forced flag.

Files:

• trunk/MatroskaImportPrivate.cpp (modified) (7 diffs)

trunk/MatroskaImportPrivate.cpp

@@ -235 +235 @@
 ComponentResult MatroskaImport::ReadTracks(KaxTracks &trackEntries)
 {
-        Track firstVideoTrack = NULL; short firstVideoTrackLang = 0;
-        Track firstAudioTrack = NULL; short firstAudioTrackLang = 0;
-        Track firstSubtitleTrack = NULL; short firstSubtitleTrackLang = 0;
+        Track firstVideoTrack = NULL; short firstVideoTrackLang = 0; bool videoEnabled = false;
+        Track firstAudioTrack = NULL; short firstAudioTrackLang = 0; bool audioEnabled = false;
+        Track firstSubtitleTrack = NULL; short firstSubtitleTrackLang = 0; bool subtitleEnabled = false;
         ComponentResult err = noErr;
-        bool foundAnEnabledTrack = false;
         
         if (seenTracks)
@@ -262 +261 @@
                         mkvTrack.type = uint8(type);
                         mkvTrack.defaultDuration = uint32(defaultDuration) / float(timecodeScale) + .5;
+                        mkvTrack.isEnabled = uint8(enabled);
+                        mkvTrack.usesLacing = uint8(lacing);
                         
                         KaxTrackLanguage & trackLang = GetChild<KaxTrackLanguage>(track);
@@ -273 +274 @@
                                         err = AddVideoTrack(track, mkvTrack);
                                         if (err) return err;
+                                        
+                                        if (mkvTrack.isEnabled)
+                                                videoEnabled = true;
                                         
                                         if (firstVideoTrack && qtLang != firstVideoTrackLang)
@@ -287 +291 @@
                                         if (err) return err;
                                         
+                                        if (mkvTrack.isEnabled)
+                                                audioEnabled = true;
+                                        
                                         if (firstAudioTrack && qtLang != firstAudioTrackLang)
                                                 SetTrackAlternate(firstAudioTrack, mkvTrack.theTrack);
@@ -300 +307 @@
                                         if (err) return err;
                                         if (mkvTrack.theTrack == NULL) continue;
+                                        
+                                        if (mkvTrack.isEnabled)
+                                                subtitleEnabled = true;
                                         
                                         if (firstSubtitleTrack && qtLang != firstSubtitleTrackLang)
@@ -317 +327 @@
                                         continue;
                         }
-                        
-                        mkvTrack.isEnabled = uint8(enabled);
-                        mkvTrack.usesLacing = uint8(lacing);
                         
                         if (encodings) {
@@ -362 +369 @@
         for (int i = 0; i < tracks.size(); i++) {
                 SetTrackEnabled(tracks[i].theTrack, tracks[i].isEnabled);
-                if (tracks[i].isEnabled)
-                        foundAnEnabledTrack = true;
         }
         // ffmpeg used to write a TrackDefault of 0 for all tracks
         // 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);
-        }
+        // FIXME properly choose tracks based on forced/default/language flags, and consider turning auto-alternates back on
+        if (!videoEnabled && firstVideoTrack)
+                SetTrackEnabled(firstVideoTrack, 1);
+        if (!audioEnabled && firstAudioTrack)
+                SetTrackEnabled(firstAudioTrack, 1);
+        if (!subtitleEnabled && firstSubtitleTrack)
+                SetTrackEnabled(firstSubtitleTrack, 1);
         
         seenTracks = true;