producer->close = ( mlt_destructor )producer_close;
// Set the default properties
- mlt_properties_set( properties, "resource", colour == NULL ? "0x000000ff" : colour );
+ mlt_properties_set( properties, "resource", ( !colour || !strcmp( colour, "" ) ) ? "0x000000ff" : colour );
mlt_properties_set( properties, "_resource", "" );
- mlt_properties_set_double( properties, "aspect_ratio", 0 );
+ mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) );
return producer;
}
{
rgba_color result = { 0xff, 0xff, 0xff, 0xff };
- if ( strchr( color, '/' ) )
- color = strrchr( color, '/' ) + 1;
-
if ( !strcmp( color, "red" ) )
{
result.r = 0xff;
result.g = 0x00;
result.b = 0xff;
}
+ else if ( !strcmp( color, "black" ) )
+ {
+ result.r = 0x00;
+ result.g = 0x00;
+ result.b = 0x00;
+ }
else if ( strcmp( color, "white" ) )
{
result.r = ( color_int >> 24 ) & 0xff;
static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
{
- // May need to know the size of the image to clone it
- int size = 0;
-
// Obtain properties of frame
mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
// Obtain the producer for this frame
mlt_producer producer = mlt_properties_get_data( properties, "producer_colour", NULL );
+ mlt_service_lock( MLT_PRODUCER_SERVICE( producer ) );
+
// Obtain properties of producer
mlt_properties producer_props = MLT_PRODUCER_PROPERTIES( producer );
char *then = mlt_properties_get( producer_props, "_resource" );
// Get the current image and dimensions cached in the producer
+ int size = 0;
uint8_t *image = mlt_properties_get_data( producer_props, "image", &size );
int current_width = mlt_properties_get_int( producer_props, "_width" );
int current_height = mlt_properties_get_int( producer_props, "_height" );
+ mlt_image_format current_format = mlt_properties_get_int( producer_props, "_format" );
// Parse the colour
+ if ( now && strchr( now, '/' ) )
+ {
+ now = strdup( strrchr( now, '/' ) + 1 );
+ mlt_properties_set( producer_props, "resource", now );
+ free( now );
+ now = mlt_properties_get( producer_props, "resource" );
+ }
rgba_color color = parse_color( now, mlt_properties_get_int( producer_props, "resource" ) );
+ // Choose suitable out values if nothing specific requested
+ if ( *format == mlt_image_none )
+ *format = mlt_image_rgb24a;
+ if ( *width <= 0 )
+ *width = mlt_service_profile( MLT_PRODUCER_SERVICE(producer) )->width;
+ if ( *height <= 0 )
+ *height = mlt_service_profile( MLT_PRODUCER_SERVICE(producer) )->height;
+
// See if we need to regenerate
- if ( strcmp( now, then ) || *width != current_width || *height != current_height )
+ if ( strcmp( now, then ) || *width != current_width || *height != current_height || *format != current_format )
{
// Color the image
- uint8_t y, u, v;
- int i = *height;
- int j = 0;
- int uneven = *width % 2;
- int count = ( *width - uneven ) / 2;
- uint8_t *p = NULL;
+ int i = *width * *height + 1;
+ int bpp;
// Allocate the image
- size = *width * *height * 2;
- image = mlt_pool_alloc( size );
+ size = mlt_image_format_size( *format, *width, *height, &bpp );
+ uint8_t *p = image = mlt_pool_alloc( size );
// Update the producer
mlt_properties_set_data( producer_props, "image", image, size, mlt_pool_release, NULL );
mlt_properties_set_int( producer_props, "_width", *width );
mlt_properties_set_int( producer_props, "_height", *height );
+ mlt_properties_set_int( producer_props, "_format", *format );
mlt_properties_set( producer_props, "_resource", now );
- RGB2YUV( color.r, color.g, color.b, y, u, v );
-
- p = image;
+ mlt_service_unlock( MLT_PRODUCER_SERVICE( producer ) );
- while ( i -- )
+ switch ( *format )
+ {
+ case mlt_image_yuv422:
{
- j = count;
- while ( j -- )
+ int uneven = *width % 2;
+ int count = ( *width - uneven ) / 2 + 1;
+ uint8_t y, u, v;
+
+ RGB2YUV_601_SCALED( color.r, color.g, color.b, y, u, v );
+ i = *height + 1;
+ while ( --i )
{
- *p ++ = y;
- *p ++ = u;
- *p ++ = y;
- *p ++ = v;
+ int j = count;
+ while ( --j )
+ {
+ *p ++ = y;
+ *p ++ = u;
+ *p ++ = y;
+ *p ++ = v;
+ }
+ if ( uneven )
+ {
+ *p ++ = y;
+ *p ++ = u;
+ }
}
- if ( uneven )
+ break;
+ }
+ case mlt_image_rgb24:
+ while ( --i )
{
- *p ++ = y;
- *p ++ = u;
+ *p ++ = color.r;
+ *p ++ = color.g;
+ *p ++ = color.b;
}
+ break;
+ case mlt_image_glsl:
+ case mlt_image_glsl_texture:
+ memset(p, 0, size);
+ break;
+ default:
+ *format = mlt_image_rgb24a;
+ while ( --i )
+ {
+ *p ++ = color.r;
+ *p ++ = color.g;
+ *p ++ = color.b;
+ *p ++ = color.a;
+ }
+ break;
}
}
-
- // Update the frame
- mlt_properties_set_int( properties, "width", *width );
- mlt_properties_set_int( properties, "height", *height );
-
- // Clone if necessary (deemed always necessary)
- if ( 1 )
+ else
{
- // Create the alpha channel
- uint8_t *alpha = mlt_pool_alloc( size >> 1 );
+ mlt_service_unlock( MLT_PRODUCER_SERVICE( producer ) );
+ }
- // Clone our image
- uint8_t *copy = mlt_pool_alloc( size );
- memcpy( copy, image, size );
+ // Create the alpha channel
+ int alpha_size = *width * *height;
+ uint8_t *alpha = mlt_pool_alloc( alpha_size );
- // We're going to pass the copy on
- image = copy;
+ // Initialise the alpha
+ if ( alpha )
+ memset( alpha, color.a, alpha_size );
- // Initialise the alpha
- if ( alpha )
- memset( alpha, color.a, size >> 1 );
+ // Clone our image
+ *buffer = mlt_pool_alloc( size );
+ memcpy( *buffer, image, size );
- // Now update properties so we free the copy after
- mlt_properties_set_data( properties, "image", copy, size, mlt_pool_release, NULL );
- mlt_properties_set_data( properties, "alpha", alpha, size >> 1, mlt_pool_release, NULL );
- mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( producer_props, "aspect_ratio" ) );
- }
+ // Now update properties so we free the copy after
+ mlt_frame_set_image( frame, *buffer, size, mlt_pool_release );
+ mlt_frame_set_alpha( frame, alpha, alpha_size, mlt_pool_release );
+ mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( producer_props, "aspect_ratio" ) );
+ mlt_properties_set_int( properties, "meta.media.width", *width );
+ mlt_properties_set_int( properties, "meta.media.height", *height );
- // Pass on the image
- *buffer = image;
- *format = mlt_image_yuv422;
return 0;
}
// Set producer-specific frame properties
mlt_properties_set_int( properties, "progressive", 1 );
- mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( producer_props, "aspect_ratio" ) );
+ mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) );
+ mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) );
// colour is an alias for resource
if ( mlt_properties_get( producer_props, "colour" ) != NULL )
projects / mlt / blobdiff