filter_avcolour_space.c

[melted] / src / modules / avformat / producer_avformat.c

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index efd5206..8cbdad4 100644 (file)
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -344,51 +344,7 @@ static double producer_time_of_frame( mlt_producer this, mlt_position position )
 
 static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt, mlt_image_format format, int width, int height )
 {
-       // EXPERIMENTAL IMAGE NORMALISATIONS
-       if ( pix_fmt == PIX_FMT_YUV420P && format == mlt_image_yuv422 )
-       {
-               register int i, j;
-               register int half = width >> 1;
-               register uint8_t *Y = ( ( AVPicture * )frame )->data[ 0 ];
-               register uint8_t *U = ( ( AVPicture * )frame )->data[ 1 ];
-               register uint8_t *V = ( ( AVPicture * )frame )->data[ 2 ];
-               register uint8_t *d = buffer;
-               register uint8_t *y, *u, *v;
-
-               i = height >> 1;
-               while ( i -- )
-               {
-                       y = Y;
-                       u = U;
-                       v = V;
-                       j = half;
-                       while ( j -- )
-                       {
-                               *d ++ = *y ++;
-                               *d ++ = *u ++;
-                               *d ++ = *y ++;
-                               *d ++ = *v ++;
-                       }
-
-                       Y += ( ( AVPicture * )frame )->linesize[ 0 ];
-                       y = Y;
-                       u = U;
-                       v = V;
-                       j = half;
-                       while ( j -- )
-                       {
-                               *d ++ = *y ++;
-                               *d ++ = *u ++;
-                               *d ++ = *y ++;
-                               *d ++ = *v ++;
-                       }
-
-                       Y += ( ( AVPicture * )frame )->linesize[ 0 ];
-                       U += ( ( AVPicture * )frame )->linesize[ 1 ];
-                       V += ( ( AVPicture * )frame )->linesize[ 2 ];
-               }
-       }
-       else if ( format == mlt_image_yuv420p )
+       if ( format == mlt_image_yuv420p )
        {
                AVPicture pict;
                pict.data[0] = buffer;
@@ -589,7 +545,6 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                                        {
                                                got_picture = 0;
                                        }
-                                       mlt_properties_set_int( properties, "top_field_first", av_frame->top_field_first );
                                }
                        }
 
@@ -600,6 +555,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                // Now handle the picture if we have one
                if ( got_picture )
                {
+                       mlt_properties_set_int( frame_properties, "progressive", !av_frame->interlaced_frame );
+                       mlt_properties_set_int( frame_properties, "top_field_first", av_frame->top_field_first );
+
                        convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height );
 
                        mlt_properties_set_data( frame_properties, "image", *buffer, size, (mlt_destructor)mlt_pool_release, NULL );
@@ -679,18 +637,24 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame )
                {
                        double source_fps = 0;
                        int norm_aspect_ratio = mlt_properties_get_int( properties, "norm_aspect_ratio" );
+                       double force_aspect_ratio = mlt_properties_get_double( properties, "force_aspect_ratio" );
+                       double aspect_ratio;
 
                        // XXX: We won't know the real aspect ratio until an image is decoded
                        // but we do need it now (to satisfy filter_resize) - take a guess based
                        // on pal/ntsc
-                       if ( !norm_aspect_ratio && codec_context->sample_aspect_ratio.num > 0 )
+                       if ( force_aspect_ratio > 0.0 )
+                       {
+                               aspect_ratio = force_aspect_ratio;
+                       }
+                       else if ( !norm_aspect_ratio && codec_context->sample_aspect_ratio.num > 0 )
                        {
-                               mlt_properties_set_double( properties, "aspect_ratio", av_q2d( codec_context->sample_aspect_ratio ) );
+                               aspect_ratio = av_q2d( codec_context->sample_aspect_ratio );
                        }
                        else
                        {
                                int is_pal = mlt_properties_get_double( properties, "fps" ) == 25.0;
-                               mlt_properties_set_double( properties, "aspect_ratio", is_pal ? 59.0/54.0 : 10.0/11.0 );
+                               aspect_ratio = is_pal ? 59.0/54.0 : 10.0/11.0;
                        }
 
                        // Determine the fps
@@ -699,10 +663,12 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame )
                        // We'll use fps if it's available
                        if ( source_fps > 0 && source_fps < 30 )
                                mlt_properties_set_double( properties, "source_fps", source_fps );
+                       mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
                        
                        // Set the width and height
                        mlt_properties_set_int( frame_properties, "width", codec_context->width );
                        mlt_properties_set_int( frame_properties, "height", codec_context->height );
+                       mlt_properties_set_double( frame_properties, "aspect_ratio", aspect_ratio );
 
                        mlt_frame_push_get_image( frame, producer_get_image );
                        mlt_properties_set_data( frame_properties, "avformat_producer", this, 0, NULL, NULL );