* Copyright (C) 2003-2004 Ushodaya Enterprises Limited
* Author: Dan Dennedy <dan@dennedy.org>
*
- * 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_composite.h"
#include <string.h>
#include <math.h>
-typedef void ( *composite_line_fn )( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int softness );
+typedef void ( *composite_line_fn )( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int softness, uint32_t step );
/** Geometry struct.
*/
int sh; // scaled height, not including consumer scale based upon h/nh
int halign; // horizontal alignment: 0=left, 1=center, 2=right
int valign; // vertical alignment: 0=top, 1=middle, 2=bottom
+ int x_src;
+ int y_src;
};
/** Parse the alignment properties into the geometry.
/** Calculate real geometry.
*/
-static void geometry_calculate( mlt_transition this, struct geometry_s *output, double position )
+static void geometry_calculate( mlt_transition self, struct geometry_s *output, double position )
{
- mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
+ mlt_properties properties = MLT_TRANSITION_PROPERTIES( self );
mlt_geometry geometry = mlt_properties_get_data( properties, "geometries", NULL );
int mirror_off = mlt_properties_get_int( properties, "mirror_off" );
int repeat_off = mlt_properties_get_int( properties, "repeat_off" );
mlt_geometry_fetch( geometry, &output->item, position );
}
-static mlt_geometry transition_parse_keys( mlt_transition this, int normalised_width, int normalised_height )
+static mlt_geometry transition_parse_keys( mlt_transition self, int normalised_width, int normalised_height )
{
// Loop variable for property interrogation
int i = 0;
// Get the properties of the transition
- mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
+ mlt_properties properties = MLT_TRANSITION_PROPERTIES( self );
// Create an empty geometries object
mlt_geometry geometry = mlt_geometry_init( );
- // Get the in and out position
- mlt_position in = mlt_transition_get_in( this );
- mlt_position out = mlt_transition_get_out( this );
- int length = out - in + 1;
+ // Get the duration
+ mlt_position length = mlt_transition_get_length( self );
double cycle = mlt_properties_get_double( properties, "cycle" );
// Get the new style geometry string
item.frame = -1;
if ( mlt_geometry_parse_item( geometry, &item, mlt_properties_get( properties, "end" ) ) == 0 )
mlt_geometry_insert( geometry, &item );
+ mlt_geometry_interpolate( geometry );
}
return geometry;
/** Calculate the position for this frame.
*/
-static int position_calculate( mlt_transition this, mlt_position position )
+static int position_calculate( mlt_transition self, mlt_position position )
{
// Get the in and out position
- mlt_position in = mlt_transition_get_in( this );
+ mlt_position in = mlt_transition_get_in( self );
// Now do the calcs
return position - in;
/** Calculate the field delta for this frame - position between two frames.
*/
-static inline double delta_calculate( mlt_transition this, mlt_frame frame, mlt_position position )
-{
- // Get the in and out position
- mlt_position in = mlt_transition_get_in( this );
- mlt_position out = mlt_transition_get_out( this );
- double length = out - in + 1;
-
- // Now do the calcs
- double x = ( double )( position - in ) / length;
- double y = ( double )( position + 1 - in ) / length;
-
- return length * ( y - x ) / 2.0;
-}
-
-static int get_value( mlt_properties properties, char *preferred, char *fallback )
+static int get_value( mlt_properties properties, const char *preferred, const char *fallback )
{
int value = mlt_properties_get_int( properties, preferred );
if ( value == 0 )
*p++ = ( image[ i ] - 16 ) * 299; // 299 = 65535 / 219
}
-static inline int calculate_mix( uint16_t *luma, int j, int soft, int weight, int alpha )
+static inline int calculate_mix( uint16_t *luma, int j, int softness, int weight, int alpha, uint32_t step )
{
- return ( ( ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + soft, weight + soft ) ) * alpha ) >> 8;
+ return ( ( luma ? smoothstep( luma[ j ], luma[ j ] + softness, step ) : weight ) * ( alpha + 1 ) ) >> 8;
}
static inline uint8_t sample_mix( uint8_t dest, uint8_t src, int mix )
/** Composite a source line over a destination line
*/
+#if defined(USE_SSE) && defined(ARCH_X86_64)
+void composite_line_yuv_sse2_simple(uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight);
+#endif
-static void composite_line_yuv( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int soft )
+void composite_line_yuv( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int soft, uint32_t step )
{
- register int j;
+ register int j = 0;
register int mix;
- for ( j = 0; j < width; j ++ )
+#if defined(USE_SSE) && defined(ARCH_X86_64)
+ if ( !luma && width > 7 )
{
- mix = calculate_mix( luma, j, soft, weight, *alpha_b ++ );
+ composite_line_yuv_sse2_simple(dest, src, width, alpha_b, alpha_a, weight);
+ j = width - width % 8;
+ dest += j * 2;
+ src += j * 2;
+ alpha_a += j;
+ alpha_b += j;
+ }
+#endif
+
+ for ( ; j < width; j ++ )
+ {
+ mix = calculate_mix( luma, j, soft, weight, *alpha_b ++, step );
*dest = sample_mix( *dest, *src++, mix );
dest++;
*dest = sample_mix( *dest, *src++, mix );
}
}
-static void composite_line_yuv_or( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int soft )
+static void composite_line_yuv_or( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int soft, uint32_t step )
{
register int j;
register int mix;
for ( j = 0; j < width; j ++ )
{
- mix = calculate_mix( luma, j, soft, weight, *alpha_b ++ | *alpha_a );
+ mix = calculate_mix( luma, j, soft, weight, *alpha_b ++ | *alpha_a, step );
*dest = sample_mix( *dest, *src++, mix );
dest++;
*dest = sample_mix( *dest, *src++, mix );
}
}
-static void composite_line_yuv_and( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int soft )
+static void composite_line_yuv_and( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int soft, uint32_t step )
{
register int j;
register int mix;
for ( j = 0; j < width; j ++ )
{
- mix = calculate_mix( luma, j, soft, weight, *alpha_b ++ & *alpha_a );
+ mix = calculate_mix( luma, j, soft, weight, *alpha_b ++ & *alpha_a, step );
*dest = sample_mix( *dest, *src++, mix );
dest++;
*dest = sample_mix( *dest, *src++, mix );
}
}
-static void composite_line_yuv_xor( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int soft )
+static void composite_line_yuv_xor( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int soft, uint32_t step )
{
register int j;
register int mix;
for ( j = 0; j < width; j ++ )
{
- mix = calculate_mix( luma, j, soft, weight, *alpha_b ++ ^ *alpha_a );
+ mix = calculate_mix( luma, j, soft, weight, *alpha_b ++ ^ *alpha_a, step );
*dest = sample_mix( *dest, *src++, mix );
dest++;
*dest = sample_mix( *dest, *src++, mix );
/** Composite function.
*/
-static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint8_t *p_src, int width_src, int height_src, uint8_t *alpha_b, uint8_t *alpha_a, struct geometry_s geometry, int field, uint16_t *p_luma, int32_t softness, composite_line_fn line_fn )
+static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint8_t *p_src, int width_src, int height_src, uint8_t *alpha_b, uint8_t *alpha_a, struct geometry_s geometry, int field, uint16_t *p_luma, double softness, composite_line_fn line_fn )
{
int ret = 0;
int i;
- int x_src = 0, y_src = 0;
- int32_t weight = ( ( 1 << 16 ) - 1 ) * ( geometry.item.mix / 100 );
+ int x_src = -geometry.x_src, y_src = -geometry.y_src;
+ int uneven_x_src = ( x_src % 2 );
int step = ( field > -1 ) ? 2 : 1;
int bpp = 2;
- int stride_src = width_src * bpp;
+ int stride_src = geometry.sw * bpp;
int stride_dest = width_dest * bpp;
-
+ int i_softness = ( 1 << 16 ) * softness;
+ int weight = ( ( 1 << 16 ) * geometry.item.mix + 50 ) / 100;
+ uint32_t luma_step = ( ( ( 1 << 16 ) - 1 ) * geometry.item.mix + 50 ) / 100 * ( 1.0 + softness );
+
// Adjust to consumer scale
- int x = rint( 0.5 + geometry.item.x * width_dest / geometry.nw );
- int y = rint( 0.5 + geometry.item.y * height_dest / geometry.nh );
+ int x = rint( geometry.item.x * width_dest / geometry.nw );
+ int y = rint( geometry.item.y * height_dest / geometry.nh );
int uneven_x = ( x % 2 );
// optimization points - no work to do
- if ( width_src <= 0 || height_src <= 0 )
+ if ( width_src <= 0 || height_src <= 0 || y_src >= height_src || x_src >= width_src )
return ret;
if ( ( x < 0 && -x >= width_src ) || ( y < 0 && -y >= height_src ) )
return ret;
+ // cropping affects the source width
+ if ( x_src > 0 )
+ {
+ width_src -= x_src;
+ // and it implies cropping
+ if ( width_src > geometry.item.w )
+ width_src = geometry.item.w;
+ }
+
+ // cropping affects the source height
+ if ( y_src > 0 )
+ {
+ height_src -= y_src;
+ // and it implies cropping
+ if ( height_src > geometry.item.h )
+ height_src = geometry.item.h;
+ }
+
// crop overlay off the left edge of frame
if ( x < 0 )
{
width_src -= x_src;
x = 0;
}
-
+
// crop overlay beyond right edge of frame
if ( x + width_src > width_dest )
width_src = width_dest - x;
p_src += x_src * bpp + y_src * stride_src;
// offset pointer into frame buffer based upon positive coordinates only!
- p_dest += ( x < 0 ? 0 : x ) * bpp + ( y < 0 ? 0 : y ) * stride_dest;
+ p_dest += x * bpp + y * stride_dest;
// offset pointer into alpha channel based upon cropping
alpha_b += x_src + y_src * stride_src / bpp;
int alpha_b_stride = stride_src / bpp;
int alpha_a_stride = stride_dest / bpp;
- p_src += uneven_x * 2;
- width_src -= 2 * uneven_x;
- alpha_b += uneven_x;
- uneven_x = 0;
+ // Align chroma of source and destination
+ if ( uneven_x != uneven_x_src )
+ {
+ p_src += 2;
+ alpha_b += 1;
+ }
// now do the compositing only to cropped extents
for ( i = 0; i < height_src; i += step )
{
- line_fn( p_dest, p_src, width_src, alpha_b, alpha_a, weight, p_luma, softness );
+ line_fn( p_dest, p_src, width_src, alpha_b, alpha_a, weight, p_luma, i_softness, luma_step );
p_src += stride_src;
p_dest += stride_dest;
}
}
-static uint16_t* get_luma( mlt_properties properties, int width, int height )
+static uint16_t* get_luma( mlt_transition self, mlt_properties properties, int width, int height )
{
// The cached luma map information
int luma_width = mlt_properties_get_int( properties, "_luma.width" );
luma_height = height;
}
- if ( resource != NULL && strchr( resource, '%' ) )
+ if ( resource && resource[0] && strchr( resource, '%' ) )
{
// TODO: Clean up quick and dirty compressed/existence check
FILE *test;
- sprintf( temp, "%s/lumas/%s/%s", mlt_factory_prefix( ), mlt_environment( "MLT_NORMALISATION" ), strchr( resource, '%' ) + 1 );
+ sprintf( temp, "%s/lumas/%s/%s", mlt_environment( "MLT_DATA" ), mlt_environment( "MLT_NORMALISATION" ), strchr( resource, '%' ) + 1 );
test = fopen( temp, "r" );
if ( test == NULL )
strcat( temp, ".png" );
resource = temp;
}
- if ( resource != NULL && ( luma_bitmap == NULL || luma_width != width || luma_height != height ) )
+ if ( resource && resource[0] )
+ {
+ char *old_luma = mlt_properties_get( properties, "_luma" );
+ int old_invert = mlt_properties_get_int( properties, "_luma_invert" );
+
+ if ( invert != old_invert || ( old_luma && old_luma[0] && strcmp( resource, old_luma ) ) )
+ {
+ mlt_properties_set_data( properties, "_luma.orig_bitmap", NULL, 0, NULL, NULL );
+ luma_bitmap = NULL;
+ }
+ }
+ else {
+ char *old_luma = mlt_properties_get( properties, "_luma" );
+ if ( old_luma && old_luma[0] )
+ {
+ mlt_properties_set_data( properties, "_luma.orig_bitmap", NULL, 0, NULL, NULL );
+ luma_bitmap = NULL;
+ mlt_properties_set( properties, "_luma", NULL);
+ }
+ }
+
+ if ( resource && resource[0] && ( luma_bitmap == NULL || luma_width != width || luma_height != height ) )
{
uint16_t *orig_bitmap = mlt_properties_get_data( properties, "_luma.orig_bitmap", NULL );
luma_width = mlt_properties_get_int( properties, "_luma.orig_width" );
if ( extension != NULL && strcmp( extension, ".pgm" ) == 0 )
{
// Open PGM
- FILE *f = fopen( resource, "r" );
+ FILE *f = fopen( resource, "rb" );
if ( f != NULL )
{
// Load from PGM
char *factory = mlt_properties_get( properties, "factory" );
// Create the producer
- mlt_producer producer = mlt_factory_producer( factory, resource );
+ mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( self ) );
+ mlt_producer producer = mlt_factory_producer( profile, factory, resource );
// If we have one
if ( producer != NULL )
mlt_properties_set_int( properties, "_luma.width", width );
mlt_properties_set_int( properties, "_luma.height", height );
mlt_properties_set_data( properties, "_luma.bitmap", luma_bitmap, width * height * 2, mlt_pool_release, NULL );
+ mlt_properties_set( properties, "_luma", resource );
+ mlt_properties_set_int( properties, "_luma_invert", invert );
}
return luma_bitmap;
}
/** Get the properly sized image from b_frame.
*/
-static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **image, int *width, int *height, struct geometry_s *geometry )
+static int get_b_frame_image( mlt_transition self, mlt_frame b_frame, uint8_t **image, int *width, int *height, struct geometry_s *geometry )
{
int ret = 0;
mlt_image_format format = mlt_image_yuv422;
// Get the properties objects
mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame );
- mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
+ mlt_properties properties = MLT_TRANSITION_PROPERTIES( self );
uint8_t resize_alpha = mlt_properties_get_int( b_props, "resize_alpha" );
+ double output_ar = mlt_profile_sar( mlt_service_profile( MLT_TRANSITION_SERVICE(self) ) );
- if ( mlt_properties_get_int( properties, "aligned" ) && mlt_properties_get_int( properties, "distort" ) == 0 && mlt_properties_get_int( b_props, "distort" ) == 0 && geometry->item.distort == 0 )
+ // Do not scale if we are cropping - the compositing rectangle can crop the b image
+ // TODO: Use the animatable w and h of the crop geometry to scale independently of crop rectangle
+ if ( mlt_properties_get( properties, "crop" ) )
+ {
+ int real_width = get_value( b_props, "meta.media.width", "width" );
+ int real_height = get_value( b_props, "meta.media.height", "height" );
+ double input_ar = mlt_properties_get_double( b_props, "aspect_ratio" );
+ int scaled_width = rint( ( input_ar == 0.0 ? output_ar : input_ar ) / output_ar * real_width );
+ int scaled_height = real_height;
+ geometry->sw = scaled_width;
+ geometry->sh = scaled_height;
+ }
+ // Normalise aspect ratios and scale preserving aspect ratio
+ else if ( mlt_properties_get_int( properties, "aligned" ) && mlt_properties_get_int( properties, "distort" ) == 0 && mlt_properties_get_int( b_props, "distort" ) == 0 && geometry->item.distort == 0 )
{
// Adjust b_frame pixel aspect
int normalised_width = geometry->item.w;
int normalised_height = geometry->item.h;
- int real_width = get_value( b_props, "real_width", "width" );
- int real_height = get_value( b_props, "real_height", "height" );
+ int real_width = get_value( b_props, "meta.media.width", "width" );
+ int real_height = get_value( b_props, "meta.media.height", "height" );
double input_ar = mlt_properties_get_double( b_props, "aspect_ratio" );
- double consumer_ar = mlt_properties_get_double( b_props, "consumer_aspect_ratio" );
- double background_ar = mlt_properties_get_double( b_props, "output_ratio" );
- double output_ar = background_ar != 0.0 ? background_ar : consumer_ar;
- int scaled_width = rint( 0.5 + ( input_ar == 0.0 ? output_ar : input_ar ) / output_ar * real_width );
+ int scaled_width = rint( ( input_ar == 0.0 ? output_ar : input_ar ) / output_ar * real_width );
int scaled_height = real_height;
+// fprintf(stderr, "%s: scaled %dx%d norm %dx%d real %dx%d output_ar %f\n", __FILE__,
+// scaled_width, scaled_height, normalised_width, normalised_height, real_width, real_height,
+// output_ar);
// Now ensure that our images fit in the normalised frame
if ( scaled_width > normalised_width )
{
- scaled_height = rint( 0.5 + scaled_height * normalised_width / scaled_width );
+ scaled_height = rint( scaled_height * normalised_width / scaled_width );
scaled_width = normalised_width;
}
if ( scaled_height > normalised_height )
{
- scaled_width = rint( 0.5 + scaled_width * normalised_height / scaled_height );
+ scaled_width = rint( scaled_width * normalised_height / scaled_height );
scaled_height = normalised_height;
}
// ????: Shouln't this be the default behaviour?
if ( mlt_properties_get_int( properties, "fill" ) && scaled_width > 0 && scaled_height > 0 )
{
- if ( scaled_height < normalised_height && scaled_width * normalised_height / scaled_height < normalised_width )
+ if ( scaled_height < normalised_height && scaled_width * normalised_height / scaled_height <= normalised_width )
{
- scaled_width = rint( 0.5 + scaled_width * normalised_height / scaled_height );
+ scaled_width = rint( scaled_width * normalised_height / scaled_height );
scaled_height = normalised_height;
}
else if ( scaled_width < normalised_width && scaled_height * normalised_width / scaled_width < normalised_height )
{
- scaled_height = rint( 0.5 + scaled_height * normalised_width / scaled_width );
+ scaled_height = rint( scaled_height * normalised_width / scaled_width );
scaled_width = normalised_width;
}
}
mlt_properties_set_int( b_props, "resize_alpha", 255 );
// Take into consideration alignment for optimisation (titles are a special case)
- if ( !mlt_properties_get_int( properties, "titles" ) )
+ if ( !mlt_properties_get_int( properties, "titles" ) &&
+ mlt_properties_get( properties, "crop" ) == NULL )
alignment_calculate( geometry );
// Adjust to consumer scale
- *width = rint( 0.5 + geometry->sw * *width / geometry->nw );
- *height = rint( 0.5 + geometry->sh * *height / geometry->nh );
+ *width = rint( geometry->sw * *width / geometry->nw );
+ *width -= *width % 2; // coerce to even width for yuv422
+ *height = rint( geometry->sh * *height / geometry->nh );
+// fprintf(stderr, "%s: scaled %dx%d norm %dx%d resize %dx%d\n", __FILE__,
+// geometry->sw, geometry->sh, geometry->nw, geometry->nh, *width, *height);
ret = mlt_frame_get_image( b_frame, image, &format, width, height, 1 );
+ // composite_yuv uses geometry->sw to determine source stride, which
+ // should equal the image width if not using crop property.
+ if ( !mlt_properties_get( properties, "crop" ) )
+ geometry->sw = *width;
+
// Set the frame back
mlt_properties_set_int( b_props, "resize_alpha", resize_alpha );
return ret && image != NULL;
}
+static void crop_calculate( mlt_transition self, mlt_properties properties, struct geometry_s *result, double position )
+{
+ // Initialize panning info
+ result->x_src = 0;
+ result->y_src = 0;
+ if ( mlt_properties_get( properties, "crop" ) )
+ {
+ mlt_geometry crop = mlt_properties_get_data( properties, "crop_geometry", NULL );
+ if ( !crop )
+ {
+ crop = mlt_geometry_init();
+ mlt_position length = mlt_transition_get_length( self );
+ double cycle = mlt_properties_get_double( properties, "cycle" );
+
+ // Allow a geometry repeat cycle
+ if ( cycle >= 1 )
+ length = cycle;
+ else if ( cycle > 0 )
+ length *= cycle;
+ mlt_geometry_parse( crop, mlt_properties_get( properties, "crop" ), length, result->sw, result->sh );
+ mlt_properties_set_data( properties, "crop_geometry", crop, 0, (mlt_destructor)mlt_geometry_close, NULL );
+ }
+
+ // Repeat processing
+ int length = mlt_geometry_get_length( crop );
+ int mirror_off = mlt_properties_get_int( properties, "mirror_off" );
+ int repeat_off = mlt_properties_get_int( properties, "repeat_off" );
+ if ( !repeat_off && position >= length && length != 0 )
+ {
+ int section = position / length;
+ position -= section * length;
+ if ( !mirror_off && section % 2 == 1 )
+ position = length - position;
+ }
+
+ // Compute the pan
+ struct mlt_geometry_item_s crop_item;
+ mlt_geometry_fetch( crop, &crop_item, position );
+ result->x_src = rint( crop_item.x );
+ result->y_src = rint( crop_item.y );
+ }
+}
-static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s *result, mlt_frame a_frame, double position )
+static mlt_geometry composite_calculate( mlt_transition self, struct geometry_s *result, mlt_frame a_frame, double position )
{
// Get the properties from the transition
- mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
+ mlt_properties properties = MLT_TRANSITION_PROPERTIES( self );
// Get the properties from the frame
mlt_properties a_props = MLT_FRAME_PROPERTIES( a_frame );
mlt_geometry start = mlt_properties_get_data( properties, "geometries", NULL );
// Obtain the normalised width and height from the a_frame
- int normalised_width = mlt_properties_get_int( a_props, "normalised_width" );
- int normalised_height = mlt_properties_get_int( a_props, "normalised_height" );
+ mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( self ) );
+ int normalised_width = profile->width;
+ int normalised_height = profile->height;
char *name = mlt_properties_get( properties, "_unique_id" );
char key[ 256 ];
sprintf( key, "%s.in", name );
if ( mlt_properties_get( a_props, key ) )
{
- sscanf( mlt_properties_get( a_props, key ), "%f,%f,%f,%f,%f,%d,%d", &result->item.x, &result->item.y, &result->item.w, &result->item.h, &result->item.mix, &result->nw, &result->nh );
+ sscanf( mlt_properties_get( a_props, key ), "%f %f %f %f %f %d %d", &result->item.x, &result->item.y, &result->item.w, &result->item.h, &result->item.mix, &result->nw, &result->nh );
}
else
{
if ( start == NULL )
{
// Parse the transitions properties
- start = transition_parse_keys( this, normalised_width, normalised_height );
+ start = transition_parse_keys( self, normalised_width, normalised_height );
// Assign to properties to ensure we get destroyed
mlt_properties_set_data( properties, "geometries", start, 0, ( mlt_destructor )mlt_geometry_close, NULL );
}
else
{
- int length = mlt_transition_get_out( this ) - mlt_transition_get_in( this ) + 1;
+ mlt_position length = mlt_transition_get_length( self );
double cycle = mlt_properties_get_double( properties, "cycle" );
if ( cycle > 1 )
length = cycle;
}
// Do the calculation
- geometry_calculate( this, result, position );
+ geometry_calculate( self, result, position );
// Assign normalised info
result->nw = normalised_width;
result->halign = alignment_parse( mlt_properties_get( properties, "halign" ) );
result->valign = alignment_parse( mlt_properties_get( properties, "valign" ) );
+ crop_calculate( self, properties, result, position );
+
return start;
}
-mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_position frame_position )
+mlt_frame composite_copy_region( mlt_transition self, mlt_frame a_frame, mlt_position frame_position )
{
// Create a frame to return
- mlt_frame b_frame = mlt_frame_init( );
+ mlt_frame b_frame = mlt_frame_init( MLT_TRANSITION_SERVICE( self ) );
// Get the properties of the a frame
mlt_properties a_props = MLT_FRAME_PROPERTIES( a_frame );
mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame );
// Get the position
- int position = position_calculate( this, frame_position );
+ int position = position_calculate( self, frame_position );
// Get the unique id of the transition
- char *name = mlt_properties_get( MLT_TRANSITION_PROPERTIES( this ), "_unique_id" );
+ char *name = mlt_properties_get( MLT_TRANSITION_PROPERTIES( self ), "_unique_id" );
char key[ 256 ];
// Destination image
uint8_t *dest = NULL;
// Get the image and dimensions
- uint8_t *image = mlt_properties_get_data( a_props, "image", NULL );
+ uint8_t *image = NULL;
int width = mlt_properties_get_int( a_props, "width" );
int height = mlt_properties_get_int( a_props, "height" );
- int format = mlt_properties_get_int( a_props, "format" );
+ mlt_image_format format = mlt_image_yuv422;
+
+ mlt_frame_get_image( a_frame, &image, &format, &width, &height, 0 );
+ if ( !image )
+ return b_frame;
// Pointers for copy operation
uint8_t *p;
struct geometry_s result;
// Calculate the region now
- composite_calculate( this, &result, a_frame, position );
+ composite_calculate( self, &result, a_frame, position );
// Need to scale down to actual dimensions
- x = rint( 0.5 + result.item.x * width / result.nw );
- y = rint( 0.5 + result.item.y * height / result.nh );
- w = rint( 0.5 + result.item.w * width / result.nw );
- h = rint( 0.5 + result.item.h * height / result.nh );
+ x = rint( result.item.x * width / result.nw );
+ y = rint( result.item.y * height / result.nh );
+ w = rint( result.item.w * width / result.nw );
+ h = rint( result.item.h * height / result.nh );
if ( x % 2 )
{
}
// Store the key
- sprintf( key, "%s.in=%d,%d,%d,%d,%f,%d,%d", name, x, y, w, h, result.item.mix, width, height );
+ sprintf( key, "%s.in=%d %d %d %d %f %d %d", name, x, y, w, h, result.item.mix, width, height );
mlt_properties_parse( a_props, key );
- sprintf( key, "%s.out=%d,%d,%d,%d,%f,%d,%d", name, x, y, w, h, result.item.mix, width, height );
+ sprintf( key, "%s.out=%d %d %d %d %f %d %d", name, x, y, w, h, result.item.mix, width, height );
mlt_properties_parse( a_props, key );
ds = w * 2;
dest = mlt_pool_alloc( w * h * 2 );
// Assign to the new frame
- mlt_properties_set_data( b_props, "image", dest, w * h * 2, mlt_pool_release, NULL );
+ mlt_frame_set_image( b_frame, dest, w * h * 2, mlt_pool_release );
mlt_properties_set_int( b_props, "width", w );
mlt_properties_set_int( b_props, "height", h );
mlt_properties_set_int( b_props, "format", format );
mlt_frame b_frame = mlt_frame_pop_frame( a_frame );
// Get the transition from the a frame
- mlt_transition this = mlt_frame_pop_service( a_frame );
+ mlt_transition self = mlt_frame_pop_service( a_frame );
// Get in and out
double position = mlt_deque_pop_back_double( MLT_FRAME_IMAGE_STACK( a_frame ) );
int in = mlt_frame_pop_service_int( a_frame );
// Get the properties from the transition
- mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
+ mlt_properties properties = MLT_TRANSITION_PROPERTIES( self );
// TODO: clean up always_active behaviour
if ( mlt_properties_get_int( properties, "always_active" ) )
struct geometry_s result;
// Calculate the position
- double delta = delta_calculate( this, a_frame, position );
+ double delta = mlt_transition_get_progress_delta( self, a_frame );
+ mlt_position length = mlt_transition_get_length( self );
// Get the image from the b frame
uint8_t *image_b = NULL;
- int width_b = *width;
- int height_b = *height;
+ mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( self ) );
+ int width_b = *width > 0 ? *width : profile->width;
+ int height_b = *height > 0 ? *height : profile->height;
// Vars for alphas
uint8_t *alpha_a = NULL;
uint8_t *alpha_b = NULL;
- // Composites always need scaling... defaulting to lowest
- char *rescale = mlt_properties_get( a_props, "rescale.interp" );
- if ( rescale == NULL || !strcmp( rescale, "none" ) )
- rescale = "nearest";
- mlt_properties_set( a_props, "rescale.interp", rescale );
- mlt_properties_set( b_props, "rescale.interp", rescale );
-
// Do the calculation
// NB: Locks needed here since the properties are being modified
- mlt_service_lock( MLT_TRANSITION_SERVICE( this ) );
- composite_calculate( this, &result, a_frame, position );
- mlt_service_unlock( MLT_TRANSITION_SERVICE( this ) );
+ int invert = mlt_properties_get_int( properties, "invert" );
+ mlt_service_lock( MLT_TRANSITION_SERVICE( self ) );
+ composite_calculate( self, &result, invert ? b_frame : a_frame, position );
+ mlt_service_unlock( MLT_TRANSITION_SERVICE( self ) );
- // Since we are the consumer of the b_frame, we must pass along these
- // consumer properties from the a_frame
- mlt_properties_set_double( b_props, "consumer_deinterlace", mlt_properties_get_double( a_props, "consumer_deinterlace" ) );
- mlt_properties_set( b_props, "consumer_deinterlace_method", mlt_properties_get( a_props, "consumer_deinterlace_method" ) );
- mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+ // Manual option to deinterlace
+ if ( mlt_properties_get_int( properties, "deinterlace" ) )
+ {
+ mlt_properties_set_int( a_props, "consumer_deinterlace", 1 );
+ mlt_properties_set_int( b_props, "consumer_deinterlace", 1 );
+ }
// TODO: Dangerous/temporary optimisation - if nothing to do, then do nothing
if ( mlt_properties_get_int( properties, "no_alpha" ) &&
if ( a_frame == b_frame )
{
double aspect_ratio = mlt_frame_get_aspect_ratio( b_frame );
- get_b_frame_image( this, b_frame, &image_b, &width_b, &height_b, &result );
+ get_b_frame_image( self, b_frame, &image_b, &width_b, &height_b, &result );
alpha_b = mlt_frame_get_alpha_mask( b_frame );
mlt_properties_set_double( a_props, "aspect_ratio", aspect_ratio );
}
// Get the image from the a frame
- mlt_frame_get_image( a_frame, image, format, width, height, 1 );
+ mlt_frame_get_image( a_frame, invert ? &image_b : image, format, width, height, 1 );
alpha_a = mlt_frame_get_alpha_mask( a_frame );
// Optimisation - no compositing required
height_b = mlt_properties_get_int( a_props, "dest_height" );
}
- if ( *image != image_b && ( image_b != NULL || get_b_frame_image( this, b_frame, &image_b, &width_b, &height_b, &result ) == 0 ) )
+ if ( *image != image_b && ( ( invert ? 0 : image_b ) || get_b_frame_image( self, b_frame, invert ? image : &image_b, &width_b, &height_b, &result ) == 0 ) )
{
uint8_t *dest = *image;
uint8_t *src = image_b;
mlt_properties_get_int( properties, "progressive" );
int field;
- int32_t luma_softness = mlt_properties_get_double( properties, "softness" ) * ( 1 << 16 );
- uint16_t *luma_bitmap = get_luma( properties, width_b, height_b );
+ double luma_softness = mlt_properties_get_double( properties, "softness" );
+ mlt_service_lock( MLT_TRANSITION_SERVICE( self ) );
+ uint16_t *luma_bitmap = get_luma( self, properties, width_b, height_b );
+ mlt_service_unlock( MLT_TRANSITION_SERVICE( self ) );
char *operator = mlt_properties_get( properties, "operator" );
alpha_b = alpha_b == NULL ? mlt_frame_get_alpha_mask( b_frame ) : alpha_b;
for ( field = 0; field < ( progressive ? 1 : 2 ); field++ )
{
// Assume lower field (0) first
- double field_position = position + field * delta;
+ double field_position = position + field * delta * length;
// Do the calculation if we need to
// NB: Locks needed here since the properties are being modified
- mlt_service_lock( MLT_TRANSITION_SERVICE( this ) );
- composite_calculate( this, &result, a_frame, field_position );
- mlt_service_unlock( MLT_TRANSITION_SERVICE( this ) );
+ mlt_service_lock( MLT_TRANSITION_SERVICE( self ) );
+ composite_calculate( self, &result, invert ? b_frame : a_frame, field_position );
+ mlt_service_unlock( MLT_TRANSITION_SERVICE( self ) );
if ( mlt_properties_get_int( properties, "titles" ) )
{
- result.item.w = rint( 0.5 + *width * ( result.item.w / result.nw ) );
+ result.item.w = rint( *width * ( result.item.w / result.nw ) );
result.nw = result.item.w;
- result.item.h = rint( 0.5 + *height * ( result.item.h / result.nh ) );
+ result.item.h = rint( *height * ( result.item.h / result.nh ) );
result.nh = *height;
result.sw = width_b;
result.sh = height_b;
}
- // Align
- alignment_calculate( &result );
+ // Enforce cropping
+ if ( mlt_properties_get( properties, "crop" ) )
+ {
+ if ( result.x_src == 0 )
+ width_b = width_b > result.item.w ? result.item.w : width_b;
+ if ( result.y_src == 0 )
+ height_b = height_b > result.item.h ? result.item.h : height_b;
+ }
+ else
+ {
+ // Otherwise, align
+ alignment_calculate( &result );
+ }
// Composite the b_frame on the a_frame
- composite_yuv( dest, *width, *height, src, width_b, height_b, alpha_b, alpha_a, result, progressive ? -1 : field, luma_bitmap, luma_softness, line_fn );
+ if ( invert )
+ composite_yuv( dest, width_b, height_b, src, *width, *height, alpha_a, alpha_b, result, progressive ? -1 : field, luma_bitmap, luma_softness, line_fn );
+ else
+ composite_yuv( dest, *width, *height, src, width_b, height_b, alpha_b, alpha_a, result, progressive ? -1 : field, luma_bitmap, luma_softness, line_fn );
}
}
}
/** Composition transition processing.
*/
-static mlt_frame composite_process( mlt_transition this, mlt_frame a_frame, mlt_frame b_frame )
+static mlt_frame composite_process( mlt_transition self, mlt_frame a_frame, mlt_frame b_frame )
{
// UGH - this is a TODO - find a more reliable means of obtaining in/out for the always_active case
- if ( mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( this ), "always_active" ) == 0 )
+ if ( mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( self ), "always_active" ) == 0 )
{
- mlt_frame_push_service_int( a_frame, mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( this ), "in" ) );
- mlt_frame_push_service_int( a_frame, mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( this ), "out" ) );
- mlt_deque_push_back_double( MLT_FRAME_IMAGE_STACK( a_frame ), position_calculate( this, mlt_frame_get_position( a_frame ) ) );
+ mlt_frame_push_service_int( a_frame, mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( self ), "in" ) );
+ mlt_frame_push_service_int( a_frame, mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( self ), "out" ) );
+ mlt_deque_push_back_double( MLT_FRAME_IMAGE_STACK( a_frame ), position_calculate( self, mlt_frame_get_position( a_frame ) ) );
}
else
{
mlt_deque_push_back_double( MLT_FRAME_IMAGE_STACK( a_frame ), mlt_properties_get_int( props, "_frame" ) - mlt_properties_get_int( props, "in" ) );
}
- mlt_frame_push_service( a_frame, this );
+ mlt_frame_push_service( a_frame, self );
mlt_frame_push_frame( a_frame, b_frame );
mlt_frame_push_get_image( a_frame, transition_get_image );
return a_frame;
/** Constructor for the filter.
*/
-mlt_transition transition_composite_init( char *arg )
+mlt_transition transition_composite_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
{
- mlt_transition this = calloc( sizeof( struct mlt_transition_s ), 1 );
- if ( this != NULL && mlt_transition_init( this, NULL ) == 0 )
+ mlt_transition self = calloc( 1, sizeof( struct mlt_transition_s ) );
+ if ( self != NULL && mlt_transition_init( self, NULL ) == 0 )
{
- mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
+ mlt_properties properties = MLT_TRANSITION_PROPERTIES( self );
- this->process = composite_process;
+ self->process = composite_process;
// Default starting motion and zoom
- mlt_properties_set( properties, "start", arg != NULL ? arg : "0,0:100%x100%" );
+ mlt_properties_set( properties, "start", arg != NULL ? arg : "0/0:100%x100%" );
// Default factory
- mlt_properties_set( properties, "factory", "fezzik" );
+ mlt_properties_set( properties, "factory", mlt_environment( "MLT_PRODUCER" ) );
// Use alignment (and hence alpha of b frame)
mlt_properties_set_int( properties, "aligned", 1 );
+ // Default to progressive rendering
+ mlt_properties_set_int( properties, "progressive", 1 );
+
// Inform apps and framework that this is a video only transition
mlt_properties_set_int( properties, "_transition_type", 1 );
}
- return this;
+ return self;
}
projects / mlt / blobdiff