*width = mlt_properties_get_int( frame_properties, "width" );
*height = mlt_properties_get_int( frame_properties, "height" );
- // image stride
- int size, xstride, ystride;
- switch( *format ){
- case mlt_image_yuv422:
- size = *width * *height * 2;
- xstride = 2;
- ystride = 2 * *width;
+ int size;
+ switch ( *format )
+ {
+ case mlt_image_yuv420p:
+ size = *width * 3 * ( *height + 1 ) / 2;
+ break;
+ case mlt_image_rgb24:
+ size = *width * ( *height + 1 ) * 3;
break;
default:
- fprintf(stderr, "Unsupported image format\n");
- return -1;
+ *format = mlt_image_yuv422;
+ size = *width * ( *height + 1 ) * 2;
+ break;
}
- uint8_t *output = mlt_properties_get_data( producer_properties, "output_buffer", 0 );
+ uint8_t *output = mlt_properties_get_data( producer_properties, "output_buffer", NULL );
+
if( output == NULL )
{
output = mlt_pool_alloc( size );
// Get the frame
mlt_service_get_frame( MLT_PRODUCER_SERVICE( real_producer ), &first_frame, index );
- }
+ double ratio = mlt_properties_get_double( MLT_PRODUCER_PROPERTIES( real_producer ), "aspect_ratio" ) * (double) mlt_properties_get_int( MLT_FRAME_PROPERTIES( first_frame ), "width" ) / (double) mlt_properties_get_int( MLT_FRAME_PROPERTIES( first_frame ), "height" ) / ( (double) mlt_properties_get_int(MLT_FRAME_PROPERTIES( *frame ), "width" ) / (double) mlt_properties_get_int( MLT_FRAME_PROPERTIES( *frame ), "height" ));
+
+ mlt_properties_set_double( properties, "ratio_fix", ratio );
+ }
// Make sure things are in their place
mlt_properties_set_data( properties, "first_frame", first_frame, 0, NULL, NULL );
mlt_frame_push_service( *frame, this );
mlt_frame_push_service( *frame, framebuffer_get_image );
+
// Give the returned frame temporal identity
mlt_frame_set_position( *frame, mlt_producer_position( this ) );
-
+ mlt_properties_set_double( MLT_FRAME_PROPERTIES(*frame), "aspect_ratio", mlt_properties_get_double( properties, "ratio_fix" ));
}
return 0;
count = strcspn( ptr, ":" );
ptr[count] = '\0';
- real_producer = mlt_factory_producer( "fezzik", props );
+ real_producer = mlt_factory_producer( "fezzik", props );
ptr += count + 1;
ptr += strspn( ptr, ":" );
// Store the producer and fitler
mlt_properties_set_data( properties, "producer", real_producer, 0, ( mlt_destructor )mlt_producer_close, NULL );
- // Grap some stuff from the real_producer
- mlt_properties_pass_list( properties, MLT_PRODUCER_PROPERTIES( real_producer ),
- "length,resource,width,height" );
+ // Grab some stuff from the real_producer
+ mlt_properties_pass_list( properties, MLT_PRODUCER_PROPERTIES( real_producer ), "length,resource,width,height" );
+
if ( speed != 1.0 )
{