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.
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 )
{
int ret = 0;
int i;
- int x_src = 0, y_src = 0;
+ int x_src = -geometry.x_src, y_src = -geometry.y_src;
+ int uneven_x_src = ( x_src % 2 );
int32_t weight = ( ( 1 << 16 ) - 1 ) * ( geometry.item.mix / 100 );
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;
// 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;
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;
+ width_src -= 2;
+ alpha_b += 1;
+ }
// now do the compositing only to cropped extents
for ( i = 0; i < height_src; i += step )
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;
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" );
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;
}
mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
uint8_t resize_alpha = mlt_properties_get_int( b_props, "resize_alpha" );
- 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, "real_width", "width" );
+ int real_height = get_value( b_props, "real_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( ( 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;
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 => %f\n", __FILE__,
+// scaled_width, scaled_height, normalised_width, normalised_height, real_width, real_height,
+// background_ar, 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;
}
{
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 );
+ *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 );
return ret && image != NULL;
}
+static void crop_calculate( mlt_transition this, 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 in = mlt_transition_get_in( this );
+ mlt_position out = mlt_transition_get_out( this );
+ int length = out - in + 1;
+ 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 )
{
result->halign = alignment_parse( mlt_properties_get( properties, "halign" ) );
result->valign = alignment_parse( mlt_properties_get( properties, "valign" ) );
+ crop_calculate( this, properties, result, position );
+
return start;
}
composite_calculate( this, &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 )
{
uint8_t *alpha_b = NULL;
// Composites always need scaling... defaulting to lowest
- char *rescale = mlt_properties_get( a_props, "rescale.interp" );
+ const 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 );
// 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_int( b_props, "consumer_deinterlace", mlt_properties_get_int( a_props, "consumer_deinterlace" ) || mlt_properties_get_int( properties, "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" ) );
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 );