X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=115978dd1cc5103c6c4fa69bd8d26c23a1c0eb01;hb=7651a182bf7191ab5db9b3741caeac2f86540281;hp=57c53b80eebcc964a66b4c51748584658fd641bc;hpb=eccf04749681f70957f34fdd6742224774e72d15;p=melted diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c index 57c53b8..115978d 100644 --- a/src/framework/mlt_frame.c +++ b/src/framework/mlt_frame.c @@ -263,8 +263,6 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for mlt_producer producer = mlt_properties_get_data( properties, "test_card_producer", NULL ); int error = 0; - *width = *width >> 1 << 1; - if ( get_image != NULL ) { mlt_properties_set_int( properties, "image_count", mlt_properties_get_int( properties, "image_count" ) - 1 ); @@ -431,10 +429,10 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for if ( mlt_properties_get( properties, "meta.volume" ) ) { double value = mlt_properties_get_double( properties, "meta.volume" ); + if ( value == 0.0 ) { memset( *buffer, 0, *samples * *channels * 2 ); - mlt_properties_set_double( properties, "meta.volume", 1.0 ); } else if ( value != 1.0 ) { @@ -445,8 +443,9 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for *p = *p * value; p ++; } - mlt_properties_set_double( properties, "meta.volume", 1.0 ); } + + mlt_properties_set( properties, "meta.volume", NULL ); } return 0; @@ -639,81 +638,37 @@ int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int return ret; } -uint8_t *mlt_resize_alpha( uint8_t *input, int owidth, int oheight, int iwidth, int iheight ) +uint8_t *mlt_resize_alpha( uint8_t *input, int owidth, int oheight, int iwidth, int iheight, uint8_t alpha_value ) { uint8_t *output = NULL; if ( input != NULL && ( iwidth != owidth || iheight != oheight ) && ( owidth > 6 && oheight > 6 ) ) { - iwidth = iwidth - ( iwidth % 2 ); - owidth = owidth - ( owidth % 2 ); + uint8_t *out_line; + int offset_x = ( owidth - iwidth ) / 2; + int offset_y = ( oheight - iheight ) / 2; + int iused = iwidth; output = mlt_pool_alloc( owidth * oheight ); + memset( output, alpha_value, owidth * oheight ); - // Coordinates (0,0 is middle of output) - int y; - - // Calculate ranges - int out_x_range = owidth / 2; - int out_y_range = oheight / 2; - int in_x_range = iwidth / 2 < out_x_range ? iwidth / 2 : out_x_range; - int in_y_range = iheight / 2 < out_y_range ? iheight / 2 : out_y_range; - - // Output pointers - uint8_t *out_line = output; - uint8_t *out_ptr = out_line; + offset_x -= offset_x % 2; - // Calculate a middle and possibly invalid pointer in the input - uint8_t *in_middle = input + iwidth * ( iheight / 2 ) + ( iwidth / 2 ); - int in_line = - in_y_range * iwidth - in_x_range; - - int elements; - - // Fill whole section with black - y = out_y_range - ( iheight / 2 ); - int blank_elements = owidth * y; - elements = blank_elements; - while ( elements -- ) - *out_line ++ = 0; - - int active_width = iwidth; - int inactive_width = out_x_range - in_x_range; - uint8_t *p = NULL; - uint8_t *end = NULL; + out_line = output + offset_y * owidth; + out_line += offset_x; // Loop for the entirety of our output height. while ( iheight -- ) { - // Start at the beginning of the line - out_ptr = out_line; - - // Fill the outer part with black - elements = inactive_width; - while ( elements -- ) - *out_ptr ++ = 0; - // We're in the input range for this row. - p = in_middle + in_line; - end = out_ptr + active_width; - while ( out_ptr != end ) - *out_ptr ++ = *p ++; - - // Fill the outer part with black - elements = inactive_width; - while ( elements -- ) - *out_ptr ++ = 0; - + memcpy( out_line, input, iused ); + // Move to next input line - in_line += iwidth; + input += iwidth; // Move to next output line out_line += owidth; } - - // Fill whole section with black - elements = blank_elements; - while ( elements -- ) - *out_line ++ = 0; } return output; @@ -724,12 +679,13 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input // Calculate strides int istride = iwidth * 2; int ostride = owidth * 2; + int offset_x = ( owidth - iwidth ); + int offset_y = ( oheight - iheight ) / 2; + uint8_t *in_line = input; + uint8_t *out_line; + int size = owidth * oheight; + uint8_t *p = output; - iwidth = iwidth - ( iwidth % 2 ); - owidth = owidth - ( owidth % 2 ); - //iheight = iheight - ( iheight % 2 ); - //oheight = oheight - ( oheight % 2 ); - // Optimisation point if ( output == NULL || input == NULL || ( owidth <= 6 || oheight <= 6 || iwidth <= 6 || oheight <= 6 ) ) { @@ -741,93 +697,29 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input return; } - // Coordinates (0,0 is middle of output) - int y; - - // Calculate ranges - int out_x_range = owidth / 2; - int out_y_range = oheight / 2; - int in_x_range = iwidth / 2 < out_x_range ? iwidth / 2 : out_x_range; - int in_y_range = iheight / 2 < out_y_range ? iheight / 2 : out_y_range; - - // Output pointers - uint8_t *out_line = output; - uint8_t *out_ptr = out_line; - - // Calculate a middle and possibly invalid pointer in the input - uint8_t *in_middle = input + istride * ( iheight / 2 ) + iwidth; - int in_line = - in_y_range * istride - in_x_range * 2; - - int elements; - - // Fill whole section with black - y = out_y_range - ( iheight / 2 ); - int blank_elements = ostride * y / 2; - elements = blank_elements; - while ( elements -- ) + while( size -- ) { - *out_line ++ = 16; - *out_line ++ = 128; + *p ++ = 16; + *p ++ = 128; } - int active_width = 2 * iwidth; - int left_inactive_width = out_x_range - in_x_range; - int right_inactive_width = left_inactive_width; - uint8_t *p = NULL; - uint8_t *end = NULL; + offset_x -= offset_x % 4; - if ( in_line % 4 ) - { - active_width -= 2; - in_middle += 2; - right_inactive_width += 2; - } + out_line = output + offset_y * ostride; + out_line += offset_x; // Loop for the entirety of our output height. while ( iheight -- ) { - // Start at the beginning of the line - out_ptr = out_line; - - // Fill the outer part with black - elements = left_inactive_width; - while ( elements -- ) - { - *out_ptr ++ = 16; - *out_ptr ++ = 128; - } - // We're in the input range for this row. - 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 = right_inactive_width; - while ( elements -- ) - { - *out_ptr ++ = 16; - *out_ptr ++ = 128; - } + memcpy( out_line, in_line, iwidth * 2 ); - // Move to next input line - in_line += istride; + // Move to next input line + in_line += istride; - // Move to next output line - out_line += ostride; + // Move to next output line + out_line += ostride; } - - // Fill whole section with black - elements = blank_elements; - while ( elements -- ) - { - *out_line ++ = 16; - *out_line ++ = 128; - } } /** A resizing function for yuv422 frames - this does not rescale, but simply @@ -849,6 +741,8 @@ uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight ) // If width and height are correct, don't do anything if ( iwidth != owidth || iheight != oheight ) { + uint8_t alpha_value = mlt_properties_get_int( properties, "resize_alpha" ); + // Create the output image uint8_t *output = mlt_pool_alloc( owidth * ( oheight + 1 ) * 2 ); @@ -861,10 +755,10 @@ uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight ) mlt_properties_set_int( properties, "height", oheight ); // We should resize the alpha too - alpha = mlt_resize_alpha( alpha, owidth, oheight, iwidth, iheight ); + alpha = mlt_resize_alpha( alpha, owidth, oheight, iwidth, iheight, alpha_value ); if ( alpha != NULL ) { - mlt_properties_set_data( properties, "alpha", alpha, owidth * ( oheight + 1 ), ( mlt_destructor )mlt_pool_release, NULL ); + mlt_properties_set_data( properties, "alpha", alpha, owidth * oheight, ( mlt_destructor )mlt_pool_release, NULL ); this->get_alpha_mask = NULL; }