]> git.sesse.net Git - mlt/blobdiff - src/modules/core/filter_watermark.c
Attempt at an aspect ratio clean up
[mlt] / src / modules / core / filter_watermark.c
index f4a87ea6277eb360b9c560fe96bdec517146b031..aee35ed3ed43f690b76fc092a4fcdad9460fc39f 100644 (file)
@@ -74,6 +74,9 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 
                // 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
@@ -132,6 +135,25 @@ 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 )
                {
+                       // 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_deinterlace", mlt_properties_get_double( a_props, "consumer_deinterlace" ) );
+
+                       mlt_properties_set_int( b_props, "normalised_width", mlt_properties_get_int( a_props, "normalised_width" ) );
+                       mlt_properties_set_int( b_props, "normalised_height", mlt_properties_get_int( a_props, "normalised_height" ) );
+
+                       if ( mlt_properties_get_int( properties, "distort" ) )
+                       {
+                               mlt_properties_set( mlt_transition_properties( composite ), "distort", "true" );
+                               mlt_properties_set( a_props, "distort", "true" );
+                               mlt_properties_set( b_props, "distort", "true" );
+                       }
+
                        if ( mlt_properties_get_int( properties, "reverse" ) == 0 )
                        {
                                // Apply all filters that are attached to this filter to the b frame
@@ -145,18 +167,28 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                        }
                        else
                        {
-                               mlt_properties a_props = mlt_frame_properties( frame );
-                               mlt_properties b_props = mlt_frame_properties( b_frame );
+                               char temp[ 132 ];
+                               int count = 0;
+                               uint8_t *alpha = NULL;
                                mlt_transition_process( composite, b_frame, frame );
+                               mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_int( a_props, "consumer_aspect_ratio" ) );
+                               mlt_properties_set_int( a_props, "consumer_deinterlace", 1 );
+                               mlt_properties_set_int( b_props, "consumer_deinterlace", 1 );
                                mlt_properties_set( a_props, "rescale.interp", "nearest" );
                                mlt_properties_set( b_props, "rescale.interp", "nearest" );
-                               mlt_properties_set_int( b_props, "consumer_aspect_ratio", 1 );
-                               mlt_service_apply_filters( mlt_filter_service( this ), frame, 0 );
+                               mlt_service_apply_filters( mlt_filter_service( this ), b_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 );
+                               alpha = mlt_frame_get_alpha_mask( b_frame );
+                               mlt_properties_set_data( a_props, "image", *image, *width * *height * 2, NULL, NULL );
+                               mlt_properties_set_data( a_props, "alpha", alpha, *width * *height, NULL, NULL );
                                mlt_properties_set_int( a_props, "width", *width );
                                mlt_properties_set_int( a_props, "height", *height );
+                               mlt_properties_set_int( a_props, "progressive", 1 );
+                               mlt_properties_inc_ref( b_props );
+                               strcpy( temp, "_b_frame" );
+                               while( mlt_properties_get_data( a_props, temp, NULL ) != NULL )
+                                       sprintf( temp, "_b_frame%d", count ++ );
+                               mlt_properties_set_data( a_props, temp, b_frame, 0, ( mlt_destructor )mlt_frame_close, NULL );
                        }
                }
 
@@ -184,7 +216,7 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
        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 ) );
+       mlt_properties_set_position( properties, name, mlt_frame_get_position( frame ) - mlt_filter_get_in( this ) );
 
        // Push the filter on to the stack
        mlt_frame_push_service( frame, this );