composite
authorlilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Fri, 6 Feb 2004 18:19:40 +0000 (18:19 +0000)
committerlilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Fri, 6 Feb 2004 18:19:40 +0000 (18:19 +0000)
git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@117 d19143bc-622f-0410-bfdd-b5b2a6649095

docs/services.txt
src/modules/core/filter_obscure.c
src/modules/core/transition_composite.c

index 27864d3..37b3b9e 100644 (file)
@@ -89,6 +89,36 @@ Producers
 
                        Implementation does not allow fast random access.
 
+       fezzik
+
+               Description
+
+                       A freindly giant that likes to throw rocks
+
+               Constructor Argument
+
+                       'file'  - produce a/v from file
+
+               Initialisation Properties
+
+                       int in - in point
+                       int out - out point
+
+               Read Only Properties
+
+                       string resource - file location
+                       double fps - output frames per second
+                       double aspect_ratio - aspect ratio of video]
+                       int length - duration of resource (in frames)
+
+               Dependencies
+
+                       all.
+
+               Known Bugs
+
+                       None.
+
        libdv
 
                Description
@@ -648,21 +678,14 @@ Transitions
                        
                Constructor Argument
 
-                       mix - see below
+                       string start - X,Y:WxH[:mix]
 
                Initialisation Properties
                        
+                       string end - X,Y:WxH[:mix]
                        int in - in point
                        int out - out point
-
-               Mutable Properties
-
-                       int x - the horizontal offset from the left edge of the frame
-                       int y - the vertical offset from the top edge of the frame
-                       double mix - the opacity factor to apply to the second frame
-                                    (used in addition to alpha channel).
-                                  - any negative value causes an automatic dissolve
-               
+       
                Read Only Properties
 
                        none
index c68ac99..75a9652 100644 (file)
@@ -257,7 +257,7 @@ mlt_filter filter_obscure_init( void *arg )
        mlt_properties properties = mlt_filter_properties( this );
        mlt_filter_init( this, NULL );
        this->process = filter_process;
-       mlt_properties_set( properties, "start", "0,0:100x100" );
+       mlt_properties_set( properties, "start", arg != NULL ? arg : "0,0:100x100" );
        mlt_properties_set( properties, "end", "" );
        return this;
 }
index 7a32dd5..2903bb0 100644 (file)
 #include <stdio.h>
 #include <stdlib.h>
 
-/** Get the image.
+/** Geometry struct.
+*/
+
+struct geometry_s
+{
+       float x;
+       float y;
+       float w;
+       float h;
+       float mix;
+};
+
+/** Parse a geometry property string.
+*/
+
+static void geometry_parse( struct geometry_s *geometry, struct geometry_s *defaults, char *property )
+{
+       // Assign from defaults if available
+       if ( defaults != NULL )
+       {
+               geometry->x = defaults->x;
+               geometry->y = defaults->y;
+               geometry->w = defaults->w;
+               geometry->h = defaults->h;
+               geometry->mix = defaults->mix;
+       }
+       else
+       {
+               geometry->mix = 100;
+       }
+
+       // Parse the geomtry string
+       if ( property != NULL )
+               sscanf( property, "%f,%f:%fx%f:%f", &geometry->x, &geometry->y, &geometry->w, &geometry->h, &geometry->mix );
+}
+
+/** Calculate real geometry.
+*/
+
+static void geometry_calculate( struct geometry_s *output, struct geometry_s *in, struct geometry_s *out, float position )
+{
+       // Calculate this frames geometry
+       output->x = in->x + ( out->x - in->x ) * position;
+       output->y = in->y + ( out->y - in->y ) * position;
+       output->w = in->w + ( out->w - in->w ) * position;
+       output->h = in->h + ( out->h - in->h ) * position;
+       output->mix = in->mix + ( out->mix - in->mix ) * position;
+}
+
+/** Calculate the position for this frame.
+*/
+
+static float position_calculate( mlt_transition this, mlt_frame frame )
+{
+       // Get the in and out position
+       mlt_position in = mlt_transition_get_in( this );
+       mlt_position out = mlt_transition_get_out( this );
+
+       // Get the position of the frame
+       mlt_position position = mlt_frame_get_position( frame );
+
+       // Now do the calcs
+       return ( float )( position - in ) / ( float )( out - in + 1 );
+}
+
+/** Composite function.
 */
 
-static int transition_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
+static int composite_yuv( uint8_t *p_dest, mlt_image_format format_dest, int width_dest, int height_dest, mlt_frame that, struct geometry_s geometry )
 {
-       // Get the properties of the a frame
-       mlt_properties a_props = mlt_frame_properties( this );
+       int ret = 0;
+       uint8_t *p_src;
+       int i, j;
+       int stride_src;
+       int stride_dest;
+       int x_src = 0, y_src = 0;
+
+       mlt_image_format format_src = format_dest;
+       int x = ( int )( ( float )width_dest * geometry.x / 100 );
+       int y = ( int )( ( float )height_dest * geometry.y / 100 );
+       float weight = geometry.mix / 100;
+       int width_src = ( int )( ( float )width_dest * geometry.w / 100 );
+       int height_src = ( int )( ( float )height_dest * geometry.h / 100 );
+
+       x -= x % 2;
+
+       // optimization point - no work to do
+       if ( ( x < 0 && -x >= width_src ) || ( y < 0 && -y >= height_src ) )
+               return ret;
+
+       format_src = mlt_image_yuv422;
+       format_dest = mlt_image_yuv422;
+
+       mlt_frame_get_image( that, &p_src, &format_src, &width_src, &height_src, 1 /* writable */ );
+
+       stride_src = width_src * 2;
+       stride_dest = width_dest * 2;
+       
+       // crop overlay off the left edge of frame
+       if ( x < 0 )
+       {
+               x_src = -x;
+               width_src -= x_src;
+               x = 0;
+       }
+       
+       // crop overlay beyond right edge of frame
+       else if ( x + width_src > width_dest )
+               width_src = width_dest - x;
+
+       // crop overlay off the top edge of the frame
+       if ( y < 0 )
+       {
+               y_src = -y;
+               height_src -= y_src;
+       }
+       // crop overlay below bottom edge of frame
+       else if ( y + height_src > height_dest )
+               height_src = height_dest - y;
+
+       // offset pointer into overlay buffer based on cropping
+       p_src += x_src * 2 + y_src * stride_src;
+
+       // offset pointer into frame buffer based upon positive, even coordinates only!
+       p_dest += ( x < 0 ? 0 : x ) * 2 + ( y < 0 ? 0 : y ) * stride_dest;
+
+       // Get the alpha channel of the overlay
+       uint8_t *p_alpha = mlt_frame_get_alpha_mask( that );
+
+       // offset pointer into alpha channel based upon cropping
+       if ( p_alpha )
+               p_alpha += x_src + y_src * stride_src / 2;
+
+       uint8_t *p = p_src;
+       uint8_t *q = p_dest;
+       uint8_t *o = p_dest;
+       uint8_t *z = p_alpha;
+
+       uint8_t Y;
+       uint8_t UV;
+       uint8_t a;
+       float value;
+
+       // now do the compositing only to cropped extents
+       for ( i = 0; i < height_src; i++ )
+       {
+               p = p_src;
+               q = p_dest;
+               o = p_dest;
+               z = p_alpha;
+
+               for ( j = 0; j < width_src; j ++ )
+               {
+                       Y = *p ++;
+                       UV = *p ++;
+                       a = ( z == NULL ) ? 255 : *z ++;
+                       value = ( weight * ( float ) a / 255.0 );
+                       *o ++ = (uint8_t)( Y * value + *q++ * ( 1 - value ) );
+                       *o ++ = (uint8_t)( UV * value + *q++ * ( 1 - value ) );
+               }
+
+               p_src += stride_src;
+               p_dest += stride_dest;
+               if ( p_alpha )
+                       p_alpha += stride_src / 2;
+       }
+
+       return ret;
+}
+
+
+/** Get the image.
+*/
 
+static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
+{
        // Get the b frame from the stack
-       mlt_frame b_frame = mlt_frame_pop_frame( this );
+       mlt_frame b_frame = mlt_frame_pop_frame( a_frame );
+
+       // Get the image from the a frame
+       mlt_frame_get_image( a_frame, image, format, width, height, 1 );
 
        if ( b_frame != NULL )
        {
                // Get the properties of the b frame
                mlt_properties b_props = mlt_frame_properties( b_frame );
 
-               // Arbitrary composite defaults
-               int x = 0;
-               int y = 0;
-               double mix = 1.0;
+               // Get the transition from the b frame
+               mlt_transition this = mlt_properties_get_data( b_props, "transition_composite", NULL );
 
-               // Override from b frame properties if provided
-               if ( mlt_properties_get( b_props, "x" ) != NULL )
-                       x = mlt_properties_get_int( b_props, "x" );
-               if ( mlt_properties_get( b_props, "y" ) != NULL )
-                       y = mlt_properties_get_int( b_props, "y" );
-               if ( mlt_properties_get( b_props, "image.mix" ) != NULL )
-                       mix = mlt_properties_get_double( b_props, "image.mix" );
+               // Get the properties from the transition
+               mlt_properties properties = mlt_transition_properties( this );
 
-               // Composite the b_frame on the a_frame
-               mlt_frame_composite_yuv( this, b_frame, x, y, mix );
+               // Structures for geometry
+               struct geometry_s result;
+               struct geometry_s start;
+               struct geometry_s end;
 
-               // Extract the a_frame image info
-               *width = mlt_properties_get_int( a_props, "width" );
-               *height = mlt_properties_get_int( a_props, "height" );
-               *image = mlt_properties_get_data( a_props, "image", NULL );
-       }
-       else if ( a_props != NULL )
-       {
-               // Extract the a_frame image info
-               *width = mlt_properties_get_int( a_props, "width" );
-               *height = mlt_properties_get_int( a_props, "height" );
-               *image = mlt_properties_get_data( a_props, "image", NULL );
+               // Calculate the position
+               float position = position_calculate( this, a_frame );
+
+               // Now parse the geometries
+               geometry_parse( &start, NULL, mlt_properties_get( properties, "start" ) );
+               geometry_parse( &end, &start, mlt_properties_get( properties, "end" ) );
+
+               // Do the calculation
+               geometry_calculate( &result, &start, &end, position );
+
+               // Composite the b_frame on the a_frame
+               composite_yuv( *image, *format, *width, *height, b_frame, result );
        }
 
        return 0;
@@ -78,34 +245,10 @@ static int transition_get_image( mlt_frame this, uint8_t **image, mlt_image_form
 static mlt_frame composite_process( mlt_transition this, mlt_frame a_frame, mlt_frame b_frame )
 {
        // Propogate the transition properties to the b frame
-       mlt_properties properties = mlt_transition_properties( this );
        mlt_properties b_props = mlt_frame_properties( b_frame );
-       
-       if ( mlt_properties_get( properties, "x" ) != NULL )
-               mlt_properties_set_int( b_props, "x", mlt_properties_get_int( properties, "x" ) );
-       if ( mlt_properties_get( properties, "y" ) != NULL )
-               mlt_properties_set_int( b_props, "y", mlt_properties_get_int( properties, "y" ) );
-
-       // Only if mix is specified, otherwise a producer may set the mix
-       if ( mlt_properties_get( properties, "mix" ) != NULL )
-       {
-               // A negative means dissolve
-               if ( mlt_properties_get_double( properties, "mix" ) < 0 )
-               {
-                       // Determine the time position of this frame in the transition duration
-                       mlt_position in = mlt_transition_get_in( this );
-                       mlt_position out = mlt_transition_get_out( this );
-                       mlt_position time = mlt_frame_get_position( b_frame );
-                       double mix = ( double )( time - in ) / ( double )( out - in + 1 );
-                       mlt_properties_set_double( b_props, "image.mix", mix );
-               }
-               else
-                       mlt_properties_set_double( b_props, "image.mix", mlt_properties_get_double( properties, "mix" ) );
-       }
-       
+       mlt_properties_set_data( b_props, "transition_composite", this, 0, NULL, NULL );
        mlt_frame_push_get_image( a_frame, transition_get_image );
        mlt_frame_push_frame( a_frame, b_frame );
-
        return a_frame;
 }
 
@@ -118,8 +261,8 @@ mlt_transition transition_composite_init( char *arg )
        if ( this != NULL && mlt_transition_init( this, NULL ) == 0 )
        {
                this->process = composite_process;
-               if ( arg != NULL )
-                       mlt_properties_set_double( mlt_transition_properties( this ), "mix", atof( arg ) );
+               mlt_properties_set( mlt_transition_properties( this ), "start", arg != NULL ? arg : "85,5:10x10" );
+               mlt_properties_set( mlt_transition_properties( this ), "end", "" );
        }
        return this;
 }