X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=09eb6f078ddd6dae00250f9caa67392ad9efe745;hb=06cbcd6e728a9288d06074cf1a2bc979b735468b;hp=6c367e9335e79778f38386855afc4524f90b3b22;hpb=efe08354d45db7bf5478ffa17c35330a3e0d415c;p=melted diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c index 6c367e9..09eb6f0 100644 --- a/src/framework/mlt_frame.c +++ b/src/framework/mlt_frame.c @@ -21,6 +21,7 @@ #include "config.h" #include "mlt_frame.h" #include "mlt_producer.h" +#include "mlt_factory.h" #include #include #include @@ -36,7 +37,7 @@ mlt_frame mlt_frame_init( ) if ( this != NULL ) { // Get the normalisation - char *normalisation = getenv( "MLT_NORMALISATION" ); + char *normalisation = mlt_environment( "MLT_NORMALISATION" ); // Initialise the properties mlt_properties properties = &this->parent; @@ -68,6 +69,7 @@ mlt_frame mlt_frame_init( ) // Construct stacks for frames and methods this->stack_get_image = mlt_deque_init( ); this->stack_frame = mlt_deque_init( ); + this->stack_service = mlt_deque_init( ); } return this; @@ -161,6 +163,22 @@ mlt_frame mlt_frame_pop_frame( mlt_frame this ) return mlt_deque_pop_back( this->stack_frame ); } +/** Push a service. +*/ + +int mlt_frame_push_service( mlt_frame this, void *that ) +{ + return mlt_deque_push_back( this->stack_service, that ); +} + +/** Pop a service. +*/ + +void *mlt_frame_pop_service( mlt_frame this ) +{ + return mlt_deque_pop_back( this->stack_service ); +} + int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable ) { mlt_properties properties = mlt_frame_properties( this ); @@ -241,7 +259,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for q = p + size; while ( p != NULL && p != q ) { - *p ++ = 255; + *p ++ = 235; *p ++ = 128; } break; @@ -293,24 +311,42 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for void mlt_frame_close( mlt_frame this ) { - mlt_deque_close( this->stack_get_image ); - mlt_deque_close( this->stack_frame ); - mlt_properties_close( &this->parent ); - free( this ); + if ( this != NULL ) + { + mlt_deque_close( this->stack_get_image ); + mlt_deque_close( this->stack_frame ); + mlt_deque_close( this->stack_service ); + mlt_properties_close( &this->parent ); + free( this ); + } } /***** convenience functions *****/ -#define RGB2YUV(r, g, b, y, u, v)\ - y = (306*r + 601*g + 117*b) >> 10;\ - u = ((-172*r - 340*g + 512*b) >> 10) + 128;\ - v = ((512*r - 429*g - 83*b) >> 10) + 128;\ - y = y < 0 ? 0 : y;\ - u = u < 0 ? 0 : u;\ - v = v < 0 ? 0 : v;\ - y = y > 255 ? 255 : y;\ - u = u > 255 ? 255 : u;\ - v = v > 255 ? 255 : v +/* this macro scales rgb into the yuv gamut, y is scaled by 219/255 and uv by 224/255 */ +#define RGB2YUV(r, g, b, y, u, v)\ + y = ((257*r + 504*g + 98*b) >> 10) + 16;\ + u = ((-148*r - 291*g + 439*b) >> 10) + 128;\ + v = ((439*r - 368*g - 71*b) >> 10) + 128;\ + y = y < 16 ? 16 : y;\ + u = u < 16 ? 16 : u;\ + v = v < 16 ? 16 : v;\ + y = y > 235 ? 235 : y;\ + u = u > 240 ? 240 : u;\ + v = v > 240 ? 240 : v + +/* this macro assumes the user has already scaled their rgb down into the broadcast limits */ +#define RGB2YUV_UNSCALED(r, g, b, y, u, v)\ + y = (299*r + 587*g + 114*b) >> 10;\ + u = ((-169*r - 331*g + 500*b) >> 10) + 128;\ + v = ((500*r - 419*g - 81*b) >> 10) + 128;\ + y = y < 16 ? 16 : y;\ + u = u < 16 ? 16 : u;\ + v = v < 16 ? 16 : v;\ + y = y > 235 ? 235 : y;\ + u = u > 240 ? 240 : u;\ + v = v > 240 ? 240 : v + int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha ) { int ret = 0; @@ -461,7 +497,7 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input elements = blank_elements; while ( elements -- ) { - *out_line ++ = 0; + *out_line ++ = 16; *out_line ++ = 128; } @@ -478,7 +514,7 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input elements = inactive_width; while ( elements -- ) { - *out_ptr ++ = 0; + *out_ptr ++ = 16; *out_ptr ++ = 128; } @@ -490,7 +526,7 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input elements = inactive_width; while ( elements -- ) { - *out_ptr ++ = 0; + *out_ptr ++ = 16; *out_ptr ++ = 128; } @@ -505,7 +541,7 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input elements = blank_elements; while ( elements -- ) { - *out_line ++ = 0; + *out_line ++ = 16; *out_line ++ = 128; } } @@ -571,9 +607,6 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) iwidth = iwidth - ( iwidth % 4 ); - // Coordinates (0,0 is middle of output) - int y, x; - // Derived coordinates int dy, dx; @@ -584,41 +617,44 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) int in_y_range = iheight / 2; // Output pointers - uint8_t *out_line = output; - uint8_t *out_ptr; + register uint8_t *out_line = output; + register uint8_t *out_ptr; // Calculate a middle pointer uint8_t *in_middle = input + istride * in_y_range + in_x_range * 2; uint8_t *in_line; - uint8_t *in_ptr; // Generate the affine transform scaling values - int scale_width = ( iwidth << 16 ) / owidth; - int scale_height = ( iheight << 16 ) / oheight; + register int scale_width = ( iwidth << 16 ) / owidth; + register int scale_height = ( iheight << 16 ) / oheight; + register int base = 0; + + int outer = out_x_range * scale_width; + int bottom = out_y_range * scale_height; // Loop for the entirety of our output height. - for ( y = - out_y_range; y < out_y_range ; y ++ ) + for ( dy = - bottom; dy < bottom; dy += scale_height ) { - // Calculate the derived y value - dy = ( scale_height * y ) >> 16; - // Start at the beginning of the line out_ptr = out_line; // Pointer to the middle of the input line - in_line = in_middle + dy * istride; - + in_line = in_middle + ( dy >> 16 ) * istride; + // Loop for the entirety of our output row. - for ( x = - out_x_range; x < out_x_range; x += 1 ) + for ( dx = - outer; dx < outer; dx += scale_width ) { - // Calculated the derived x - dx = ( scale_width * x ) >> 16; - - // We're in the input range for this row. - in_ptr = in_line + ( dx << 1 ); - *out_ptr ++ = *in_ptr ++; - in_ptr = in_line + ( ( dx >> 1 ) << 2 ) + ( ( x & 1 ) << 1 ) + 1; - *out_ptr ++ = *in_ptr; + base = dx >> 15; + base &= 0xfffffffe; + *out_ptr ++ = *( in_line + base ); + base &= 0xfffffffc; + *out_ptr ++ = *( in_line + base + 1 ); + dx += scale_width; + base = dx >> 15; + base &= 0xfffffffe; + *out_ptr ++ = *( in_line + base ); + base &= 0xfffffffc; + *out_ptr ++ = *( in_line + base + 3 ); } // Move to next output line @@ -641,22 +677,18 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, float weight_end, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples ) { int ret = 0; - int16_t *p_src, *p_dest; int16_t *src, *dest; - //static int16_t *extra_src = NULL, *extra_dest = NULL; - static int extra_src_samples = 0, extra_dest_samples = 0; int frequency_src = *frequency, frequency_dest = *frequency; int channels_src = *channels, channels_dest = *channels; int samples_src = *samples, samples_dest = *samples; int i, j; double d = 0, s = 0; - mlt_frame_get_audio( this, &p_dest, format, &frequency_dest, &channels_dest, &samples_dest ); + mlt_frame_get_audio( this, &dest, format, &frequency_dest, &channels_dest, &samples_dest ); //fprintf( stderr, "mix: frame dest samples %d channels %d position %lld\n", samples_dest, channels_dest, mlt_properties_get_position( mlt_frame_properties( this ), "_position" ) ); - mlt_frame_get_audio( that, &p_src, format, &frequency_src, &channels_src, &samples_src ); + mlt_frame_get_audio( that, &src, format, &frequency_src, &channels_src, &samples_src ); //fprintf( stderr, "mix: frame src samples %d channels %d\n", samples_src, channels_src ); - src = p_src; - dest = p_dest; + if ( channels_src > 6 ) channels_src = 0; if ( channels_dest > 6 ) @@ -666,34 +698,10 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, flo if ( samples_dest > 4000 ) samples_dest = 0; -#if 0 - // Append new samples to leftovers - if ( extra_dest_samples > 0 ) - { - fprintf( stderr, "prepending %d samples to dest\n", extra_dest_samples ); - dest = realloc( extra_dest, ( samples_dest + extra_dest_samples ) * 2 * channels_dest ); - memcpy( &extra_dest[ extra_dest_samples * channels_dest ], p_dest, samples_dest * 2 * channels_dest ); - } - else - dest = p_dest; - if ( extra_src_samples > 0 ) - { - fprintf( stderr, "prepending %d samples to src\n", extra_src_samples ); - src = realloc( extra_src, ( samples_src + extra_src_samples ) * 2 * channels_src ); - memcpy( &extra_src[ extra_src_samples * channels_src ], p_src, samples_src * 2 * channels_src ); - } - else - src = p_src; -#endif - - // determine number of samples to process - if ( samples_src + extra_src_samples < samples_dest + extra_dest_samples ) - *samples = samples_src + extra_src_samples; - else if ( samples_dest + extra_dest_samples < samples_src + extra_src_samples ) - *samples = samples_dest + extra_dest_samples; - + // determine number of samples to process + *samples = samples_src < samples_dest ? samples_src : samples_dest; *channels = channels_src < channels_dest ? channels_src : channels_dest; - *buffer = p_dest; + *buffer = dest; *frequency = frequency_dest; // Compute a smooth ramp over start to end @@ -714,40 +722,6 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, flo weight += weight_step; } - // We have to copy --sigh - if ( dest != p_dest ) - memcpy( p_dest, dest, *samples * 2 * *channels ); - -#if 0 - // Store the leftovers - if ( samples_src + extra_src_samples < samples_dest + extra_dest_samples ) - { - extra_dest_samples = ( samples_dest + extra_dest_samples ) - ( samples_src + extra_src_samples ); - size_t size = extra_dest_samples * 2 * channels_dest; - fprintf( stderr, "storing %d samples from dest\n", extra_dest_samples ); - if ( extra_dest ) - free( extra_dest ); - extra_dest = malloc( size ); - if ( extra_dest ) - memcpy( extra_dest, &p_dest[ ( samples_dest - extra_dest_samples - 1 ) * channels_dest ], size ); - else - extra_dest_samples = 0; - } - else if ( samples_dest + extra_dest_samples < samples_src + extra_src_samples ) - { - extra_src_samples = ( samples_src + extra_src_samples ) - ( samples_dest + extra_dest_samples ); - size_t size = extra_src_samples * 2 * channels_src; - fprintf( stderr, "storing %d samples from src\n", extra_dest_samples ); - if ( extra_src ) - free( extra_src ); - extra_src = malloc( size ); - if ( extra_src ) - memcpy( extra_src, &p_src[ ( samples_src - extra_src_samples - 1 ) * channels_src ], size ); - else - extra_src_samples = 0; - } -#endif - return ret; }