Changeset 204

Timestamp:

12/10/06 04:48:09 (2 years ago)

Author:

allan

Message:

- idling import patch for movies without index + Graham's changes to said patch.

Files:

• trunk/Perian-Info.plist (modified) (2 diffs)
• trunk/PerianAviImporter.r (modified) (1 diff)
• trunk/ff_MovieImport.c (modified) (9 diffs)
• trunk/ff_MovieImportDispatch.h (modified) (1 diff)
• trunk/ff_dataref.c (modified) (3 diffs)
• trunk/ff_private.c (modified) (5 diffs)
• trunk/ff_private.h (modified) (3 diffs)

trunk/Perian-Info.plist

@@ -7 +7 @@
-        <key>CFBundleExecutable</key>
-        <string>Perian</string>
+        <key>CFBundleGetInfoString</key>
+        <string>0.1 (SVNREVISION ffmpeg: FFMPEGREVISION), Copyright 2006 The Perian Team</string>
-        <key>CFBundleIdentifier</key>
-com.yourcompany
+org.perian
-        <key>CFBundleInfoDictionaryVersion</key>
-        <string>6.0</string>
@@ -16 +18 @@
-        <string>????</string>
-        <key>CFBundleVersion</key>
-
-
-
+
-        <key>CSResourcesFileMapped</key>
-        <string>yes</string>

trunk/PerianAviImporter.r

@@ -35 +35 @@
-#define kFFAvi_MovieImportFlags \
-( canMovieImportFiles | canMovieImportInPlace | canMovieImportDataReferences | canMovieImportValidateFile \
-hasMovieImportMIMEList | movieImportMustGetDestinationMediaType
-
+canMovieImportWithIdle | hasMovieImportMIMEList
+movieImportMustGetDestinationMediaType | 
-
-/* Component Manager Things - 

trunk/ff_MovieImport.c

@@ -44 +44 @@
-#define COMPONENT_UPP_SELECT_ROOT()     MovieImport
-
-struct _ff_global_context {
-        ComponentInstance ci;
-        OSType componentType;
-        
-        /* For feedback during import */
-        MovieProgressUPP prog;
-        long refcon;
-        
-        /* for overwriting the default sample descriptions */
-        ImageDescriptionHandle imgHdl;
-        SoundDescriptionHandle sndHdl;
-        AVInputFormat           *format;
-};
-typedef struct _ff_global_context ff_global_context;
-typedef ff_global_context *ff_global_ptr;
-
-#include <CoreServices/Components.k.h>
-#include <QuickTime/QuickTimeComponents.k.h>
@@ -122 +106 @@
-        
-        storage->componentType = descout.componentSubType;
+        storage->movieLoadState = kMovieLoadStateLoading;
-bail:
-                return result;
@@ -133 +118 @@
-        if(storage->sndHdl)
-                DisposeHandle((Handle)storage->sndHdl);
+        
+        if(storage->stream_map)
+                av_free(storage->stream_map);
+        
+        if(storage->format_context)
+                av_close_input_file(storage->format_context);
-        
-        if(storage)
@@ -317 +308 @@
-                        /* Prepare the iocontext structure */
-                        memset(&byteContext, 0, sizeof(byteContext));
-
+, NULL, NULL, NULL
-                        require_noerr(result, bail);
-                        
@@ -375 +366 @@
-        AVFormatContext *ic = NULL;
-        AVFormatParameters params;
-        int64_t dataOffset;
-        AVPacket pkt;
-        NCStream *map = NULL;
-        int map_count,j,count;
-        OSType mediaType;
-        Track track;
-        Media media;
-
-
-
-
+
+
-        /* make sure that in case of error, the flag movieImportResultComplete is not set */
-        *outFlags = 0;
@@ -394 +379 @@
-        if(valid != 255)
-                goto bail;
-
+       
-        /* Prepare the iocontext structure */
-        memset(&byteContext, 0, sizeof(byteContext));
-
+, &storage->dataHandler, &storage->dataHandlerSupportsWideOffsets, &storage->dataSize
-        require_noerr(result, bail);
-        
@@ -404 +389 @@
-        result = av_open_input_stream(&ic, &byteContext, "", storage->format, &params);
-        require_noerr(result,bail);
+        storage->format_context = ic;
-        
-        /* Get the Stream Infos if not already read */
@@ -410 +396 @@
-                goto bail;
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                        }
-                }
-        }
-        if(storage->sndHdl) {
-                for(j = 0; j < map_count; j++) {
-                        GetMediaHandlerDescription(map[j].media, &mediaType, NULL, NULL);
-                        if(mediaType == SoundMediaType && map[j].sampleHdl) {
-                                DisposeHandle((Handle)map[j].sampleHdl);
-                                map[j].sampleHdl = (SampleDescriptionHandle)storage->sndHdl;
-                        }
-                }
-        }
-        
-        /* Import the Data*/
-        /* FIXME: Implement the progress upp */
-        /* note: flv builds a partial index that's unusable, so force importing without an index */
-        if (!(storage->componentType == 'FLV '))
-                hadIndex = import_avi(ic, map, dataOffset);
-        
-        if (!hadIndex)
-                import_without_index(ic, map, dataOffset);
-        
-        /* Insert the Medias into the Tracks */
-        result = noErr;
-        for(j = 0; j < map_count && result == noErr; j++) {
-                media = map[j].media;
-                if(media) {
-                        /* we could handle this stream.
-                        * convert the atTime parameter to track scale.
-                        * FIXME: check if that's correct */                     
-                        time.value.hi = 0;
-                        time.value.lo = atTime;
-                        time.scale = GetMovieTimeScale(theMovie);
-                        time.base = NULL;
-                        ConvertTimeScale(&time, GetMediaTimeScale(media));
-                        
-                        track = GetMediaTrack(media);
-                        result = InsertMediaIntoTrack(track, time.value.lo, 0, GetMediaDuration(media), fixed1);
-                }
-        }
-        require_noerr(result,bail);
-        
-        /* Set return values of the function */
-        
-        count = 0; media = NULL;
-
-
+storage->
+storage->stream_
-                if(media)
-                        count++;
-        }
+        
+        if(count > 1)
+                *outFlags |= movieImportResultUsedMultipleTracks;
-        
-        /* The usedTrack parameter. Count the number of Tracks and set usedTrack if we operated
@@ -509 +448 @@
-                *usedTrack = GetMediaTrack(media);
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        }
-        
-bail:
-
-
-
-
-
+
+
+
+
-        
-        return result;
-} /* FFAvi_MovieImportDataRef */
+
+ComponentResult FFAvi_MovieImportSetIdleManager(ff_global_ptr storage, IdleManager im) {
+        storage->idleManager = im;
+}
+
+ComponentResult FFAvi_MovieImportIdle(ff_global_ptr storage, long inFlags, long *outFlags) {
+        return(import_with_idle(storage, inFlags | movieImportWithIdle, outFlags, 0, 1000));    
+}
+
+ComponentResult FFAvi_MovieImportGetLoadState(ff_global_ptr storage, long *importerLoadState) {
+        *importerLoadState = storage->movieLoadState;
+        return(noErr);
+}
+
+ComponentResult FFAvi_MovieImportGetMaxLoadedTime(ff_global_ptr storage, TimeValue *time) {
+        *time = storage->loadedTime;
+        return(noErr);
+}

trunk/ff_MovieImportDispatch.h

@@ -61 +61 @@
-                ComponentError  (SetSettingsFromAtomContainer)
-                ComponentError  (SetOffsetAndLimit64)
-Error
+Call
-                ComponentCall   (ValidateDataRef)
-Error
-Error
+Call
+Call
-                ComponentError  (EstimateCompletionTime)
-                ComponentError  (SetDontBlock)
-                ComponentError  (GetDontBlock)
-Error
+Call
-                ComponentError  (SetNewMovieFlags)
-                ComponentCall   (GetDestinationMediaType)

trunk/ff_dataref.c

@@ -194 +194 @@
-
-/* This is the public function to open bytecontext withs datarefs */
-
+, DataHandler *dataHandler, Boolean *wideSupport, int64_t *dataSize
-{
-        URLContext *uc;
@@ -220 +220 @@
-        
-        err = up->url_open(uc, uc->filename, URL_RDONLY);
+                
-        if(err < 0) {
-                av_free(uc);
@@ -230 +231 @@
-        }
-        
+        if(dataHandler)
+                *dataHandler = private->dh;
+        
+        if(wideSupport)
+                *wideSupport = private->supportsWideOffsets;
+        
+        if(dataSize)
+                *dataSize = private->size;      
+        
-        return noErr;
-} /* url_open_dataref() */

trunk/ff_private.c

@@ -30 +30 @@
-#include <CoreServices/CoreServices.h>
-#include <AudioToolbox/AudioToolbox.h>
+#include <QuickTime/QuickTime.h>
-
-/* This routine checks if the system requirements are fullfilled */
@@ -512 +513 @@
-} /* prepare_movie() */
-
+int determine_header_offset(ff_global_ptr storage) {
+        AVFormatContext *formatContext;
+        AVPacket packet;
+        int result, i;
+        
+        formatContext = storage->format_context;
+        result = noErr;
+        storage->header_offset = 0;
+        
+        /* Seek backwards to get a manually read packet for file offset */
+        if(formatContext->streams[0]->index_entries == NULL || storage->componentType == 'FLV ')
+        {
+                if (IS_AVI(storage->componentType))
+                        //Try to seek to the first frame; don't care if it fails
+                        // Is this really needed for AVIs w/out an index? It seems to work fine without, 
+                        // and it seems that with it the first frame is skipped.
+                        av_seek_frame(formatContext, -1, 0, 0);
+                storage->header_offset = 0;
+        }
+        else
+        {
+                result = av_seek_frame(formatContext, -1, 0, 0);
+                if(result < 0) goto bail;
+                
+                formatContext->iformat->read_packet(formatContext, &packet);
+                /* read_packet will give the first decodable packet. However, that isn't necessarily
+                        the first entry in the index, so look for an entry with a matching size. */
+                for (i = 0; i < formatContext->streams[packet.stream_index]->nb_index_entries; i++) {
+                        if (packet.size == formatContext->streams[packet.stream_index]->index_entries[i].size) {
+                                storage->header_offset = packet.pos - formatContext->streams[packet.stream_index]->index_entries[i].pos;
+                                break;
+                        }
+                }
+                av_free_packet(&packet);
+                
+                // seek back to the beginning, otherwise av_read_frame-based decoding will skip a few packets.
+                av_seek_frame(formatContext, -1, 0, 0);
+        }
+                
+bail:
+        return(result);
+}
+
-/* This function imports the avi represented by the AVFormatContext to the movie media represented
- * in the map function. The aviheader_offset is used to calculate the packet offset from the
- * beginning of the file. It returns whether it was successful or not (i.e. whether the file had an index) */
-
-
+
-        int j, k, l;
+        NCStream *map;
-        NCStream *ncstr;
+        AVFormatContext *ic;
-        AVStream *stream;
-        AVCodecContext *codec;
-        SampleReference64Ptr sampleRec;
-
-
+
-        short flags;
-        short hadIndex = 0;
-        int sampleNum;
+        ComponentResult result = noErr;
+        
+        map = storage->stream_map;
+        ic = storage->format_context;
+        header_offset = storage->header_offset;
+
+        *hadIndex = 0;
+        
+        //FLVs have unusable indexes, so don't even bother.
+        if(storage->componentType == 'FLV ')
+                goto bail;
-        
-        /* process each stream in ic */
-        for(j = 0; j < ic->nb_streams; j++) {
-                
-                ncstr = &map[j];
-                stream = ncstr->str;
@@ -539 +592 @@
-                        continue;
-                
+                /* no index, we might as well skip */
+                if(stream->nb_index_entries == 0)
+                        continue;
+                
-                sampleNum = 0;
-                ncstr->sampleTable = calloc(stream->nb_index_entries, sizeof(SampleReference64Record));
@@ -545 +602 @@
-                for(k = 0; k < stream->nb_index_entries; k++) {
-                        
-
+*
-                        
-                        /* file offset */
-avi
+
-                        
-                        /* flags */
@@ -605 +662 @@
-                }
-                /* Add all of the samples to the media */
-err = 
+
-                free(ncstr->sampleTable);
-        }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        AVStream *stream;
-
-
+
+
+
+
+
+
+
+
-        short flags;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                flags = 0;
-
+
+
-                        flags |= mediaSampleNotSync;
-                
-                memset(&sampleRec, 0, sizeof(sampleRec));
-k
- pk
-k
+acke
+packe
+acke
-                sampleRec.sampleFlags = flags;
+                
+                if(packet.size > storage->largestPacketSize)
+                        storage->largestPacketSize = packet.size;
-                
-                if(sampleRec.dataSize <= 0)
-                        continue;
-                
- (codec->codec_type == CODEC_TYPE_AUDIO && !ncstr
-kt.size * ncstr->asbd.mFramesPerPacket) / ncstr
+(codecContext->codec_type == CODEC_TYPE_AUDIO && !ncstream
+acket.size * ncstream->asbd.mFramesPerPacket) / ncstream
-                else
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                        // keep the duration of the last sample, so we can use it if it's the last frame
-
-
-
-
+
+
+
-                } else {
-
-
+
+
+
-                                sampleRec.durationPerSample = 1;
-                        else
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        else
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-