X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_watermark.c;h=f23ac60bebddc46867cc97e09096d6746e0c4aef;hb=ff9da69f0b59e132d8dd28b796e7dc4e9ec8b1bd;hp=a22bac356e9048e9b1a8fb41142c1aa33e71b34c;hpb=037e09bc7cd1c94c73f200d2583dee5a786da810;p=mlt diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c index a22bac35..f23ac60b 100644 --- a/src/modules/core/filter_watermark.c +++ b/src/modules/core/filter_watermark.c @@ -27,60 +27,122 @@ #include #include +#include /** Do it :-). */ -static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable ) +static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable ) { + // Error we will return int error = 0; - mlt_filter filter = mlt_frame_pop_service( this ); - mlt_properties properties = mlt_filter_properties( filter ); + + // Get the watermark filter object + mlt_filter this = mlt_frame_pop_service( frame ); + + // Get the properties of the filter + mlt_properties properties = mlt_filter_properties( this ); + + // Get the producer from the filter mlt_producer producer = mlt_properties_get_data( properties, "producer", NULL ); + + // Get the composite from the filter mlt_transition composite = mlt_properties_get_data( properties, "composite", NULL ); + // Get the resource to use + char *resource = mlt_properties_get( properties, "resource" ); + + // Get the old resource + char *old_resource = mlt_properties_get( properties, "old_resource" ); + + // Create a composite if we don't have one if ( composite == NULL ) { - char *geometry = mlt_properties_get( properties, "geometry" ); - composite = mlt_factory_transition( "composite", geometry == NULL ? "85%,5%:10%x10%" : geometry ); + // Create composite via the factory + composite = mlt_factory_transition( "composite", NULL ); + + // Register the composite for reuse/destruction if ( composite != NULL ) - { - mlt_properties composite_properties = mlt_transition_properties( composite ); - char *distort = mlt_properties_get( properties, "distort" ); - if ( distort != NULL ) - mlt_properties_set( composite_properties, "distort", distort ); mlt_properties_set_data( properties, "composite", composite, 0, ( mlt_destructor )mlt_transition_close, NULL ); - } } - if ( producer == NULL ) + // If we have one + if ( composite != NULL ) { - char *resource = mlt_properties_get( properties, "resource" ); + // Get the properties + mlt_properties composite_properties = mlt_transition_properties( composite ); + + // Pass all the composite. properties on the filter down + mlt_properties_pass( composite_properties, properties, "composite." ); + } + + // Create a producer if don't have one + if ( producer == NULL || ( old_resource != NULL && strcmp( resource, old_resource ) ) ) + { + // Get the factory producer service char *factory = mlt_properties_get( properties, "factory" ); + + // Create the producer producer = mlt_factory_producer( factory, resource ); + + // If we have one if ( producer != NULL ) { - mlt_properties producer_properties = mlt_producer_properties( producer ); - mlt_properties_set( producer_properties, "eof", "loop" ); + // Register the producer for reuse/destruction mlt_properties_set_data( properties, "producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL ); + + // Ensure that we loop + mlt_properties_set( mlt_producer_properties( producer ), "eof", "loop" ); + + // Set the old resource + mlt_properties_set( properties, "old_resource", resource ); } } + if ( producer != NULL ) + { + // Get the producer properties + mlt_properties producer_properties = mlt_producer_properties( producer ); + + // Now pass all producer. properties on the filter down + mlt_properties_pass( producer_properties, properties, "producer." ); + } + + // Only continue if we have both producer and composite if ( composite != NULL && producer != NULL ) { + // Get the service of the producer mlt_service service = mlt_producer_service( producer ); + + // We will get the 'b frame' from the producer mlt_frame b_frame = NULL; + // Get the unique id of the filter (used to reacquire the producer position) + 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 ); + + // Make sure the producer is in the correct position + mlt_producer_seek( producer, position ); + + // Resetting position to appease the composite transition + mlt_frame_set_position( frame, position ); + + // Get the b frame and process with composite if successful if ( mlt_service_get_frame( service, &b_frame, 0 ) == 0 ) - mlt_transition_process( composite, this, b_frame ); + mlt_transition_process( composite, frame, b_frame ); - error = mlt_frame_get_image( this, image, format, width, height, 1 ); + // Get the image + error = mlt_frame_get_image( frame, image, format, width, height, 1 ); + // Close the b frame mlt_frame_close( b_frame ); } else { - error = mlt_frame_get_image( this, image, format, width, height, 1 ); + // Get the image from the frame without running fx + error = mlt_frame_get_image( frame, image, format, width, height, 1 ); } return error; @@ -91,6 +153,15 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) { + // Get the properties of the frame + mlt_properties properties = mlt_frame_properties( frame ); + + // Get a unique name to store the frame position + char *name = mlt_properties_get( mlt_filter_properties( this ), "_unique_id" ); + + // Assign the current position to the name + mlt_properties_set_position( properties, name, mlt_frame_get_position( frame ) ); + // Push the filter on to the stack mlt_frame_push_service( frame, this );