X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_region.c;h=1bf836ee4377c1b20b5823c873a5e2070cc394c6;hb=91fb4d73caa09a606c46393c7565462bf926e6a8;hp=4e2eb11e390499fbfee5d311a4fa0855f4c7d9f2;hpb=9ab18ed63c37a9ef65e06697ae25f5c198d788bb;p=mlt diff --git a/src/modules/core/transition_region.c b/src/modules/core/transition_region.c index 4e2eb11e..1bf836ee 100644 --- a/src/modules/core/transition_region.c +++ b/src/modules/core/transition_region.c @@ -52,7 +52,7 @@ static int create_instance( mlt_transition this, char *name, char *value, int co if ( filter != NULL ) { // Properties of this - mlt_properties properties = mlt_transition_properties( this ); + mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); // String to hold the property name char id[ 256 ]; @@ -67,11 +67,11 @@ static int create_instance( mlt_transition this, char *name, char *value, int co sprintf( key, "%s.", name ); // Just in case, let's assume that the filter here has a composite - mlt_properties_set( mlt_filter_properties( filter ), "composite.start", "0%,0%:100%x100%" ); - mlt_properties_set( mlt_filter_properties( filter ), "composite.fill", "true" ); + //mlt_properties_set( MLT_FILTER_PROPERTIES( filter ), "composite.geometry", "0%,0%:100%x100%" ); + //mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "composite.fill", 1 ); // Pass all the key properties on the filter down - mlt_properties_pass( mlt_filter_properties( filter ), properties, key ); + mlt_properties_pass( MLT_FILTER_PROPERTIES( filter ), properties, key ); // Ensure that filter is assigned mlt_properties_set_data( properties, id, filter, 0, ( mlt_destructor )mlt_filter_close, NULL ); @@ -91,23 +91,47 @@ static int create_instance( mlt_transition this, char *name, char *value, int co static uint8_t *filter_get_alpha_mask( mlt_frame this ) { + uint8_t *alpha = NULL; + // Obtain properties of frame - mlt_properties properties = mlt_frame_properties( this ); + mlt_properties properties = MLT_FRAME_PROPERTIES( this ); // Get the shape frame mlt_frame shape_frame = mlt_properties_get_data( properties, "shape_frame", NULL ); // Get the width and height of the image - int region_width = mlt_properties_get_int( mlt_frame_properties( this ), "width" ); - int region_height = mlt_properties_get_int( mlt_frame_properties( this ), "height" ); + int region_width = mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "width" ); + int region_height = mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "height" ); uint8_t *image = NULL; mlt_image_format format = mlt_image_yuv422; // Get the shape image to trigger alpha creation - mlt_properties_set( mlt_frame_properties( shape_frame ), "distort", "true" ); + mlt_properties_set_int( MLT_FRAME_PROPERTIES( shape_frame ), "distort", 1 ); mlt_frame_get_image( shape_frame, &image, &format, ®ion_width, ®ion_height, 0 ); - return mlt_frame_get_alpha_mask( shape_frame ); + alpha = mlt_frame_get_alpha_mask( shape_frame ); + + // Generate from the Y component of the image if no alpha available + if ( alpha == NULL ) + { + int size = region_width * region_height; + uint8_t *p = mlt_pool_alloc( size ); + alpha = p; + while ( size -- ) + { + *p ++ = ( int )( ( ( *image ++ - 16 ) * 299 ) / 255 ); + image ++; + } + mlt_properties_set_data( MLT_FRAME_PROPERTIES( this ), "alpha", alpha, region_width * region_height, mlt_pool_release, NULL ); + } + else + { + mlt_properties_set_data( MLT_FRAME_PROPERTIES( this ), "alpha", alpha, region_width * region_height, NULL, NULL ); + } + + this->get_alpha_mask = NULL; + + return alpha; } /** Do it :-). @@ -118,14 +142,14 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for // Error we will return int error = 0; - // Get the watermark transition object - mlt_transition this = mlt_frame_pop_service( frame ); - // We will get the 'b frame' from the frame stack mlt_frame b_frame = mlt_frame_pop_frame( frame ); + // Get the watermark transition object + mlt_transition this = mlt_frame_pop_service( frame ); + // Get the properties of the transition - mlt_properties properties = mlt_transition_properties( this ); + mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); // Get the composite from the transition mlt_transition composite = mlt_properties_get_data( properties, "composite", NULL ); @@ -137,7 +161,7 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for char *name = mlt_properties_get( properties, "_unique_id" ); // Get the original producer position - mlt_position position = mlt_properties_get_position( mlt_frame_properties( frame ), name ); + mlt_position position = mlt_properties_get_position( MLT_FRAME_PROPERTIES( frame ), name ); // Create a composite if we don't have one if ( composite == NULL ) @@ -149,11 +173,11 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for if ( composite != NULL ) { // Get the properties - mlt_properties composite_properties = mlt_transition_properties( composite ); + mlt_properties composite_properties = MLT_TRANSITION_PROPERTIES( composite ); // We want to ensure that we don't get a wobble... - mlt_properties_set( composite_properties, "distort", "true" ); - mlt_properties_set( composite_properties, "progressive", "1" ); + //mlt_properties_set_int( composite_properties, "distort", 1 ); + mlt_properties_set_int( composite_properties, "progressive", 1 ); // Pass all the composite. properties on the transition down mlt_properties_pass( composite_properties, properties, "composite." ); @@ -162,6 +186,12 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for mlt_properties_set_data( properties, "composite", composite, 0, ( mlt_destructor )mlt_transition_close, NULL ); } } + else + { + // Pass all current properties down + mlt_properties composite_properties = MLT_TRANSITION_PROPERTIES( composite ); + mlt_properties_pass( composite_properties, properties, "composite." ); + } // Create filters if ( filter == NULL ) @@ -189,6 +219,48 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for count ++; } } + + // Look for the first filter again + filter = mlt_properties_get_data( properties, "_filter_0", NULL ); + } + else + { + // Pass all properties down + mlt_filter temp = NULL; + + // Loop Variable + int i = 0; + + // Number of filters found + int count = 0; + + // Loop for all properties + for ( i = 0; i < mlt_properties_count( properties ); i ++ ) + { + // Get the name of this property + char *name = mlt_properties_get_name( properties, i ); + + // If the name does not contain a . and matches filter + if ( strchr( name, '.' ) == NULL && !strncmp( name, "filter", 6 ) ) + { + // Strings to hold the id and pass down key + char id[ 256 ]; + char key[ 256 ]; + + // Construct id and key + sprintf( id, "_filter_%d", count ); + sprintf( key, "%s.", name ); + + // Get the filter + temp = mlt_properties_get_data( properties, id, NULL ); + + if ( temp != NULL ) + { + mlt_properties_pass( MLT_FILTER_PROPERTIES( temp ), properties, key ); + count ++; + } + } + } } // Get the image @@ -200,6 +272,9 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for // Get the resource of this filter (could be a shape [rectangle/circle] or an alpha provider of choice char *resource = mlt_properties_get( properties, "resource" ); + // Get the old resource in case it's changed + char *old_resource = mlt_properties_get( properties, "_old_resource" ); + // String to hold the filter to query on char id[ 256 ]; @@ -213,14 +288,18 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for b_frame = composite_copy_region( composite, frame, position ); // Ensure a destructor - mlt_properties_set_data( mlt_frame_properties( frame ), name, b_frame, 0, ( mlt_destructor )mlt_frame_close, NULL ); + mlt_properties_set_data( MLT_FRAME_PROPERTIES( frame ), name, b_frame, 0, ( mlt_destructor )mlt_frame_close, NULL ); } + // Set the position of the b_frame + mlt_frame_set_position( b_frame, position ); + // Make sure the filter is in the correct position while ( filter != NULL ) { // Stack this filter - mlt_filter_process( filter, b_frame ); + if ( mlt_properties_get_int( MLT_FILTER_PROPERTIES( filter ), "off" ) == 0 ) + mlt_filter_process( filter, b_frame ); // Generate the key for the next sprintf( id, "_filter_%d", ++ i ); @@ -229,6 +308,11 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for filter = mlt_properties_get_data( properties, id, NULL ); } + // Allow filters to be attached to a region filter + filter = mlt_properties_get_data( properties, "_region_filter", NULL ); + if ( filter != NULL ) + mlt_service_apply_filters( MLT_FILTER_SERVICE( filter ), b_frame, 0 ); + // Hmm - this is probably going to go wrong.... mlt_frame_set_position( frame, position ); @@ -242,11 +326,14 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for mlt_producer producer = mlt_properties_get_data( properties, "producer", NULL ); // If We have no producer then create one - if ( producer == NULL ) + if ( producer == NULL || ( old_resource != NULL && strcmp( resource, old_resource ) ) ) { // Get the factory producer service char *factory = mlt_properties_get( properties, "factory" ); + // Store the old resource + mlt_properties_set( properties, "_old_resource", resource ); + // Special case circle resource if ( strcmp( resource, "circle" ) == 0 ) { @@ -264,7 +351,7 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for if ( producer != NULL ) { // Get the producer properties - mlt_properties producer_properties = mlt_producer_properties( producer ); + mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( producer ); // Ensure that we loop mlt_properties_set( producer_properties, "eof", "loop" ); @@ -287,10 +374,10 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for mlt_producer_seek( producer, position ); // Get the shape frame - if ( mlt_service_get_frame( mlt_producer_service( producer ), &shape_frame, 0 ) == 0 ) + if ( mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), &shape_frame, 0 ) == 0 ) { // Ensure that the shape frame will be closed - mlt_properties_set_data( mlt_frame_properties( b_frame ), "shape_frame", shape_frame, 0, ( mlt_destructor )mlt_frame_close, NULL ); + mlt_properties_set_data( MLT_FRAME_PROPERTIES( b_frame ), "shape_frame", shape_frame, 0, ( mlt_destructor )mlt_frame_close, NULL ); // Specify the callback for evaluation b_frame->get_alpha_mask = filter_get_alpha_mask; @@ -311,10 +398,10 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for static mlt_frame transition_process( mlt_transition this, mlt_frame a_frame, mlt_frame b_frame ) { // Get the properties of the frame - mlt_properties properties = mlt_frame_properties( a_frame ); + mlt_properties properties = MLT_FRAME_PROPERTIES( a_frame ); // Get a unique name to store the frame position - char *name = mlt_properties_get( mlt_transition_properties( this ), "_unique_id" ); + char *name = mlt_properties_get( MLT_TRANSITION_PROPERTIES( this ), "_unique_id" ); // Assign the current position to the name mlt_properties_set_position( properties, name, mlt_frame_get_position( a_frame ) ); @@ -322,12 +409,12 @@ static mlt_frame transition_process( mlt_transition this, mlt_frame a_frame, mlt // Push the transition on to the frame mlt_frame_push_service( a_frame, this ); - // Push the transition method - mlt_frame_push_get_image( a_frame, transition_get_image ); - // Push the b_frame on to the stack mlt_frame_push_frame( a_frame, b_frame ); + // Push the transition method + mlt_frame_push_get_image( a_frame, transition_get_image ); + // Return the frame return a_frame; } @@ -344,7 +431,7 @@ mlt_transition transition_region_init( void *arg ) if ( this != NULL ) { // Get the properties from the transition - mlt_properties properties = mlt_transition_properties( this ); + mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); // Assign the transition process method this->process = transition_process; @@ -354,6 +441,9 @@ mlt_transition transition_region_init( void *arg ) // Resource defines the shape of the region mlt_properties_set( properties, "resource", arg == NULL ? "rectangle" : arg ); + + // Inform apps and framework that this is a video only transition + mlt_properties_set_int( properties, "_transition_type", 1 ); } // Return the transition