X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_composite.c;h=5e5118b05aad1aecd341d13670f22b97c99f83ab;hb=9029c77b04ddf9c9d9becacca56615607bb84234;hp=ed2436fa50ee5a062e537048f38d19ecfaa346d0;hpb=00170557040957d088ea127bdd38d6d16a533550;p=melted diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index ed2436f..5e5118b 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 @@ -74,14 +74,16 @@ static void geometry_calculate( mlt_transition this, struct geometry_s *output, { mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); 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" ); int length = mlt_geometry_get_length( geometry ); // Allow wrapping - if ( position >= length && length != 0 ) + if ( !repeat_off && position >= length && length != 0 ) { int section = position / length; position -= section * length; - if ( section % 2 == 1 ) + if ( !mirror_off && section % 2 == 1 ) position = length - position; } @@ -104,13 +106,16 @@ static mlt_geometry transition_parse_keys( mlt_transition this, int normalised_w 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" ); // Get the new style geometry string char *property = mlt_properties_get( properties, "geometry" ); // Allow a geometry repeat cycle - if ( mlt_properties_get_int( properties, "cycle" ) ) - length = mlt_properties_get_int( properties, "cycle" ); + if ( cycle >= 1 ) + length = cycle; + else if ( cycle > 0 ) + length *= cycle; // Parse the geometry if we have one mlt_geometry_parse( geometry, property, length, normalised_width, normalised_height ); @@ -376,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; @@ -384,19 +389,21 @@ void composite_line_yuv( uint8_t *dest, uint8_t *src, int width_src, uint8_t *al for ( j = 0; j < width_src; j ++ ) { a = ( alpha == NULL ) ? 255 : *alpha ++; - mix = ( luma == NULL ) ? weight : linearstep( luma[ j ], luma[ j ] + softness, weight ); - mix = ( mix * ( a + 1 ) ) >> 8; + mix = ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + softness, weight + softness ); + mix = ( mix * a ) >> 8; *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16; 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; @@ -453,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; @@ -475,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 @@ -494,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; } @@ -508,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; } @@ -527,7 +545,7 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint */ static inline void -scale_luma ( uint16_t *dest_buf, int dest_width, int dest_height, const uint16_t *src_buf, int src_width, int src_height ) +scale_luma ( uint16_t *dest_buf, int dest_width, int dest_height, const uint16_t *src_buf, int src_width, int src_height, int invert ) { register int i, j; register int x_step = ( src_width << 16 ) / dest_width; @@ -541,7 +559,7 @@ scale_luma ( uint16_t *dest_buf, int dest_width, int dest_height, const uint16_t for ( j = 0; j < dest_width; j++ ) { - *dest_buf++ = src[ x >> 16 ]; + *dest_buf++ = src[ x >> 16 ] ^ invert; x += x_step; } y += y_step; @@ -554,15 +572,29 @@ static uint16_t* get_luma( mlt_properties properties, int width, int height ) int luma_width = mlt_properties_get_int( properties, "_luma.width" ); int luma_height = mlt_properties_get_int( properties, "_luma.height" ); uint16_t *luma_bitmap = mlt_properties_get_data( properties, "_luma.bitmap", NULL ); + int invert = mlt_properties_get_int( properties, "luma_invert" ); // If the filename property changed, reload the map char *resource = mlt_properties_get( properties, "luma" ); char temp[ 512 ]; + if ( luma_width == 0 || luma_height == 0 ) + { + luma_width = width; + luma_height = height; + } + if ( resource != NULL && 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 ); + test = fopen( temp, "r" ); + if ( test == NULL ) + strcat( temp, ".png" ); + else + fclose( test ); resource = temp; } @@ -575,7 +607,7 @@ static uint16_t* get_luma( mlt_properties properties, int width, int height ) // Load the original luma once if ( orig_bitmap == NULL ) { - char *extension = extension = strrchr( resource, '.' ); + char *extension = strrchr( resource, '.' ); // See if it is a PGM if ( extension != NULL && strcmp( extension, ".pgm" ) == 0 ) @@ -647,7 +679,7 @@ static uint16_t* get_luma( mlt_properties properties, int width, int height ) } // Scale luma map luma_bitmap = mlt_pool_alloc( width * height * sizeof( uint16_t ) ); - scale_luma( luma_bitmap, width, height, orig_bitmap, luma_width, luma_height ); + scale_luma( luma_bitmap, width, height, orig_bitmap, luma_width, luma_height, invert * ( ( 1 << 16 ) - 1 ) ); // Remember the scaled luma size to prevent unnecessary scaling mlt_properties_set_int( properties, "_luma.width", width ); @@ -678,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; @@ -727,23 +760,12 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** alignment_calculate( geometry ); // Adjust to consumer scale - int x = geometry->item.x * *width / geometry->nw; - int y = geometry->item.y * *height / geometry->nh; *width = geometry->sw * *width / geometry->nw; *height = geometry->sh * *height / geometry->nh; - //x = ( x | 1 ) ^ 1; - - // optimization points - no work to do - if ( *width < 1 || *height < 1 ) - return 1; - - if ( ( x < 0 && -x >= *width ) || ( y < 0 && -y >= *height ) ) - return 1; - ret = mlt_frame_get_image( b_frame, image, &format, width, height, 1 ); - return ret; + return ret && image != NULL; } @@ -774,8 +796,11 @@ static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s else { int length = mlt_transition_get_out( this ) - mlt_transition_get_in( this ) + 1; - if ( mlt_properties_get_int( properties, "cycle" ) ) - length = mlt_properties_get_int( properties, "cycle" ); + double cycle = mlt_properties_get_double( properties, "cycle" ); + if ( cycle > 1 ) + length = cycle; + else if ( cycle > 0 ) + length *= cycle; mlt_geometry_refresh( start, mlt_properties_get( properties, "geometry" ), length, normalised_width, normalised_height ); } @@ -924,15 +949,25 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f // Get the transition from the a frame mlt_transition this = mlt_frame_pop_service( a_frame ); - // This compositer is yuv422 only - *format = mlt_image_yuv422; - - // Get the image from the a frame - mlt_frame_get_image( a_frame, image, format, width, height, 1 ); + // Get in and out + int out = mlt_frame_pop_service_int( a_frame ); + int in = mlt_frame_pop_service_int( a_frame ); // Get the properties from the transition mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); + // TODO: clean up always_active behaviour + if ( mlt_properties_get_int( properties, "always_active" ) ) + { + mlt_events_block( properties, properties ); + mlt_properties_set_int( properties, "in", in ); + mlt_properties_set_int( properties, "out", out ); + mlt_events_unblock( properties, properties ); + } + + // This compositer is yuv422 only + *format = mlt_image_yuv422; + if ( b_frame != NULL ) { // Get the properties of the a frame @@ -956,6 +991,26 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f // Do the calculation composite_calculate( this, &result, a_frame, position ); + // 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_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) ); + mlt_properties_set_int( b_props, "normalised_width", mlt_properties_get_double( a_props, "normalised_width" ) ); + mlt_properties_set_int( b_props, "normalised_height", mlt_properties_get_double( a_props, "normalised_height" ) ); + + // TODO: Dangerous/temporary optimisation - if nothing to do, then do nothing + if ( mlt_properties_get_int( properties, "no_alpha" ) && + result.item.x == 0 && result.item.y == 0 && result.item.w == *width && result.item.h == *height && result.item.mix == 100 ) + { + mlt_frame_get_image( b_frame, image, format, width, height, 1 ); + if ( !mlt_frame_is_test_card( a_frame ) ) + mlt_frame_replace_image( a_frame, *image, *format, *width, *height ); + return 0; + } + + // Get the image from the a frame + mlt_frame_get_image( a_frame, image, format, width, height, 1 ); + // Optimisation - no compositing required if ( result.item.mix == 0 || ( result.item.w == 0 && result.item.h == 0 ) ) return 0; @@ -974,13 +1029,6 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f mlt_properties_set_int( b_props, "dest_height", mlt_properties_get_int( a_props, "dest_height" ) ); } - // 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_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) ); - mlt_properties_set_int( b_props, "normalised_width", mlt_properties_get_double( a_props, "normalised_width" ) ); - mlt_properties_set_int( b_props, "normalised_height", mlt_properties_get_double( a_props, "normalised_height" ) ); - // Special case for titling... if ( mlt_properties_get_int( properties, "titles" ) ) { @@ -995,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" ); @@ -1005,6 +1054,14 @@ 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 @@ -1015,8 +1072,10 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f if ( mlt_properties_get_int( properties, "titles" ) ) { - result.nw = result.item.w = *width; - result.nh = result.item.h = *height; + result.item.w = *width * ( result.item.w / result.nw ); + result.nw = result.item.w; + result.item.h = *height * ( result.item.h / result.nh ); + result.nh = *height; result.sw = width_b; result.sh = height_b; } @@ -1025,10 +1084,14 @@ 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 ); } } } + else + { + mlt_frame_get_image( a_frame, image, format, width, height, 1 ); + } return 0; } @@ -1041,11 +1104,28 @@ static mlt_frame composite_process( mlt_transition this, mlt_frame a_frame, mlt_ // Get a unique name to store the frame position char *name = mlt_properties_get( MLT_TRANSITION_PROPERTIES( this ), "_unique_id" ); - // Assign the current position to the name - mlt_properties_set_position( MLT_FRAME_PROPERTIES( a_frame ), name, mlt_frame_get_position( a_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 ) + { + 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" ) ); + + // Assign the current position to the name + mlt_properties_set_position( MLT_FRAME_PROPERTIES( a_frame ), name, mlt_frame_get_position( a_frame ) ); - // Propogate the transition properties to the b frame - mlt_properties_set_double( MLT_FRAME_PROPERTIES( b_frame ), "relative_position", position_calculate( this, mlt_frame_get_position( a_frame ) ) ); + // Propogate the transition properties to the b frame + mlt_properties_set_double( MLT_FRAME_PROPERTIES( b_frame ), "relative_position", position_calculate( this, mlt_frame_get_position( a_frame ) ) ); + } + else + { + 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_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" ) ); + } mlt_frame_push_service( a_frame, this ); mlt_frame_push_frame( a_frame, b_frame ); @@ -1066,11 +1146,14 @@ mlt_transition transition_composite_init( char *arg ) this->process = composite_process; // Default starting motion and zoom - mlt_properties_set( properties, "start", arg != NULL ? arg : "85%,5%:10%x10%" ); + mlt_properties_set( properties, "start", arg != NULL ? arg : "0,0:100%x100%" ); // Default factory mlt_properties_set( properties, "factory", "fezzik" ); + // Inform apps and framework that this is a video only transition + mlt_properties_set_int( properties, "_transition_type", 1 ); + #ifdef USE_MMX //mlt_properties_set_int( properties, "_MMX", composite_have_mmx() ); #endif