Changeset 91

Timestamp:

09/20/06 19:57:49 (2 years ago)

Author:

dconrad

Message:

Speed up validation by using a simple AVI parser that only looks for the video fourcc to determine if it's a troublesome format that we should pass off to Apple's importer

Files:

• trunk/ff_MovieImport.c (modified) (6 diffs)
• trunk/ff_private.c (modified) (2 diffs)
• trunk/ff_private.h (modified) (2 diffs)

trunk/ff_MovieImport.c

@@ -26 +26 @@
-#include "allformats.h"
-#include "Codecprintf.h"
+#include "riff.h"
-
-/* This one is a little big in ffmpeg and private anyway */
@@ -237 +238 @@
-} /* FFAvi_MovieImportValidate() */
-
+// this function is a small avi parser to get the video track's fourcc as
+// fast as possible, so we can decide whether we can handle the necessary 
+// image description extensions for the format in ValidateDataRef() quickly
+OSType get_avi_strf_fourcc(ByteIOContext *pb)
+{
+        OSType tag, subtag;
+        unsigned int size;
+        
+        if (get_be32(pb) != 'RIFF')
+                return 0;
+        
+        // file size
+        get_le32(pb);
+        
+        if (get_be32(pb) != 'AVI ')
+                return 0;
+        
+        while (!url_feof(pb)) {
+                tag = get_be32(pb);
+                size = get_le32(pb);
+                
+                if (tag == 'LIST') {
+                        subtag = get_be32(pb);
+                        
+                        // only lists we care about: hdrl & strl, so skip the rest
+                        if (subtag != 'hdrl' && subtag != 'strl')
+                                url_fskip(pb, size - 4 + (size & 1));
+                        
+                } else if (tag == 'strf') {
+                        // 16-byte offset to the fourcc
+                        url_fskip(pb, 16);
+                        return get_be32(pb);
+                } else
+                        url_fskip(pb, size + (size & 1));
+        }
+        return 0;
+}
+
-ComponentResult FFAvi_MovieImportValidateDataRef(ff_global_ptr storage, Handle dataRef, OSType dataRefType, UInt8 *valid)
-{
@@ -244 +283 @@
-        AVProbeData *pd = (AVProbeData *)malloc(sizeof(AVProbeData));
-        ByteIOContext byteContext;
-        AVFormatContext *ic = NULL;
-        AVFormatParameters params;
-        int success, i;
@@ -266 +304 @@
-                *valid = 255; /* This means we can read the data */
-                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                *valid = 0;
-                }
@@ -289 +324 @@
-                if(dataHandler)
-                        CloseComponent(dataHandler);
-        if(ic)
-                av_close_input_file(ic);
-        free(pd);
-        
@@ -363 +396 @@
-        if(ic->streams[0]->index_entries == NULL)
-        {
-storage->componentType == 'AVI ' || storage->componentType == 'VfW ' || storage->componentType == 'VFW '
+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, 

trunk/ff_private.c

@@ -28 +28 @@
-#include <AudioToolbox/AudioToolbox.h>
-
-#define BSWAP(a) ( (((a)&0xff) << 24) | (((a)&0xff00) << 8) | (((a)&0xff0000) >> 8) | (((a) >> 24) & 0xff) )
-
-/* This routine checks if the system requirements are fullfilled */
-ComponentResult check_system()
@@ -530 +528 @@
-short import_avi(AVFormatContext *ic, NCStream *map, int64_t aviheader_offset)
-{
-
+, nextFrame
-        NCStream *ncstr;
-        AVStream *stream;

trunk/ff_private.h

@@ -37 +37 @@
-        AVRational base;
-        int64_t lastpts;
+        int idxEntry;
-        SampleReference64Record lastSample;
-};
@@ -68 +69 @@
-uint8_t *write_data(uint8_t *target, uint8_t* data, int32_t data_size);
-
+#define BSWAP(a) ( (((a)&0xff) << 24) | (((a)&0xff00) << 8) | (((a)&0xff0000) >> 8) | (((a) >> 24) & 0xff) )
+
+#define IS_AVI(x) (x == 'AVI ' || x == 'VfW ' || x == 'VFW ')
-
-#endif