X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=2fef7c080de63e6ac2ef088aeddba86f6c77f62f;hb=782525889e995881b65765f764d31a390c1b904a;hp=a598f4e76b226406a1099d8d2091ee6d089385d3;hpb=20b174a97de49eff52526ec3a8b3154d8e2ce815;p=melted diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c index a598f4e..2fef7c0 100644 --- a/src/framework/mlt_frame.c +++ b/src/framework/mlt_frame.c @@ -24,20 +24,6 @@ #include #include -typedef struct -{ - mlt_image_format vfmt; - int width; - int height; - uint8_t *image; - uint8_t *alpha; - mlt_audio_format afmt; - int16_t *audio; -} -frame_test; - -static frame_test test_card = { mlt_image_none, 0, 0, NULL, NULL, mlt_audio_none, NULL }; - /** Constructor for a frame. */ @@ -53,7 +39,7 @@ mlt_frame mlt_frame_init( ) mlt_properties_init( properties, this ); // Set default properties on the frame - mlt_properties_set_position( properties, "position", 0.0 ); + mlt_properties_set_position( properties, "_position", 0.0 ); mlt_properties_set_data( properties, "image", NULL, 0, NULL, NULL ); mlt_properties_set_int( properties, "width", 720 ); mlt_properties_set_int( properties, "height", 576 ); @@ -77,7 +63,7 @@ mlt_properties mlt_frame_properties( mlt_frame this ) int mlt_frame_is_test_card( mlt_frame this ) { - return ( this->stack_get_image_size == 0 && mlt_properties_get_data( mlt_frame_properties( this ), "image", NULL ) == NULL ); + return mlt_properties_get_int( mlt_frame_properties( this ), "test_image" ); } /** Check if we have a way to derive something than test audio. @@ -85,7 +71,7 @@ int mlt_frame_is_test_card( mlt_frame this ) int mlt_frame_is_test_audio( mlt_frame this ) { - return this->get_audio == NULL; + return this->get_audio == NULL || mlt_properties_get_int( mlt_frame_properties( this ), "test_audio" ); } /** Get the aspect ratio of the frame. @@ -109,7 +95,7 @@ int mlt_frame_set_aspect_ratio( mlt_frame this, double value ) mlt_position mlt_frame_get_position( mlt_frame this ) { - return mlt_properties_get_position( mlt_frame_properties( this ), "position" ); + return mlt_properties_get_position( mlt_frame_properties( this ), "_position" ); } /** Set the position of this frame. @@ -117,7 +103,7 @@ mlt_position mlt_frame_get_position( mlt_frame this ) int mlt_frame_set_position( mlt_frame this, mlt_position value ) { - return mlt_properties_set_position( mlt_frame_properties( this ), "position", value ); + return mlt_properties_set_position( mlt_frame_properties( this ), "_position", value ); } /** Stack a get_image callback. @@ -182,47 +168,56 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for } else { - if ( test_card.vfmt != *format ) + uint8_t *p; + uint8_t *q; + int size = 0; + + *width = *width == 0 ? 720 : *width; + *height = *height == 0 ? 576 : *height; + size = *width * *height; + + mlt_properties_set_int( properties, "width", *width ); + mlt_properties_set_int( properties, "height", *height ); + + switch( *format ) { - uint8_t *p; - uint8_t *q; - - test_card.vfmt = *format; - test_card.width = *width == 0 ? 720 : *width; - test_card.height = *height == 0 ? 576 : *height; - - switch( *format ) - { - case mlt_image_none: - break; - case mlt_image_rgb24: - test_card.image = realloc( test_card.image, test_card.width * test_card.height * 3 ); - memset( test_card.image, 255, test_card.width * test_card.height * 3 ); - break; - case mlt_image_rgb24a: - test_card.image = realloc( test_card.image, test_card.width * test_card.height * 4 ); - memset( test_card.image, 255, test_card.width * test_card.height * 4 ); - break; - case mlt_image_yuv422: - test_card.image = realloc( test_card.image, test_card.width * test_card.height * 2 ); - p = test_card.image; - q = test_card.image + test_card.width * test_card.height * 2; - while ( p != q ) - { - *p ++ = 255; - *p ++ = 128; - } - break; - case mlt_image_yuv420p: - test_card.image = realloc( test_card.image, test_card.width * test_card.height * 3 / 2 ); - memset( test_card.image, 255, test_card.width * test_card.height * 3 / 2 ); - break; - } + case mlt_image_none: + size = 0; + *buffer = NULL; + break; + case mlt_image_rgb24: + size *= 3; + *buffer = malloc( size ); + if ( *buffer ) + memset( *buffer, 255, size ); + break; + case mlt_image_rgb24a: + size *= 4; + *buffer = malloc( size ); + if ( *buffer ) + memset( *buffer, 255, size ); + break; + case mlt_image_yuv422: + size *= 2; + *buffer = malloc( size ); + p = *buffer; + q = p + size; + while ( p != NULL && p != q ) + { + *p ++ = 255; + *p ++ = 128; + } + break; + case mlt_image_yuv420p: + size = size * 3 / 2; + *buffer = malloc( size ); + if ( *buffer ) + memset( *buffer, 255, size ); + break; } - *width = test_card.width; - *height = test_card.height; - *buffer = test_card.image; + mlt_properties_set_data( properties, "image", *buffer, size, free, NULL ); + mlt_properties_set_int( properties, "test_image", 1 ); } return 0; @@ -232,31 +227,29 @@ uint8_t *mlt_frame_get_alpha_mask( mlt_frame this ) { if ( this->get_alpha_mask != NULL ) return this->get_alpha_mask( this ); - return test_card.alpha; + return NULL; } int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples ) { + mlt_properties properties = mlt_frame_properties( this ); + if ( this->get_audio != NULL ) { return this->get_audio( this, buffer, format, frequency, channels, samples ); } else { - if ( *samples <= 0 ) - *samples = 1920; - if ( *channels <= 0 ) - *channels = 2; - if ( *frequency <= 0 ) - *frequency = 48000; - if ( test_card.audio == NULL || test_card.afmt != *format ) - { - test_card.afmt = *format; - test_card.audio = realloc( test_card.audio, *samples * *channels * sizeof( int16_t ) ); - memset( test_card.audio, 0, *samples * *channels * sizeof( int16_t ) ); - } - - *buffer = test_card.audio; + int size = 0; + *samples = *samples <= 0 ? 1920 : *samples; + *channels = *channels <= 0 ? 2 : *channels; + *frequency = *frequency <= 0 ? 48000 : *frequency; + size = *samples * *channels * sizeof( int16_t ); + *buffer = malloc( size ); + if ( *buffer != NULL ) + memset( *buffer, 0, size ); + mlt_properties_set_data( properties, "audio", *buffer, size, free, NULL ); + mlt_properties_set_int( properties, "test_audio", 1 ); } return 0; } @@ -389,110 +382,6 @@ int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int return ret; } -int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float weight ) -{ - int ret = 0; - int width_src = 0, height_src = 0; - int width_dest = 0, height_dest = 0; - mlt_image_format format_src = mlt_image_yuv422, format_dest = mlt_image_yuv422; - uint8_t *p_src, *p_dest; - int i, j; - int stride_src; - int stride_dest; - int x_src = 0, y_src = 0; - - // optimization point - no work to do - if ( ( x < 0 && -x >= width_src ) || ( y < 0 && -y >= height_src ) ) - return ret; - - format_src = mlt_image_yuv422; - format_dest = mlt_image_yuv422; - - //fprintf( stderr, "call get_image on frame a\n"), fflush( stderr ); - mlt_frame_get_image( this, &p_dest, &format_dest, &width_dest, &height_dest, 1 /* writable */ ); - //fprintf( stderr, "call get_image on frame b\n"), fflush( stderr ); - mlt_frame_get_image( that, &p_src, &format_src, &width_src, &height_src, 0 /* writable */ ); - - //fprintf( stderr, "mlt_frame_composite_yuv %dx%d -> %dx%d\n", width_src, height_src, width_dest, height_dest ); - //fflush(stderr); - //return ret; - stride_src = width_src * 2; - stride_dest = width_dest * 2; - - // crop overlay off the left edge of frame - if ( x < 0 ) - { - x_src = -x; - width_src -= x_src; - x = 0; - } - - // crop overlay beyond right edge of frame - else if ( x + width_src > width_dest ) - width_src = width_dest - x; - - // crop overlay off the top edge of the frame - if ( y < 0 ) - { - y_src = -y; - height_src -= y_src; - } - // crop overlay below bottom edge of frame - else if ( y + height_src > height_dest ) - height_src = height_dest - y; - - // offset pointer into overlay buffer based on cropping - p_src += x_src * 2 + y_src * stride_src; - - // offset pointer into frame buffer based upon positive, even coordinates only! -// if ( interlaced && y % 2 ) -// ++y; - p_dest += ( x < 0 ? 0 : x ) * 2 + ( y < 0 ? 0 : y ) * stride_dest; - - // Get the alpha channel of the overlay - uint8_t *p_alpha = mlt_frame_get_alpha_mask( that ); - - // offset pointer into alpha channel based upon cropping - if ( p_alpha ) - p_alpha += x_src + y_src * stride_src / 2; - - uint8_t *p = p_src; - uint8_t *q = p_dest; - uint8_t *o = p_dest; - uint8_t *z = p_alpha; - - uint8_t Y; - uint8_t UV; - uint8_t a; - float value; - - // now do the compositing only to cropped extents - for ( i = 0; i < height_src; i++ ) - { - p = p_src; - q = p_dest; - o = p_dest; - z = p_alpha; - - for ( j = 0; j < width_src; j ++ ) - { - Y = *p ++; - UV = *p ++; - a = ( z == NULL ) ? 255 : *z ++; - value = ( weight * ( float ) a / 255.0 ); - *o ++ = (uint8_t)( Y * value + *q++ * ( 1 - value ) ); - *o ++ = (uint8_t)( UV * value + *q++ * ( 1 - value ) ); - } - - p_src += stride_src; - p_dest += stride_dest; - if ( p_alpha ) - p_alpha += stride_src / 2; - } - - return ret; -} - void *memfill( void *dst, void *src, int l, int elements ) { int i = 0; @@ -527,6 +416,10 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input iheight = iheight - ( iheight % 2 ); oheight = oheight - ( oheight % 2 ); + // Optimisation point + if ( iwidth == owidth && iheight == oheight ) + memcpy( output, input, iheight * istride ); + // Coordinates (0,0 is middle of output) int y; @@ -605,6 +498,7 @@ uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight ) mlt_properties_set_data( properties, "image", output, owidth * oheight * 2, free, NULL ); mlt_properties_set_int( properties, "width", owidth ); mlt_properties_set_int( properties, "height", oheight ); + mlt_frame_set_aspect_ratio( this, 4.0/3.0/*( float )owidth / oheight*/ ); // Return the output return output; @@ -662,14 +556,14 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) uint8_t *in_ptr; // Generate the affine transform scaling values - float scale_width = ( float )iwidth / ( float )owidth; - float scale_height = ( float )iheight / ( float )oheight; + int scale_width = ( iwidth << 16 ) / owidth; + int scale_height = ( iheight << 16 ) / oheight; // Loop for the entirety of our output height. for ( y = - out_y_range; y < out_y_range ; y ++ ) { // Calculate the derived y value - dy = scale_height * y; + dy = ( scale_height * y ) >> 16; // Start at the beginning of the line out_ptr = out_line; @@ -681,23 +575,13 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) for ( x = - out_x_range; x < out_x_range; x += 1 ) { // Calculated the derived x - dx = scale_width * x; - - // Check if x and y are in the valid input range. - if ( abs( dx ) < in_x_range && abs( dy ) < in_y_range ) - { - // We're in the input range for this row. - in_ptr = in_line + dx * 2; - *out_ptr ++ = *in_ptr ++; - in_ptr = in_line + ( ( dx >> 1 ) << 2 ) + ( ( x & 1 ) << 1 ) + 1; - *out_ptr ++ = *in_ptr ++; - } - else - { - // We're not in the input range for this row. - *out_ptr ++ = 16; - *out_ptr ++ = 128; - } + 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; } // Move to next output line @@ -724,16 +608,16 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t * 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 = *channels, frequency_dest = *channels; + 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 ); - fprintf( stderr, "frame dest samples %d channels %d position %lld\n", samples_dest, channels_dest, mlt_properties_get_position( mlt_frame_properties( this ), "position" ) ); + //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 ); - fprintf( stderr, "frame src samples %d channels %d\n", samples_src, channels_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 ) @@ -773,6 +657,7 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t * *channels = channels_src < channels_dest ? channels_src : channels_dest; *buffer = p_dest; + *frequency = frequency_dest; // Mixdown for ( i = 0; i < *samples; i++ )