X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2Fsrc%2Fframework%2Fmlt_frame.c;h=5a5701a007f68053853ad6dc1e8572f6c2ae40dc;hb=8bf137cd71aafb9c8f6a42c78ddb6bd0a8fe99db;hp=5eacb943030aa08a54ce7d389d54a99cd61d8063;hpb=cff2882f9c05cba4fe8ee8dfa6b8c14d80cfedf1;p=melted diff --git a/mlt/src/framework/mlt_frame.c b/mlt/src/framework/mlt_frame.c index 5eacb94..5a5701a 100644 --- a/mlt/src/framework/mlt_frame.c +++ b/mlt/src/framework/mlt_frame.c @@ -184,8 +184,8 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for uint8_t *q; test_card.vfmt = *format; - test_card.width = 720; - test_card.height = 576; + test_card.width = *width == 0 ? 720 : *width; + test_card.height = *height == 0 ? 576 : *height; switch( *format ) { @@ -362,18 +362,50 @@ int mlt_convert_rgb24_to_yuv422( uint8_t *rgb, int width, int height, int stride return ret; } +int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int stride, uint8_t *yuv ) +{ + int ret = 0; + register int i, j; + + int half = width >> 1; + + uint8_t *Y = yuv420p; + uint8_t *U = Y + width * height; + uint8_t *V = U + width * height / 4; + + register uint8_t *d = yuv; + + for ( i = 0; i < height; i++ ) + { + register uint8_t *u = U + ( i / 2 ) * ( half ); + register uint8_t *v = V + ( i / 2 ) * ( half ); + + for ( j = 0; j < half; j++ ) + { + *d ++ = *Y ++; + *d ++ = *u ++; + *d ++ = *Y ++; + *d ++ = *v ++; + } + } + return ret; +} + int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float weight ) { int ret = 0; - int x_start = 0; int width_src, height_src; int width_dest, height_dest; mlt_image_format format_src, format_dest; uint8_t *p_src, *p_dest; - int x_end; 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; @@ -381,57 +413,143 @@ int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float mlt_frame_get_image( this, &p_dest, &format_dest, &width_dest, &height_dest, 1 /* writable */ ); mlt_frame_get_image( that, &p_src, &format_src, &width_src, &height_src, 0 /* writable */ ); - x_end = width_src; - stride_src = width_src * 2; stride_dest = width_dest * 2; - uint8_t *lower = p_dest; - uint8_t *upper = p_dest + height_dest * stride_dest; - - p_dest += ( y * stride_dest ) + ( x * 2 ); - + + // crop overlay off the left edge of frame if ( x < 0 ) { - x_start = -x; - x_end += x_start; + 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 ); - uint8_t *z = 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; + // now do the compositing only to cropped extents for ( i = 0; i < height_src; i++ ) { uint8_t *p = p_src; uint8_t *q = p_dest; uint8_t *o = p_dest; + uint8_t *z = p_alpha; for ( j = 0; j < width_src; j ++ ) { - if ( q >= lower && q < upper && j >= x_start && j < x_end ) - { uint8_t y = *p ++; uint8_t uv = *p ++; uint8_t a = ( z == NULL ) ? 255 : *z ++; float value = ( weight * ( float ) a / 255.0 ); *o ++ = (uint8_t)( y * value + *q++ * ( 1 - value ) ); *o ++ = (uint8_t)( uv * value + *q++ * ( 1 - value ) ); - } - else - { - p += 2; - o += 2; - q += 2; - if ( z != NULL ) - z += 1; - } } 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; + for ( i = 0; i < elements; i ++ ) + dst = memcpy( dst, src, l ) + l; + return dst; +} + +void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input, int iwidth, int iheight ) +{ + // Calculate strides + int istride = iwidth * 2; + int ostride = owidth * 2; + + iwidth = iwidth - ( iwidth % 4 ); + owidth = owidth - ( owidth % 4 ); + iheight = iheight - ( iheight % 2 ); + oheight = oheight - ( oheight % 2 ); + + // 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 / 2 ) * 2; + int in_line = - in_y_range * istride - in_x_range * 2; + + uint8_t black[ 2 ] = { 16, 128 }; + + // Loop for the entirety of our output height. + for ( y = - out_y_range; y < out_y_range ; y ++ ) + { + // Start at the beginning of the line + out_ptr = out_line; + + if ( abs( y ) < iheight / 2 ) + { + // Fill the outer part with black + out_ptr = memfill( out_ptr, black, 2, out_x_range - in_x_range ); + + // We're in the input range for this row. + memcpy( out_ptr, in_middle + in_line, 2 * iwidth ); + out_ptr += 2 * iwidth; + + // Fill the outer part with black + out_ptr = memfill( out_ptr, black, 2, out_x_range - in_x_range ); + + // Move to next input line + in_line += istride; + } + else + { + // Fill whole line with black + out_ptr = memfill( out_ptr, black, 2, owidth ); + } + + // Move to next output line + out_line += ostride; + } +} + /** A resizing function for yuv422 frames - this does not rescale, but simply resizes. It assumes yuv422 images available on the frame so use with care. */ @@ -452,62 +570,8 @@ uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight ) // Create the output image uint8_t *output = malloc( owidth * oheight * 2 ); - // Calculate strides - int istride = iwidth * 2; - int ostride = owidth * 2; - - // Coordinates (0,0 is middle of output) - int y, x; - - // Calculate ranges - int out_x_range = owidth / 2; - int out_y_range = oheight / 2; - int in_x_range = iwidth / 2; - int in_y_range = iheight / 2; - - // Output pointers - uint8_t *out_line = output; - uint8_t *out_ptr; - - // Calculate a middle and possibly invalid pointer in the input - uint8_t *in_middle = input + istride * in_y_range + in_x_range * 2; - int in_line = - out_y_range * istride - out_x_range * 2; - int in_ptr; - - // Loop for the entirety of our output height. - for ( y = - out_y_range; y < out_y_range ; y ++ ) - { - // Start at the beginning of the line - out_ptr = out_line; - - // Point the start of the current input line (NB: can be out of range) - in_ptr = in_line; - - // Loop for the entirety of our output row. - for ( x = - out_x_range; x < out_x_range; x ++ ) - { - // Check if x and y are in the valid input range. - if ( abs( x ) < in_x_range && abs( y ) < in_y_range ) - { - // We're in the input range for this row. - *out_ptr ++ = *( in_middle + in_ptr ++ ); - *out_ptr ++ = *( in_middle + in_ptr ++ ); - } - else - { - // We're not in the input range for this row. - *out_ptr ++ = 16; - *out_ptr ++ = 128; - in_ptr += 2; - } - } - - // Move to next output line - out_line += ostride; - - // Move to next input line - in_line += istride; - } + // Call the generic resize + mlt_resize_yuv422( output, owidth, oheight, input, iwidth, iheight ); // Now update the frame mlt_properties_set_data( properties, "image", output, owidth * oheight * 2, free, NULL ); @@ -546,6 +610,8 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) int istride = iwidth * 2; int ostride = owidth * 2; + iwidth = iwidth - ( iwidth % 4 ); + // Coordinates (0,0 is middle of output) int y, x; @@ -584,7 +650,7 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) in_line = in_middle + dy * istride; // Loop for the entirety of our output row. - for ( x = - out_x_range; x < out_x_range; x += 2 ) + for ( x = - out_x_range; x < out_x_range; x += 1 ) { // Calculated the derived x dx = scale_width * x; @@ -593,9 +659,7 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) 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 >> 1 ) * 4; - *out_ptr ++ = *in_ptr ++; - *out_ptr ++ = *in_ptr ++; + in_ptr = in_line + ( dx >> 1 ) * 4 + 2 * ( x & 1 ); *out_ptr ++ = *in_ptr ++; *out_ptr ++ = *in_ptr ++; } @@ -604,8 +668,6 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) // We're not in the input range for this row. *out_ptr ++ = 16; *out_ptr ++ = 128; - *out_ptr ++ = 16; - *out_ptr ++ = 128; } } @@ -626,3 +688,78 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) return input; } +int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples ) +{ + int ret = 0; + int16_t *p_src, *p_dest; + int frequency_src, frequency_dest; + int channels_src, channels_dest; + int samples_src, samples_dest; + int i, j; + + mlt_frame_get_audio( this, &p_dest, format, &frequency_dest, &channels_dest, &samples_dest ); + mlt_frame_get_audio( that, &p_src, format, &frequency_src, &channels_src, &samples_src ); + + *samples = samples_src < samples_dest ? samples_src : samples_dest; + *channels = channels_src < channels_dest ? channels_src : channels_dest; + *buffer = p_dest; + + for ( i = 0; i < *samples; i++ ) + { + for ( j = 0; j < *channels; j++ ) + { + double dest = (double) p_dest[ i * channels_dest + j ]; + double src = (double) p_src[ i * channels_src + j ]; + p_dest[ i * channels_dest + j ] = src * weight + dest * ( 1.0 - weight ); + } + } + + return ret; +} + +int mlt_sample_calculator( float fps, int frequency, int64_t position ) +{ + int samples = 0; + + if ( fps > 29 && fps <= 30 ) + { + samples = frequency / 30; + + switch ( frequency ) + { + case 48000: + if ( position % 5 != 0 ) + samples += 2; + break; + case 44100: + if ( position % 300 == 0 ) + samples = 1471; + else if ( position % 30 == 0 ) + samples = 1470; + else if ( position % 2 == 0 ) + samples = 1472; + else + samples = 1471; + break; + case 32000: + if ( position % 30 == 0 ) + samples = 1068; + else if ( position % 29 == 0 ) + samples = 1067; + else if ( position % 4 == 2 ) + samples = 1067; + else + samples = 1068; + break; + default: + samples = 0; + } + } + else if ( fps != 0 ) + { + samples = frequency / fps; + } + + return samples; +} +