consumer read ahead and int32_t migration

[melted] / src / modules / dv / consumer_libdv.c

diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c
index 3b57638..1d4fafa 100644 (file)
--- a/src/modules/dv/consumer_libdv.c
+++ b/src/modules/dv/consumer_libdv.c
@@ -207,14 +207,10 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram
                int width = mlt_properties_get_int( this_properties, "width" );
                int height = mlt_properties_get_int( this_properties, "height" );
                uint8_t *image = NULL;
-               int is_test = 0;
 
                // Get the image
                mlt_frame_get_image( frame, &image, &fmt, &width, &height, 0 );
 
-               // determine if this a test card
-               is_test = mlt_frame_is_test_card( frame );
-
                // Check that we get what we expected
                if ( fmt != mlt_image_yuv422 || 
                         width != mlt_properties_get_int( this_properties, "width" ) ||
@@ -231,16 +227,10 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram
                }
 
                // Process the frame
-               if ( size != 0 && !( mlt_properties_get_int( this_properties, "was_test_card" ) && is_test ) )
+               if ( size != 0 )
                {
-                       if ( mlt_properties_get_int( mlt_frame_properties( frame ), "top_field_first" ) )
-                               image += width * 2;
-
                        // Encode the image
                        dv_encode_full_frame( encoder, &image, e_dv_color_yuv, dv_frame );
-
-                       // Note test card status
-                       mlt_properties_set_int( this_properties, "was_test_card", is_test );
                }
        }
        
@@ -373,7 +363,7 @@ static void *consumer_thread( void *arg )
        while( mlt_properties_get_int( properties, "running" ) )
        {
                // Get the frame
-               mlt_frame frame = mlt_consumer_get_frame( this );
+               mlt_frame frame = mlt_consumer_rt_frame( this, mlt_image_yuv422 );
 
                // Check that we have a frame to work with
                if ( frame != NULL )