Changeset 967

Timestamp:

10/23/08 14:31:55 (3 months ago)

Author:

astrange

Message:

Simplify finding pix_fmt and only use it on codecs where it's necessary. (avoids a bug in QT)

Files:

• branches/perian-1.1/FFusionCodec.c (modified) (5 diffs)

branches/perian-1.1/FFusionCodec.c

@@ -277 +277 @@
-}
-
+static enum PixelFormat FindPixFmtFromVideo(AVCodec *codec, AVCodecContext *avctx, Ptr data, int bufferSize)
+{
+    AVCodecContext tmpContext;
+    AVFrame tmpFrame;
+    int got_picture;
+    enum PixelFormat pix_fmt;
+    
+    avcodec_get_context_defaults2(&tmpContext, CODEC_TYPE_VIDEO);
+    tmpContext.width = avctx->width;
+    tmpContext.height = avctx->height;
+    tmpContext.codec_tag = avctx->codec_tag;
+    
+    avcodec_open(&tmpContext, codec);
+    avcodec_decode_video(&tmpContext, &tmpFrame, &got_picture, (UInt8*)data, bufferSize);
+    pix_fmt = tmpContext.pix_fmt;
+    avcodec_close(&tmpContext);
+    
+    return pix_fmt;
+}
+
-//---------------------------------------------------------------------------
-// Component Routines
@@ -536 +556 @@
-        Handle imgDescExt;
-        OSErr err = noErr;
-        enum PixelFormat pixelFormat = PIX_FMT_NONE;
-        
-    // We first open libavcodec library and the codec corresponding
@@ -790 +809 @@
-                        err = featureUnsupported;
-                
-                // this format doesn't have enough information in its headers
-                // we have to decode the first frame
-                if (glob->avContext->pix_fmt == PIX_FMT_NONE && p->bufferSize) {
-                        AVFrame temp;
-                        int got_picture;
-                        avcodec_open(glob->avContext, glob->avCodec);
-                        avcodec_decode_video(glob->avContext, &temp, 
-                                                                 &got_picture, (UInt8*)p->data, p->bufferSize);
-                        
-                        avcodec_close(glob->avContext);
-                        pixelFormat = glob->avContext->pix_fmt;
-                }
-                
-                // some hooks into ffmpeg's buffer allocation to get frames in 
-                // decode order without delay more easily
@@ -821 +827 @@
-        }
-                
-
-
+
+
+
+
-    }
-    
@@ -861 +869 @@
-        
-        if (!err) {
-pixelForma
+glob->avContext->pix_fm
-        {
-                case PIX_FMT_BGR24: