Changeset 461

Timestamp:

04/25/07 17:48:20 (1 year ago)

Author:

dconrad

Message:

When idle importing, only add samples to the track if the movie is paused unless necessary. Also speed up idle importing of local files considerably. Closes #143

Files:

• trunk/Perian.xcodeproj/project.pbxproj (modified) (2 diffs)
• trunk/ff_MovieImport.c (modified) (3 diffs)
• trunk/ff_private.c (modified) (6 diffs)
• trunk/ff_private.h (modified) (3 diffs)

trunk/Perian.xcodeproj/project.pbxproj

@@ -1162 +1162 @@
-                                F5CFD2D60B5012A100616865 /* A52Codec.component */,
-                                F5CFD2D80B5012A100616865 /* AC3MovieImport.component */,
-
+A52
-                        );
-                        name = Products;
@@ -1430 +1430 @@
-                        sourceTree = BUILT_PRODUCTS_DIR;
-                };
-
+A52
-                        isa = PBXReferenceProxy;
-                        fileType = wrapper.application;
-
+A52
-                        remoteRef = F5CFD2D90B5012A100616865 /* PBXContainerItemProxy */;
-                        sourceTree = BUILT_PRODUCTS_DIR;

trunk/ff_MovieImport.c

@@ -398 +398 @@
-        memset(&byteContext, 0, sizeof(byteContext));
-        result = url_open_dataref(&byteContext, dataRef, dataRefType, &storage->dataHandler, &storage->dataHandlerSupportsWideOffsets, &storage->dataSize);
+        storage->isStreamed = dataRefType == URLDataHandlerSubType;
-        require_noerr(result, bail);
-        
@@ -497 +498 @@
-                        
-                //import with idle. Decode a little bit of data now.
-
+, true
-        } else {
-                //QuickTime didn't request import with idle, so do it all now.
-
+, true
-        }
-        
@@ -518 +519 @@
-
-ComponentResult FFAvi_MovieImportIdle(ff_global_ptr storage, long inFlags, long *outFlags) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/ff_private.c

@@ -522 +522 @@
-                map[j].index = st->index;
-                map[j].str = st;
+                map[j].duration = -1;
-                
-                if(st->codec->codec_type == CODEC_TYPE_VIDEO) {
@@ -780 +781 @@
- * Supports progressive importing, but will not idle if maxFrames == 0.
- */
-
+, bool addSamples
-        SampleReference64Record sampleRec;
-        DataHandler dataHandler;
@@ -826 +827 @@
-                Media media = ncstream->media;
-                
-
+ && ncstream->duration == -1
-                        ncstream->duration = GetMediaDuration(media);
-        }
@@ -914 +915 @@
-                Media media = ncstream->media;
-                
-
+ && (addSamples || readResult != 0)
-                        Track track = GetMediaTrack(media);
-                        TimeScale mediaTimeScale = GetMediaTimeScale(media);
@@ -928 +929 @@
-                                result = InsertMediaIntoTrack(track, -1, prevDuration, addedDuration, fixed1);
-                        }
+                        ncstream->duration = -1;
-                }
-        }
@@ -969 +971 @@
-        
-        //tell the idle manager to idle us again in 500ms.
-
+ && storage->isStreamed
-                QTIdleManagerSetNextIdleTimeDelta(storage->idleManager, 1, 2);
-        

trunk/ff_private.h

@@ -60 +60 @@
-        Track placeholderTrack;
-        DataHandler dataHandler;
+        bool isStreamed;
-        Boolean dataHandlerSupportsWideOffsets;
-        int64_t dataSize;
@@ -67 +68 @@
-        long movieLoadState;
-        TimeValue loadedTime;
+        TimeValue lastIdleTime;
+        int idlesSinceLastAdd;
-        
-        //the "atTime" parameter to the initial import.
@@ -100 +103 @@
-int determine_header_offset(ff_global_ptr storage);
-int import_using_index(ff_global_ptr storage, int *hadIndex, TimeValue *addedDuration);
-
+, bool addSamples
-ComponentResult create_placeholder_track(Movie movie, Track *placeholderTrack, TimeValue duration, Handle dataRef, OSType dataRefType);
-void send_movie_changed_notification(Movie movie);