Thread: [Mlt-devel] mlt/src/framework mlt_frame.c,1.87,1.88 mlt_frame.h,1.26,1.27 mlt_producer.c,1.61,1.62
Brought to you by:
ddennedy,
lilo_booter
From: Charles Y. <lil...@us...> - 2005-09-15 20:34:55
|
Update of /cvsroot/mlt/mlt/src/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8356/src/framework Modified Files: mlt_frame.c mlt_frame.h mlt_producer.c Log Message: src/framework/mlt_frame.c + Removed unecessary even pixel position and width dependency + Rewrote resize methods to accomodate uneven widths src/framework/mlt_frame.h + Correct RGB2YUV - now 2^10 based and range checks removed (not needed) src/framework/mlt_producer.c + Check for unspecified eof property src/modules/avformat/producer_avformat.c + Provide forced aspect ratio property src/modules/core/filter_mirror.c + Correction for uneven width src/modules/core/producer_colour.c + Corrections for aspect ratio (default to 0) and allow override + Corrections for uneven width src/modules/core/transition_composite.c + Corrections for uneven pixel position and width + Removed deprecated operator code src/modules/plus/filter_sepia.c + Corrections for uneven width src/modules/plus/transition_affine.c + Corrections for uneven width src/modules/sdl/consumer_sdl.c + Corrections for uneven width Index: mlt_frame.h =================================================================== RCS file: /cvsroot/mlt/mlt/src/framework/mlt_frame.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- mlt_frame.h 7 Sep 2005 09:23:36 -0000 1.26 +++ mlt_frame.h 15 Sep 2005 20:34:47 -0000 1.27 @@ -86,15 +86,9 @@ /* 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 + y = ((263*r + 516*g + 100*b) >> 10) + 16;\ + u = ((-152*r - 298*g + 450*b) >> 10) + 128;\ + v = ((450*r - 377*g - 73*b) >> 10) + 128; /* this macro assumes the user has already scaled their rgb down into the broadcast limits */ #define RGB2YUV_UNSCALED(r, g, b, y, u, v)\ Index: mlt_frame.c =================================================================== RCS file: /cvsroot/mlt/mlt/src/framework/mlt_frame.c,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- mlt_frame.c 7 Sep 2005 09:23:36 -0000 1.87 +++ mlt_frame.c 15 Sep 2005 20:34:47 -0000 1.88 @@ -263,8 +263,6 @@ 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 ); @@ -645,75 +643,27 @@ if ( input != NULL && ( iwidth != owidth || iheight != oheight ) && ( owidth > 6 && oheight > 6 ) ) { - iwidth = iwidth - ( iwidth % 2 ); - owidth = owidth - ( owidth % 2 ); + uint8_t *in_line = input; + uint8_t *out_line; output = mlt_pool_alloc( owidth * oheight ); + memset( output, 0, 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; - - // 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 + ( ( oheight - iheight ) / 2 ) * owidth; + out_line += 2 * ( int )( ( owidth - iwidth ) / 2 ); // 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 ++; + memcpy( out_line, input, iwidth ); - // Fill the outer part with black - elements = inactive_width; - while ( elements -- ) - *out_ptr ++ = 0; - // Move to next input line in_line += iwidth; // Move to next output line out_line += owidth; } - - // Fill whole section with black - elements = blank_elements; - while ( elements -- ) - *out_line ++ = 0; } return output; @@ -725,11 +675,6 @@ int istride = iwidth * 2; int ostride = owidth * 2; - 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 +686,33 @@ 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 -- ) - { - *out_line ++ = 16; - *out_line ++ = 128; - } + uint8_t *in_line = input; + uint8_t *out_line; - 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; + int size = owidth * oheight; + uint8_t *p = output; - if ( in_line % 4 ) + while( size -- ) { - active_width -= 2; - in_middle += 2; - right_inactive_width += 2; + *p ++ = 16; + *p ++ = 128; } + out_line = output + ( ( oheight - iheight ) / 2 ) * ostride; + out_line += 4 * ( int )( ( owidth - iwidth ) / 4 ); + // 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, istride ); - // 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 Index: mlt_producer.c =================================================================== RCS file: /cvsroot/mlt/mlt/src/framework/mlt_producer.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- mlt_producer.c 15 Aug 2005 06:25:37 -0000 1.61 +++ mlt_producer.c 15 Sep 2005 20:34:47 -0000 1.62 @@ -253,7 +253,7 @@ { position = 0; } - else if ( use_points && !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) ) + else if ( use_points && ( eof == NULL || !strcmp( eof, "pause" ) ) && position >= mlt_producer_get_playtime( this ) ) { mlt_producer_set_speed( this, 0 ); position = mlt_producer_get_playtime( this ) - 1; |