X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Ffilter_avdeinterlace.c;h=b071f6efa072f3f965485310216f70593c006ba2;hb=78cb03b80c9483db3f3c6bb44eb420da69ca60c0;hp=35e6541526247a373b656691987c2d285937b5de;hpb=f00476101550ec7d8e863f6516aa83bc1b524570;p=melted

diff --git a/src/modules/avformat/filter_avdeinterlace.c b/src/modules/avformat/filter_avdeinterlace.c
index 35e6541..b071f6e 100644
--- a/src/modules/avformat/filter_avdeinterlace.c
+++ b/src/modules/avformat/filter_avdeinterlace.c
@@ -80,7 +80,7 @@
 #endif
 
 /* filter parameters: [-1 4 2 4 -1] // 8 */
-static void deinterlace_line(uint8_t *dst, 
+static inline void deinterlace_line(uint8_t *dst, 
 			     const uint8_t *lum_m4, const uint8_t *lum_m3, 
 			     const uint8_t *lum_m2, const uint8_t *lum_m1, 
 			     const uint8_t *lum,
@@ -126,7 +126,7 @@ static void deinterlace_line(uint8_t *dst,
     }
 #endif
 }
-static void deinterlace_line_inplace(uint8_t *lum_m4, uint8_t *lum_m3, uint8_t *lum_m2, uint8_t *lum_m1, uint8_t *lum,
+static inline void deinterlace_line_inplace(uint8_t *lum_m4, uint8_t *lum_m3, uint8_t *lum_m2, uint8_t *lum_m1, uint8_t *lum,
                              int size)
 {
 #ifndef USE_MMX
@@ -172,7 +172,7 @@ static void deinterlace_line_inplace(uint8_t *lum_m4, uint8_t *lum_m3, uint8_t *
 /* deinterlacing : 2 temporal taps, 3 spatial taps linear filter. The
    top field is copied as is, but the bottom field is deinterlaced
    against the top field. */
-static void deinterlace_bottom_field(uint8_t *dst, int dst_wrap,
+static inline void deinterlace_bottom_field(uint8_t *dst, int dst_wrap,
                                     const uint8_t *src1, int src_wrap,
                                     int width, int height)
 {
@@ -201,7 +201,7 @@ static void deinterlace_bottom_field(uint8_t *dst, int dst_wrap,
     deinterlace_line(dst,src_m2,src_m1,src_0,src_0,src_0,width);
 }
 
-static void deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap,
+static inline void deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap,
 					     int width, int height)
 {
     uint8_t *src_m1, *src_0, *src_p1, *src_p2;
@@ -294,18 +294,21 @@ static int mlt_avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
 static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
 	int error = 0;
-	
+	int deinterlace = mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "consumer_deinterlace" );
+
+	// Determine if we need a writable version or not
+	if ( deinterlace && !writable )
+		 writable = !mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "progressive" );
+
+	// Get the input image
+	error = mlt_frame_get_image( this, image, format, width, height, writable );
+
 	// Check that we want progressive and we aren't already progressive
-	if ( *format == mlt_image_yuv422 &&
-		 !mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "progressive" ) &&
-		 mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "consumer_deinterlace" ) )
+	if ( deinterlace && *format == mlt_image_yuv422 && *image != NULL && !mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "progressive" ) )
 	{
 		// Create a picture
 		AVPicture *output = mlt_pool_alloc( sizeof( AVPicture ) );
 
-		// Get the input image
-		error = mlt_frame_get_image( this, image, format, width, height, 1 );
-
 		// Fill the picture
 		if ( *format == mlt_image_yuv422 )
 		{
@@ -319,11 +322,6 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 		// Make sure that others know the frame is deinterlaced
 		mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "progressive", 1 );
 	}
-	else
-	{
-		// Get the input image
-		error = mlt_frame_get_image( this, image, format, width, height, writable );
-	}
 
 	return error;
 }