Changeset 564

Timestamp:

06/11/07 16:09:44 (1 year ago)

Author:

dconrad

Message:

Set an autorelease pool in MatroskaTrack::FinishTrack?() so we don't leak sub lines.
Make sure to destroy tracks if we fail at creating their media.
Pass errors in movie setup up correctly to be returned. Should fix #100.

Files:

• trunk/MatroskaImport.cpp (modified) (2 diffs)
• trunk/MatroskaImport.h (modified) (2 diffs)
• trunk/MatroskaImportPrivate.cpp (modified) (22 diffs)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (1 diff)
• trunk/SubImport.mm (modified) (1 diff)

trunk/MatroskaImport.cpp

@@ -235 +235 @@
-                                                                                          long inFlags, long *outFlags)
-{
+        ComponentResult err = noErr;
-        this->dataRef = dataRef;
-        this->dataRefType = dataRefType;
@@ -251 +252 @@
-                        return invalidMovie;
-                
-
+
+
-                
-                // SetupMovie() couldn't find any level one elements, so nothing to import

trunk/MatroskaImport.h

@@ -205 +205 @@
-        // create all the tracks and their sample descriptions as described by the file header
-        // also create chapters if any. Leaves el_l1 pointing to the first cluster, unread.
-void
+ComponentResult
-        
-        // This finds the next level 1 element and both replaces the el_l1 variable with it and
@@ -212 +212 @@
-        
-        // sets up timescale & file name metadata
-void
+ComponentResult
-        
-        // sets up all the movie tracks and media
-void
+ComponentResult
-        
-        // Creates a chapter track, but doesn't actually add the chapter reference to the other
-        // enabled tracks in case some weird file has this element before the Tracks element
-void
+ComponentResult
-        
-        // Activates any attached fonts, ignores other attachment types for now
-void
+ComponentResult
-        
-        // Fills the levelOneElements vector with the positions of the elements in the seek head
-void
+ComponentResult
-        
-        // These three are called from ReadTracks to set up a track of the specific type, 

trunk/MatroskaImportPrivate.cpp

@@ -92 +92 @@
-}
-
-
-
+
+
+
-        // once we've read the Tracks and Segment Info elements and Chapters if it's in the seek head,
-        // we don't need to read any more of the file
@@ -99 +100 @@
-        
-        el_l0 = aStream->FindNextID(KaxSegment::ClassInfos, ~0);
-
+ err
-        
-        segmentOffset = static_cast<KaxSegment *>(el_l0)->GetDataStart();
@@ -111 +112 @@
-                if (EbmlId(*el_l1) == KaxInfo::ClassInfos.GlobalId) {
-                        el_l1->Read(*aStream, KaxInfo::ClassInfos.Context, upperLevel, dummyElt, true);
-
+err = 
-                        
-                } else if (EbmlId(*el_l1) == KaxTracks::ClassInfos.GlobalId) {
-                        el_l1->Read(*aStream, KaxTracks::ClassInfos.Context, upperLevel, dummyElt, true);
-
+err = 
-                        
-                } else if (EbmlId(*el_l1) == KaxChapters::ClassInfos.GlobalId) {
-                        el_l1->Read(*aStream, KaxChapters::ClassInfos.Context, upperLevel, dummyElt, true);
-
+err = 
-                        
-                } else if (EbmlId(*el_l1) == KaxAttachments::ClassInfos.GlobalId) {
-                        el_l1->Read(*aStream, KaxAttachments::ClassInfos.Context, upperLevel, dummyElt, true);
-
+err = 
-                        
-                } else if (EbmlId(*el_l1) == KaxSeekHead::ClassInfos.GlobalId) {
-                        el_l1->Read(*aStream, KaxSeekHead::ClassInfos.Context, upperLevel, dummyElt, true);
-
+err = 
-                        
-                } else if (EbmlId(*el_l1) == KaxCluster::ClassInfos.GlobalId) {
@@ -133 +134 @@
-                        done = true;
-                }
+                
+                if (err) return err;
-        }
-        
@@ -144 +147 @@
-                }
-        }
+        
+        return err;
-}
-
@@ -174 +179 @@
-}
-
-void
+ComponentResult
-{
-        KaxDuration & duration = GetChild<KaxDuration>(segmentInfo);
@@ -209 +214 @@
-                QTMetaDataRelease(movieMetaData);
-        }
-
-
-
+
+
+
+
-{
-        Track firstVideoTrack = NULL;
-        Track firstAudioTrack = NULL;
-        Track firstSubtitleTrack = NULL;
+        ComponentResult err = noErr;
-        
-        // Since creating a subtitle track requires a video track to have already been created
@@ -237 +244 @@
-                                case track_video:
-                                        if (pass == 2) continue;
-
+
+
-                                        
-                                        if (firstVideoTrack)
@@ -247 +255 @@
-                                case track_audio:
-                                        if (pass == 2) continue;
-
+
+
-                                        
-                                        if (firstAudioTrack)
@@ -257 +266 @@
-                                case track_subtitle:
-                                        if (pass == 1) continue;
-
+
+
-                                        
-                                        if (firstSubtitleTrack)
@@ -285 +295 @@
-                        if (!trackName.IsDefaultValue()) {
-                                QTMetaDataRef trackMetaData;
-OSStatus 
+
-                                
-                                if (err == noErr) {
@@ -317 +327 @@
-                SetTrackEnabled(tracks[i].theTrack, tracks[i].isEnabled);
-        }
+        return noErr;
-}
-
@@ -367 +378 @@
-        
-        mkvTrack.theMedia = NewTrackMedia(mkvTrack.theTrack, 'vide', GetMovieTimeScale(theMovie), dataRef, dataRefType);
-
+
+
-                return GetMoviesError();
+        }
-        
-        imgDesc = (ImageDescriptionHandle) NewHandleClear(sizeof(ImageDescription));
@@ -414 +427 @@
-        
-        mkvTrack.theMedia = NewTrackMedia(mkvTrack.theTrack, 'soun', GetMovieTimeScale(theMovie), dataRef, dataRefType);
-
+
+
-                return GetMoviesError();
+        }
-        
-        KaxTrackAudio & audioTrack = GetChild<KaxTrackAudio>(kaxTrack);
@@ -534 +549 @@
-}
-
-void
+ComponentResult
-{
-        KaxEditionEntry & edition = GetChild<KaxEditionEntry>(chapterEntries);
@@ -542 +557 @@
-        if (chapterTrack == NULL) {
-                Codecprintf(NULL, "MKV: Error creating chapter track %d\n", GetMoviesError());
-
+ GetMoviesError()
-        }
-        
@@ -559 +574 @@
-        if (chapterMedia == NULL) {
-                Codecprintf(NULL, "MKV: Error creating chapter media %d\n", GetMoviesError());
-
+
+
-        }
-        
@@ -635 +651 @@
-}
-
-void
+ComponentResult
-{
-        KaxAttached *attachedFile = FindChild<KaxAttached>(attachments);
@@ -655 +671 @@
-                attachedFile = &GetNextChild<KaxAttached>(attachments, *attachedFile);
-        }
-
-
-
+
+
+
+
-{
-        KaxSeek *seekEntry = FindChild<KaxSeek>(seekHead);
@@ -667 +684 @@
-                if (itr->GetID() == KaxSeekHead::ClassInfos.GlobalId && 
-                        itr->segmentPos + segmentOffset == currPos)
-
+ noErr
-        }
-        
@@ -699 +716 @@
-        
-        sort(levelOneElements.begin(), levelOneElements.end());
+        
+        return noErr;
-}
-
@@ -1059 +1078 @@
-void MatroskaTrack::FinishTrack()
-{
+        CXXAutoreleasePool pool;
-        
-        if (type == track_subtitle && !is_vobsub)

trunk/Perian.xcodeproj/project.pbxproj

@@ -668 +668 @@
-                F560DF0203D622D001ABA332 /* FFusionCodec.r */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.rez; path = FFusionCodec.r; sourceTree = "<group>"; };
-                F57755F40B51EB1800C7D833 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0
+includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"
-                F5CFD1BC0B5000CE00616865 /* GBPerianPanePListGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBPerianPanePListGenerator.h; sourceTree = "<group>"; };
-                F5CFD1BD0B5000CE00616865 /* GBPerianPanePListGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBPerianPanePListGenerator.m; sourceTree = "<group>"; };

trunk/SubImport.mm

@@ -92 +92 @@
-                        // subtitle tracks should be above the video track, which should be layer 0
-                        SetTrackLayer(theTrack, -1);
+                } else {
+                        DisposeMovieTrack(theTrack);
+                        theTrack = NULL;
-                }
-        }