X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=0924cbbc780e9e0ee155c2c90cd0bc33885aa98b;hb=e253fb0e1e231bcdc77bc37b05c7a9724dbe2bb1;hp=3221f40b69c781da6f2edaeb0c44494dbd1da6da;hpb=2af8bb9f6a61f6510aab8f45abf5f26e9e619c78;p=melted diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c index 3221f40..0924cbb 100644 --- a/src/framework/mlt_frame.c +++ b/src/framework/mlt_frame.c @@ -53,6 +53,7 @@ mlt_frame mlt_frame_init( ) mlt_properties_set_int( properties, "height", 576 ); mlt_properties_set_int( properties, "normalised_width", 720 ); mlt_properties_set_int( properties, "normalised_height", 576 ); + mlt_properties_set_double( properties, "aspect_ratio", 72.0/79.0 ); } else { @@ -60,16 +61,15 @@ mlt_frame mlt_frame_init( ) mlt_properties_set_int( properties, "height", 480 ); mlt_properties_set_int( properties, "normalised_width", 720 ); mlt_properties_set_int( properties, "normalised_height", 480 ); + mlt_properties_set_double( properties, "aspect_ratio", 128.0/117.0 ); } - mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 ); mlt_properties_set_data( properties, "audio", NULL, 0, NULL, NULL ); mlt_properties_set_data( properties, "alpha", NULL, 0, NULL, NULL ); // 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( ); + this->stack_image = mlt_deque_init( ); + this->stack_audio = mlt_deque_init( ); } return this; @@ -88,7 +88,7 @@ mlt_properties mlt_frame_properties( mlt_frame this ) int mlt_frame_is_test_card( mlt_frame this ) { - return mlt_properties_get_int( mlt_frame_properties( this ), "test_image" ); + return mlt_deque_count( this->stack_image ) == 0 || mlt_properties_get_int( mlt_frame_properties( this ), "test_image" ); } /** Check if we have a way to derive something than test audio. @@ -136,7 +136,7 @@ int mlt_frame_set_position( mlt_frame this, mlt_position value ) int mlt_frame_push_get_image( mlt_frame this, mlt_get_image get_image ) { - return mlt_deque_push_back( this->stack_get_image, get_image ); + return mlt_deque_push_back( this->stack_image, get_image ); } /** Pop a get_image callback. @@ -144,7 +144,7 @@ int mlt_frame_push_get_image( mlt_frame this, mlt_get_image get_image ) mlt_get_image mlt_frame_pop_get_image( mlt_frame this ) { - return mlt_deque_pop_back( this->stack_get_image ); + return mlt_deque_pop_back( this->stack_image ); } /** Push a frame. @@ -152,7 +152,7 @@ mlt_get_image mlt_frame_pop_get_image( mlt_frame this ) int mlt_frame_push_frame( mlt_frame this, mlt_frame that ) { - return mlt_deque_push_back( this->stack_frame, that ); + return mlt_deque_push_back( this->stack_image, that ); } /** Pop a frame. @@ -160,7 +160,7 @@ int mlt_frame_push_frame( mlt_frame this, mlt_frame that ) mlt_frame mlt_frame_pop_frame( mlt_frame this ) { - return mlt_deque_pop_back( this->stack_frame ); + return mlt_deque_pop_back( this->stack_image ); } /** Push a service. @@ -168,7 +168,7 @@ mlt_frame mlt_frame_pop_frame( mlt_frame this ) int mlt_frame_push_service( mlt_frame this, void *that ) { - return mlt_deque_push_back( this->stack_service, that ); + return mlt_deque_push_back( this->stack_image, that ); } /** Pop a service. @@ -176,7 +176,23 @@ int mlt_frame_push_service( mlt_frame this, void *that ) void *mlt_frame_pop_service( mlt_frame this ) { - return mlt_deque_pop_back( this->stack_service ); + return mlt_deque_pop_back( this->stack_image ); +} + +/** Push an audio item on the stack. +*/ + +int mlt_frame_push_audio( mlt_frame this, void *that ) +{ + return mlt_deque_push_back( this->stack_audio, that ); +} + +/** Pop an audio item from the stack +*/ + +void *mlt_frame_pop_audio( mlt_frame this ) +{ + return mlt_deque_pop_back( this->stack_audio ); } int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable ) @@ -204,7 +220,6 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for { mlt_properties test_properties = mlt_frame_properties( test_frame ); mlt_properties_set_double( test_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "consumer_aspect_ratio" ) ); - mlt_properties_set_double( test_properties, "consumer_scale", mlt_properties_get_double( properties, "consumer_scale" ) ); mlt_properties_set( test_properties, "rescale.interp", "nearest" ); mlt_frame_get_image( test_frame, buffer, format, width, height, writable ); mlt_properties_set_data( properties, "test_card_frame", test_frame, 0, ( mlt_destructor )mlt_frame_close, NULL ); @@ -230,6 +245,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for mlt_properties_set_int( properties, "width", *width ); mlt_properties_set_int( properties, "height", *height ); + mlt_properties_set_int( properties, "aspect_ratio", 1 ); switch( *format ) { @@ -259,7 +275,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; @@ -313,25 +329,14 @@ void mlt_frame_close( mlt_frame this ) { if ( this != NULL ) { - mlt_deque_close( this->stack_get_image ); - mlt_deque_close( this->stack_frame ); - mlt_deque_close( this->stack_service ); + mlt_deque_close( this->stack_image ); + mlt_deque_close( this->stack_audio ); 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 int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha ) { @@ -483,12 +488,14 @@ 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; } int active_width = 2 * iwidth; int inactive_width = out_x_range - in_x_range; + uint8_t *p = NULL; + uint8_t *end = NULL; // Loop for the entirety of our output height. while ( iheight -- ) @@ -500,19 +507,24 @@ 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; } // We're in the input range for this row. - memcpy( out_ptr, in_middle + in_line, active_width ); - out_ptr += active_width; + p = in_middle + in_line; + end = out_ptr + active_width; + while ( out_ptr != end ) + { + *out_ptr ++ = *p ++; + *out_ptr ++ = *p ++; + } // Fill the outer part with black elements = inactive_width; while ( elements -- ) { - *out_ptr ++ = 0; + *out_ptr ++ = 16; *out_ptr ++ = 128; } @@ -527,7 +539,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; } } @@ -663,22 +675,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 ) @@ -688,34 +696,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 @@ -736,40 +720,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; } @@ -818,4 +768,3 @@ int mlt_sample_calculator( float fps, int frequency, int64_t position ) return samples; } -