Changeset 265

Timestamp:

01/07/07 19:04:42 (2 years ago)

Author:

dconrad

Message:

First try at mkv idle importing. Refs #29.

Files:

• trunk/MatroskaImport.cpp (modified) (14 diffs)
• trunk/MatroskaImport.h (modified) (6 diffs)
• trunk/MatroskaImportDispatch.h (modified) (1 diff)
• trunk/MatroskaImportPrivate.cpp (modified) (7 diffs)
• trunk/ff_MovieImport.c (modified) (1 diff)
• trunk/ff_private.c (modified) (3 diffs)
• trunk/ff_private.h (modified) (1 diff)

trunk/MatroskaImport.cpp

@@ -34 +34 @@
-#include "SubImport.h"
-#include "Codecprintf.h"
+
+extern "C" 
+ComponentResult create_placeholder_track(Movie movie, Track *placeholderTrack, TimeValue duration, Handle dataRef, OSType dataRefType);
-
-using namespace libmatroska;
@@ -65 +68 @@
-
-// Component Open Request - Required
-pascal 
+
-{
-        // Allocate memory for our globals, and inform the component manager that we've done so
@@ -79 +82 @@
-
-// Component Close Request - Required
-pascal 
+
-{
-        // Make sure to dealocate our storage
@@ -88 +91 @@
-
-// Component Version Request - Required
-pascal 
+
-{
-        return kMatroskaImportVersion;
@@ -96 +99 @@
-
-// MovieImportFile
-
-
-
-
+
+
-{
-        OSErr err = noErr;
@@ -127 +128 @@
-
-// MovieImportDataRef
-
-
-
-
-
+
+
-{
-        return store->ImportDataRef(dataRef, dataRefType, theMovie, targetTrack,
@@ -138 +136 @@
-
-// MovieImportValidate
-
-
-
+
-{
-        OSErr err = noErr;
@@ -164 +160 @@
-
-// MovieImportGetMIMETypeList
-
-
+
-{
-        // Note that GetComponentResource is only available in QuickTime 3.0 or later.
@@ -173 +168 @@
-
-// MovieImportValidateDataRef
-
-
+
-{
-        return store->ValidateDataRef(dataRef, dataRefType, valid);
-}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -195 +204 @@
-        timecodeScale = 1000000;
-        movieDuration = 0;
+        idleManager = NULL;
+        loadState = kMovieLoadStateLoading;
-        ioHandler = NULL;
-        aStream = NULL;
@@ -231 +242 @@
-                return paramErr;
-        
+        loadState = kMovieLoadStateLoading;
+        
-        try {
-                if (!OpenFile())
@@ -238 +251 @@
-                SetupMovie();
-                
-do
-KaxSegment & segment = *static_cast<KaxSegment *>(el_l0
+if (inFlags & movieImportWithIdle)
+create_placeholder_track(theMovie, &baseTrack, movieDuration, dataRef, dataRefType
-                        
+                        // try to import one cluster so we have at least something
-                        if (EbmlId(*el_l1) == KaxCluster::ClassInfos.GlobalId) {
-                                int upperLevel = 0;
@@ -247 +261 @@
-                                el_l1->Read(*aStream, KaxCluster::ClassInfos.Context, upperLevel, dummyElt, true);
-                                KaxCluster & cluster = *static_cast<KaxCluster *>(el_l1);
-                                KaxClusterTimecode & clusterTime = GetChild<KaxClusterTimecode>(cluster);
-                                
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                        }
-                } while (NextLevel1Element());
-                
-                // insert the a/v tracks' samples
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                
-        } catch (CRTError &err) {
-                return err.getError();
-        }
+        
+        loadState = kMovieLoadStateComplete;
-        
-        return noErr;
@@ -305 +314 @@
-        return noErr;
-}
+
+ComponentResult MatroskaImport::Idle(long inFlags, long *outFlags)
+{
+        if (EbmlId(*el_l1) == KaxCluster::ClassInfos.GlobalId) {
+                int upperLevel = 0;
+                EbmlElement *dummyElt = NULL;
+                
+                el_l1->Read(*aStream, KaxCluster::ClassInfos.Context, upperLevel, dummyElt, true);
+                KaxCluster & cluster = *static_cast<KaxCluster *>(el_l1);
+                
+                ImportCluster(cluster, true);
+        }
+        
+        if (!NextLevel1Element()) {
+                if (baseTrack)
+                        DisposeMovieTrack(baseTrack);
+                *outFlags |= movieImportResultComplete;
+                loadState = kMovieLoadStateComplete;
+        }
+        
+        return noErr;
+}
+
+ComponentResult MatroskaImport::SetIdleManager(IdleManager im)
+{
+        idleManager = im;
+        return noErr;
+}
+
+ComponentResult MatroskaImport::GetMaxLoadedTime(TimeValue *time)
+{
+        *time = 0;
+        for (int i = 0; i < tracks.size(); i++) {
+                if (tracks[i].maxLoadedTime > *time)
+                        *time = tracks[i].maxLoadedTime;
+        }
+        return noErr;
+}
+
+ComponentResult MatroskaImport::GetLoadState(long *importerLoadState)
+{
+        *importerLoadState = loadState;
+        return noErr;
+}

trunk/MatroskaImport.h

@@ -65 +65 @@
-        void AddBlock(KaxBlockGroup &blockGroup);
-        
+        // this adds all the samples added through AddBlock() to the track that aren't already
+        // added, e.g. from a previous call to AddSamplesToTrack()
+        void AddSamplesToTrack();
+        
-        UInt16                                  number;
-        UInt8                                   type;
@@ -73 +77 @@
-        QTSampleDescriptionID   qtSampleDesc;
-        SInt64                                  timecodeScale;
-bool                                   seenFirstFra
+TimeValue64                            maxLoadedTi
-        
-private:
-        // adds an individual frame from a block group into the sample table if it exists,
-        // the media otherwise, and into the track if the track is a subtitle track.
-SInt64
+void
-        
-        // Since the duration in Matroska files is generally rather unreliable, rely only on
@@ -85 +89 @@
-        // previous ones to be the difference in timestamps.
-        vector<MatroskaFrame>   lastFrames;
+        bool                                    seenFirstFrame;
+        
+        // this is the first sample number (if sample table) or sample time that we haven't 
+        // yet added to the media/track. A value of -1 means the value is invalid/unset.
+        SInt64                                  firstSample;
+        SInt64                                  amountToAdd;    // num samples if sampleTable, duration otherwise
-};
-
@@ -107 +117 @@
-        // MatroskaImportValidateDataRef()
-        ComponentResult ValidateDataRef(Handle dataRef, OSType dataRefType, UInt8 *valid);
+        
+        // MatroskaImportIdle()
+        ComponentResult Idle(long inFlags, long *outFlags);
+        
+        // MatroskaImportSetIdleManager()
+        ComponentResult SetIdleManager(IdleManager im);
+        
+        // MatroskaImportGetMaxLoadedTime()
+        ComponentResult GetMaxLoadedTime(TimeValue *time);
+        
+        // MatroskaImportGetLoadState()
+        ComponentResult GetLoadState(long *importerLoadState);
-        
-        // we need to get our component instance to get our mime type resource
@@ -145 +167 @@
-        void AddChapterAtom(KaxChapterAtom *atom, Track chapterTrack);
-        
+        // assumes cluster has been read already, and cycles through the contained blocks and
+        // adds the frames to the media/sample table, and to the track if addToTrack is true
+        void ImportCluster(KaxCluster &cluster, bool addToTrack);
-                
-        ComponentInstance               self;
@@ -157 +182 @@
-        TimeValue64                             movieDuration;  // in the timescale of timecodeScale
-        
+        IdleManager                             idleManager;
+        long                                    loadState;
+        
-        DataHandlerCallback             *ioHandler;
-        EbmlStream                              *aStream;

trunk/MatroskaImportDispatch.h

@@ -64 +64 @@
-                ComponentCall  (Idle)
-                ComponentCall  (ValidateDataRef)
-Error
-Error
+Call 
+Call 
-                ComponentError (EstimateCompletionTime)
-                ComponentError (SetDontBlock)
-                ComponentError (GetDontBlock)
-Error
+Call 
-                ComponentError (SetNewMovieFlags)
-                ComponentError (GetDestinationMediaType)

trunk/MatroskaImportPrivate.cpp

@@ -549 +549 @@
-}
-
+void MatroskaImport::ImportCluster(KaxCluster &cluster, bool addToTrack)
+{
+        KaxSegment & segment = *static_cast<KaxSegment *>(el_l0);
+        KaxClusterTimecode & clusterTime = GetChild<KaxClusterTimecode>(cluster);
+                                
+        cluster.SetParent(segment);
+        cluster.InitTimecode(uint64(clusterTime), timecodeScale);
+        
+        KaxBlockGroup *blockGroup = FindChild<KaxBlockGroup>(cluster);
+        while (blockGroup->GetSize() > 0) {
+                KaxBlock & block = GetChild<KaxBlock>(*blockGroup);
+                block.SetParent(cluster);
+                
+                for (int i = 0; i < tracks.size(); i++) {
+                        if (tracks[i].number == block.TrackNum()) {
+                                tracks[i].AddBlock(*blockGroup);
+                                break;
+                        }
+                }
+                
+                blockGroup = &GetNextChild<KaxBlockGroup>(cluster, *blockGroup);
+        }
+        
+        if (addToTrack) {
+                for (int i = 0; i < tracks.size(); i++)
+                        tracks[i].AddSamplesToTrack();
+                
+                loadState = kMovieLoadStatePlayable;
+        }
+}
+
-
-MatroskaTrack::MatroskaTrack()
@@ -560 +591 @@
-        qtSampleDesc = 0;
-        timecodeScale = 1000000;
+        maxLoadedTime = 0;
-        seenFirstFrame = false;
+        firstSample = -1;
+        amountToAdd = 0;
-}
-
@@ -582 +616 @@
-        qtSampleDesc = copy.qtSampleDesc;
-        timecodeScale = copy.timecodeScale;
-seenFirstFrame = copy.seenFirstFra
+maxLoadedTime = copy.maxLoadedTi
-        
-        for (int i = 0; i < copy.lastFrames.size(); i++)
-                lastFrames.push_back(copy.lastFrames[i]);
+        
+        seenFirstFrame = copy.seenFirstFrame;
+        firstSample = copy.firstSample;
+        amountToAdd = copy.amountToAdd;
-}
-
@@ -654 +692 @@
-}
-
-SInt64
+void
-{
-        ComponentResult err = noErr;
@@ -665 +703 @@
-                if (err)
-                        Codecprintf(NULL, "MKV: error adding sample reference to table %d\n", err);
+                
+                amountToAdd++;
-        } else {
-                SampleReference64Record sample;
@@ -677 +717 @@
-                if (err)
-                        Codecprintf(NULL, "MKV: error adding sample reference to media %d\n", err);
+                
+                amountToAdd += frame.duration;
-        }
-        
@@ -694 +736 @@
-        }
-        
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/ff_MovieImport.c

@@ -487 +487 @@
-                        
-                        //create a placeholder track so that progress displays correctly.
-
+->movie, &storage->placeholderTrack
-                        
-                        //give the data handler a hint as to how fast we need the data.

trunk/ff_private.c

@@ -950 +950 @@
-} /* import_with_idle() */
-
-ff_global_ptr storage
+Movie movie, Track *placeholderTrack
-        SampleDescriptionHandle sdH;
-        Media placeholderMedia;
@@ -956 +956 @@
-        ComponentResult result = noErr;
-        
-storage->
+
-        
-        sdH = (SampleDescriptionHandle)NewHandleClear(sizeof(SampleDescription));
-        (*sdH)->descSize = sizeof(SampleDescription);
-        
-storage->placeholderTrack = NewMovieTrack(storage->
-storage->
+*placeholderTrack = NewMovieTrack(
+*
-        
-        result = AddMediaSampleReference(placeholderMedia, 0, 1, duration, sdH, 1, 0, NULL);
@@ -968 +968 @@
-                goto bail;
-        
-storage->
+*
-        
-bail:

trunk/ff_private.h

@@ -101 +101 @@
-int import_using_index(ff_global_ptr storage, int *hadIndex, TimeValue *addedDuration);
-ComponentResult import_with_idle(ff_global_ptr storage, long inFlags, long *outFlags, int minFrames, int maxFrames);
-ff_global_ptr storage
+Movie movie, Track *placeholderTrack
-void send_movie_changed_notification(Movie movie);
-