X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_composite.c;h=040ac0a3319b4149ea66ae096c6f26f13dbc1bda;hb=ae748aa4403b44430bbf57b49aa6f386f15d8407;hp=6b55405b31059787c97e8a1048140625cb8d0190;hpb=f03c6d071da28a7ac3bc4079db726b43034b6ffc;p=melted diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index 6b55405..040ac0a 100644 --- a/src/modules/core/transition_composite.c +++ b/src/modules/core/transition_composite.c @@ -27,7 +27,7 @@ #include #include -typedef void ( *composite_line_fn )( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha, int weight, uint16_t *luma, int softness ); +typedef void ( *composite_line_fn )( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha, uint8_t *full_alpha, int weight, uint16_t *luma, int softness ); /* mmx function declarations */ #ifdef USE_MMX @@ -70,7 +70,7 @@ static int alignment_parse( char* align ) /** Calculate real geometry. */ -static void geometry_calculate( mlt_transition this, struct geometry_s *output, float position ) +static void geometry_calculate( mlt_transition this, struct geometry_s *output, double position ) { mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); mlt_geometry geometry = mlt_properties_get_data( properties, "geometries", NULL ); @@ -191,20 +191,20 @@ static int position_calculate( mlt_transition this, mlt_position position ) /** Calculate the field delta for this frame - position between two frames. */ -static inline float delta_calculate( mlt_transition this, mlt_frame frame ) +static inline double delta_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 ); - float length = out - in + 1; + double length = out - in + 1; // Get the position of the frame char *name = mlt_properties_get( MLT_TRANSITION_PROPERTIES( this ), "_unique_id" ); mlt_position position = mlt_properties_get_position( MLT_FRAME_PROPERTIES( frame ), name ); // Now do the calcs - float x = ( float )( position - in ) / length; - float y = ( float )( position + 1 - in ) / length; + double x = ( double )( position - in ) / length; + double y = ( double )( position + 1 - in ) / length; return length * ( y - x ) / 2.0; } @@ -381,7 +381,7 @@ static void luma_read_yuv422( uint8_t *image, uint16_t **map, int width, int hei */ static inline -void composite_line_yuv( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha, int weight, uint16_t *luma, int softness ) +void composite_line_yuv( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha, uint8_t *full_alpha, int weight, uint16_t *luma, int softness ) { register int j; int a, mix; @@ -395,13 +395,15 @@ void composite_line_yuv( uint8_t *dest, uint8_t *src, int width_src, uint8_t *al dest++; *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16; dest++; + if ( full_alpha && *full_alpha == 0 ) { *full_alpha = a; } + full_alpha ++; } } /** 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 *p_alpha, 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 *p_alpha, uint8_t *full_alpha, struct geometry_s geometry, int field, uint16_t *p_luma, int32_t softness, composite_line_fn line_fn ) { int ret = 0; int i; @@ -458,6 +460,9 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint if ( p_alpha ) p_alpha += x_src + y_src * stride_src / bpp; + if ( full_alpha ) + full_alpha += x + y * stride_dest / bpp; + // offset pointer into luma channel based upon cropping if ( p_luma ) p_luma += x_src + y_src * stride_src / bpp; @@ -480,18 +485,22 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint p_src += stride_src; if ( p_alpha ) p_alpha += stride_src / bpp; + if ( full_alpha ) + full_alpha += stride_dest / bpp; height_src--; } stride_src *= step; stride_dest *= step; int alpha_stride = stride_src / bpp; + int full_alpha_stride = stride_dest / bpp; // Make sure than x and w are even if ( x_uneven ) { p_src += 2; width_src --; + full_alpha ++; } // now do the compositing only to cropped extents @@ -499,12 +508,14 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint { for ( i = 0; i < height_src; i += step ) { - line_fn( p_dest, p_src, width_src, p_alpha, weight, p_luma, softness ); + line_fn( p_dest, p_src, width_src, p_alpha, full_alpha, weight, p_luma, softness ); p_src += stride_src; p_dest += stride_dest; if ( p_alpha ) p_alpha += alpha_stride; + if ( full_alpha ) + full_alpha += full_alpha_stride; if ( p_luma ) p_luma += alpha_stride; } @@ -513,12 +524,14 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint { for ( i = 0; i < height_src; i += step ) { - composite_line_yuv( p_dest, p_src, width_src, p_alpha, weight, p_luma, softness ); + composite_line_yuv( p_dest, p_src, width_src, p_alpha, full_alpha, weight, p_luma, softness ); p_src += stride_src; p_dest += stride_dest; if ( p_alpha ) p_alpha += alpha_stride; + if ( full_alpha ) + full_alpha += full_alpha_stride; if ( p_luma ) p_luma += alpha_stride; } @@ -697,6 +710,7 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** int real_height = get_value( b_props, "real_height", "height" ); double input_ar = mlt_frame_get_aspect_ratio( b_frame ); double output_ar = mlt_properties_get_double( b_props, "consumer_aspect_ratio" ); + if ( input_ar == 0.0 ) input_ar = output_ar; int scaled_width = input_ar / output_ar * real_width; int scaled_height = real_height; @@ -751,11 +765,11 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** ret = mlt_frame_get_image( b_frame, image, &format, width, height, 1 ); - return ret; + return ret && image != NULL; } -static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s *result, mlt_frame a_frame, float position ) +static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s *result, mlt_frame a_frame, double position ) { // Get the properties from the transition mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); @@ -851,7 +865,7 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos // Will need to know region to copy struct geometry_s result; - float delta = delta_calculate( this, a_frame ); + double delta = delta_calculate( this, a_frame ); // Calculate the region now composite_calculate( this, &result, a_frame, position + delta / 2 ); @@ -966,8 +980,8 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f struct geometry_s result; // Calculate the position - float position = mlt_properties_get_double( b_props, "relative_position" ); - float delta = delta_calculate( this, a_frame ); + double position = mlt_properties_get_double( b_props, "relative_position" ); + double delta = delta_calculate( this, a_frame ); // Get the image from the b frame uint8_t *image_b = NULL; @@ -1029,6 +1043,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f uint8_t *dest = *image; uint8_t *src = image_b; uint8_t *alpha = mlt_frame_get_alpha_mask( b_frame ); + uint8_t *full_alpha = mlt_frame_get_alpha_mask( a_frame ); int progressive = mlt_properties_get_int( a_props, "consumer_deinterlace" ) || mlt_properties_get_int( properties, "progressive" ); @@ -1039,10 +1054,18 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f //composite_line_fn line_fn = mlt_properties_get_int( properties, "_MMX" ) ? composite_line_yuv_mmx : NULL; composite_line_fn line_fn = NULL; + if ( full_alpha == NULL ) + { + full_alpha = mlt_pool_alloc( *width * *height ); + memset( full_alpha, 255, *width * *height ); + a_frame->get_alpha_mask = NULL; + mlt_properties_set_data( a_props, "alpha", full_alpha, 0, mlt_pool_release, NULL ); + } + for ( field = 0; field < ( progressive ? 1 : 2 ); field++ ) { // Assume lower field (0) first - float field_position = position + field * delta; + double field_position = position + field * delta; // Do the calculation if we need to composite_calculate( this, &result, a_frame, field_position ); @@ -1061,7 +1084,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f alignment_calculate( &result ); // Composite the b_frame on the a_frame - composite_yuv( dest, *width, *height, src, width_b, height_b, alpha, result, progressive ? -1 : field, luma_bitmap, luma_softness, line_fn ); + composite_yuv( dest, *width, *height, src, width_b, height_b, alpha, full_alpha, result, progressive ? -1 : field, luma_bitmap, luma_softness, line_fn ); } } } @@ -1098,7 +1121,7 @@ static mlt_frame composite_process( mlt_transition this, mlt_frame a_frame, mlt_ mlt_properties props = mlt_properties_get_data( MLT_FRAME_PROPERTIES( b_frame ), "_producer", NULL ); mlt_frame_push_service_int( a_frame, mlt_properties_get_int( props, "in" ) ); mlt_frame_push_service_int( a_frame, mlt_properties_get_int( props, "out" ) ); - mlt_properties_set_int( MLT_FRAME_PROPERTIES( b_frame ), "relative_position", mlt_properties_get_int( props, "_frame" ) ); + mlt_properties_set_int( MLT_FRAME_PROPERTIES( b_frame ), "relative_position", mlt_properties_get_int( props, "_frame" ) - mlt_properties_get_int( props, "in" ) ); // Assign the current position to the name mlt_properties_set_position( MLT_FRAME_PROPERTIES( a_frame ), name, mlt_properties_get_position( MLT_FRAME_PROPERTIES( b_frame ), "relative_position" ) );