* Copyright (C) 2003-2004 Ushodaya Enterprises Limited
* Author: Charles Yates <charles.yates@pandora.be>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "transition_region.h"
*arg ++ = '\0';
// Create the filter
- filter = mlt_factory_filter( type, arg );
+ mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( this ) );
+ filter = mlt_factory_filter( profile, type, arg );
// If we have a filter, then initialise and store it
if ( filter != NULL )
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_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 );
alpha = mlt_frame_get_alpha_mask( shape_frame );
alpha = p;
while ( size -- )
{
- *p ++ = *image ++;
+ *p ++ = ( int )( ( ( *image ++ - 16 ) * 299 ) / 255 );
image ++;
}
- mlt_properties_set_data( MLT_FRAME_PROPERTIES( shape_frame ), "alpha", alpha,
- region_width * region_height, mlt_pool_release, NULL );
+ 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;
}
// Get the properties of the transition
mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
+ mlt_service_lock( MLT_TRANSITION_SERVICE( this ) );
+
// Get the composite from the transition
mlt_transition composite = mlt_properties_get_data( properties, "composite", NULL );
if ( composite == NULL )
{
// Create composite via the factory
- composite = mlt_factory_transition( "composite", NULL );
+ mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( this ) );
+ composite = mlt_factory_transition( profile, "composite", NULL );
// If we have one
if ( composite != NULL )
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." );
count ++;
}
}
+
+ // Look for the first filter again
+ filter = mlt_properties_get_data( properties, "_filter_0", NULL );
}
else
{
if ( composite != NULL )
{
// 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" );
+ const 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" );
// Special case circle resource
if ( strcmp( resource, "circle" ) == 0 )
- {
- // Special case to ensure that fezzik produces a pixbuf with a NULL constructor
- resource = "pixbuf";
-
- // Specify the svg circle
- mlt_properties_set( properties, "producer.resource", "<svg width='100' height='100'><circle cx='50' cy='50' r='50' fill='black'/></svg>" );
- }
+ resource = "pixbuf:<svg width='100' height='100'><circle cx='50' cy='50' r='50' fill='black'/></svg>";
- // Create the producer
- producer = mlt_factory_producer( factory, resource );
+ // Create the producer
+ mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( this ) );
+ producer = mlt_factory_producer( profile, factory, resource );
// If we have one
if ( producer != NULL )
error = mlt_frame_get_image( frame, image, format, width, height, 0 );
}
+ mlt_service_unlock( MLT_TRANSITION_SERVICE( this ) );
+
return error;
}
/** Constructor for the transition.
*/
-mlt_transition transition_region_init( void *arg )
+mlt_transition transition_region_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
{
// Create a new transition
mlt_transition this = mlt_transition_new( );
this->process = transition_process;
// Default factory
- mlt_properties_set( properties, "factory", "fezzik" );
+ mlt_properties_set( properties, "factory", mlt_environment( "MLT_PRODUCER" ) );
// 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
projects / mlt / blobdiff