X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_watermark.c;h=4908d441073e7eca174d0f8412cd690676326c9a;hb=1da06dddd4f117c21c07b3682fab5abab014d995;hp=fec4d53739888b133e6b3e61dbab0c87cc89b21f;hpb=5b59ce704d4f317e845afa30c5ade12c0fd22d43;p=melted diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c index fec4d53..4908d44 100644 --- a/src/modules/core/filter_watermark.c +++ b/src/modules/core/filter_watermark.c @@ -27,6 +27,7 @@ #include #include +#include /** Do it :-). */ @@ -48,32 +49,39 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format // 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 ) { // Create composite via the factory composite = mlt_factory_transition( "composite", NULL ); - // If we have one + // Register the composite for reuse/destruction if ( composite != NULL ) - { - // Get the properties - mlt_properties composite_properties = mlt_transition_properties( composite ); + mlt_properties_set_data( properties, "composite", composite, 0, ( mlt_destructor )mlt_transition_close, NULL ); + } - // Pass all the composite. properties on the filter down - mlt_properties_pass( composite_properties, properties, "composite." ); + // If we have one + if ( composite != NULL ) + { + // Get the properties + mlt_properties composite_properties = mlt_transition_properties( composite ); - // Register the composite for reuse/destruction - mlt_properties_set_data( properties, "composite", composite, 0, ( mlt_destructor )mlt_transition_close, NULL ); - } + // Pass all the composite. properties on the filter down + mlt_properties_pass( composite_properties, properties, "composite." ); + + // Force a refresh + mlt_properties_set_int( composite_properties, "refresh", 1 ); } // Create a producer if don't have one - if ( producer == NULL ) + if ( producer == NULL || ( old_resource != NULL && strcmp( resource, old_resource ) ) ) { - // Get the resource to use - char *resource = mlt_properties_get( properties, "resource" ); - // Get the factory producer service char *factory = mlt_properties_get( properties, "factory" ); @@ -83,20 +91,26 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format // If we have one if ( producer != NULL ) { - // Get the producer properties - mlt_properties producer_properties = mlt_producer_properties( producer ); + // 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( producer_properties, "eof", "loop" ); - - // Now pass all producer. properties on the filter down - mlt_properties_pass( producer_properties, properties, "producer." ); + mlt_properties_set( mlt_producer_properties( producer ), "eof", "loop" ); - // Register the producer for reuse/destruction - mlt_properties_set_data( properties, "producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL ); + // 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 ) { @@ -120,10 +134,40 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format // Get the b frame and process with composite if successful if ( mlt_service_get_frame( service, &b_frame, 0 ) == 0 ) - mlt_transition_process( composite, frame, b_frame ); - - // Get the image - error = mlt_frame_get_image( frame, image, format, width, height, 1 ); + { + // Get the a and b frame properties + mlt_properties a_props = mlt_frame_properties( frame ); + mlt_properties b_props = mlt_frame_properties( b_frame ); + + // Set the b frame to be in the same position and have same consumer requirements + mlt_frame_set_position( b_frame, position ); + mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) ); + mlt_properties_set_int( b_props, "consumer_progressive", mlt_properties_get_double( a_props, "consumer_progressive" ) ); + + if ( mlt_properties_get_int( properties, "reverse" ) == 0 ) + { + // Apply all filters that are attached to this filter to the b frame + mlt_service_apply_filters( mlt_filter_service( this ), b_frame, 0 ); + + // Process the frame + mlt_transition_process( composite, frame, b_frame ); + + // Get the image + error = mlt_frame_get_image( frame, image, format, width, height, 1 ); + } + else + { + mlt_transition_process( composite, b_frame, frame ); + mlt_properties_set( a_props, "rescale.interp", "nearest" ); + mlt_properties_set( b_props, "rescale.interp", "nearest" ); + mlt_service_apply_filters( mlt_filter_service( this ), frame, 0 ); + error = mlt_frame_get_image( b_frame, image, format, width, height, 1 ); + mlt_properties_set_data( b_props, "image", *image, 0, NULL, NULL ); + mlt_properties_set_data( a_props, "image", *image, *width * *height * 2, mlt_pool_release, NULL ); + mlt_properties_set_int( a_props, "width", *width ); + mlt_properties_set_int( a_props, "height", *height ); + } + } // Close the b frame mlt_frame_close( b_frame ); @@ -173,6 +217,8 @@ mlt_filter filter_watermark_init( void *arg ) mlt_properties_set( properties, "factory", "fezzik" ); if ( arg != NULL ) mlt_properties_set( properties, "resource", arg ); + // Ensure that attached filters are handled privately + mlt_properties_set_int( properties, "_filter_private", 1 ); } return this; }