Changeset 744

Timestamp:

11/27/07 11:41:54 (10 months ago)

Author:

astrange

Message:

Delegate interlaced H.264 to Apple's decoder. Fix a possible crash.

Files:

• branches/perian-1.1/FFusionCodec.c (modified) (3 diffs)
• branches/perian-1.1/bitstream_info.c (modified) (1 diff)
• branches/perian-1.1/bitstream_info.h (modified) (1 diff)

branches/perian-1.1/FFusionCodec.c

@@ -315 +315 @@
-            DisposeImageCodecMPDrawBandUPP(glob->drawBandUPP);
-        }
-        
-        if (glob->avCodec)
-        {
-            avcodec_close(glob->avContext);
-        }
-                                
-        if (glob->avContext)
@@ -326 +321 @@
-                                free(glob->avContext->extradata);
-                                                
+                        if (glob->avContext->codec) avcodec_close(glob->avContext);
-            av_free(glob->avContext);
-        }
@@ -677 +673 @@
-                if(glob->avContext->extradata_size != 0 && glob->begin.parser != NULL)
-                        ffusionParseExtraData(glob->begin.parser, glob->avContext->extradata, glob->avContext->extradata_size);
+                
+                // XXX: at the moment ffmpeg can't handle interlaced H.264 right
+                // specifically PAFF + spatial prediction
+                if (codecID == CODEC_ID_H264 && ffusionIsParsedVideoInterlaced(glob->begin.parser))
+                        return -2;
-                
-                // some hooks into ffmpeg's buffer allocation to get frames in 

branches/perian-1.1/bitstream_info.c

@@ -820 +820 @@
-        return 0;
-}
+
+int ffusionIsParsedVideoInterlaced(FFusionParserContext *parser)
+{
+        if (parser->parserStructure == &ffusionH264Parser) {
+                H264ParserContext *h264parser = parser->internalContext;
+                return !h264parser->frame_mbs_only_flag;
+        }
+        
+        return 0;
+}

branches/perian-1.1/bitstream_info.h

@@ -43 +43 @@
-int ffusionParseExtraData(FFusionParserContext *parser, const uint8_t *buf, int buf_size);
-int ffusionParse(FFusionParserContext *parser, const uint8_t *buf, int buf_size, int *out_buf_size, int *type, int *skippable);
+int ffusionIsParsedVideoInterlaced(FFusionParserContext *parser);
-
-#ifdef __cplusplus