X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=0899b06505cb292cc64da90b935129695504c3af;hb=f4963a6aa07644399b273b5d2b1f9299c9047414;hp=2c67e761bab89cb801c7af8b223a14db292f9639;hpb=1f6faabf5ef11e6321d186772d88fb6958cdd057;p=melted diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c index 2c67e76..0899b06 100644 --- a/src/framework/mlt_frame.c +++ b/src/framework/mlt_frame.c @@ -1,43 +1,47 @@ -/* - * mlt_frame.c -- interface for all frame classes - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited - * Author: Charles Yates +/** + * \file mlt_frame.c + * \brief interface for all frame classes + * \see mlt_frame_s * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * Copyright (C) 2003-2009 Ushodaya Enterprises Limited + * \author Charles Yates * - * This program is distributed in the hope that it will be useful, + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" #include "mlt_frame.h" #include "mlt_producer.h" #include "mlt_factory.h" +#include "mlt_profile.h" + #include #include #include +#include /** Constructor for a frame. */ -mlt_frame mlt_frame_init( ) +mlt_frame mlt_frame_init( mlt_service service ) { // Allocate a frame mlt_frame this = calloc( sizeof( struct mlt_frame_s ), 1 ); if ( this != NULL ) { - // Get the normalisation - char *normalisation = mlt_environment( "MLT_NORMALISATION" ); + mlt_profile profile = mlt_service_profile( service ); // Initialise the properties mlt_properties properties = &this->parent; @@ -46,24 +50,11 @@ mlt_frame mlt_frame_init( ) // Set default properties on the frame mlt_properties_set_position( properties, "_position", 0.0 ); mlt_properties_set_data( properties, "image", NULL, 0, NULL, NULL ); - - if ( normalisation == NULL || strcmp( normalisation, "NTSC" ) ) - { - mlt_properties_set_int( properties, "width", 720 ); - 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", 59.0/54.0 ); - } - else - { - mlt_properties_set_int( properties, "width", 720 ); - 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", 10.0/11.0 ); - } - + mlt_properties_set_int( properties, "width", profile? profile->width : 720 ); + mlt_properties_set_int( properties, "height", profile? profile->height : 576 ); + mlt_properties_set_int( properties, "normalised_width", profile? profile->width : 720 ); + mlt_properties_set_int( properties, "normalised_height", profile? profile->height : 576 ); + mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( NULL ) ); mlt_properties_set_data( properties, "audio", NULL, 0, NULL, NULL ); mlt_properties_set_data( properties, "alpha", NULL, 0, NULL, NULL ); @@ -228,12 +219,12 @@ mlt_deque mlt_frame_service_stack( mlt_frame this ) of a composite where the b frame completely obscures the a frame). The image must be writable and the destructor for the image itself must be taken - care of on another frame and that frame cannot have a replace applied to it... + care of on another frame and that frame cannot have a replace applied to it... Further it assumes that no alpha mask is in use. - For these reasons, it can only be used in a specific situation - when you have + For these reasons, it can only be used in a specific situation - when you have multiple tracks each with their own transition and these transitions are applied - in a strictly reversed order (ie: highest numbered [lowest track] is processed + in a strictly reversed order (ie: highest numbered [lowest track] is processed first). More reliable approach - the cases should be detected during the process phase @@ -245,7 +236,7 @@ void mlt_frame_replace_image( mlt_frame this, uint8_t *image, mlt_image_format f // Remove all items from the stack while( mlt_deque_pop_back( this->stack_image ) ) ; - // Update the information + // Update the information mlt_properties_set_data( MLT_FRAME_PROPERTIES( this ), "image", image, 0, NULL, NULL ); mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "width", width ); mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "height", height ); @@ -263,17 +254,19 @@ 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 ); mlt_position position = mlt_frame_get_position( this ); error = get_image( this, buffer, format, width, height, writable ); + mlt_properties_set_int( properties, "width", *width ); + mlt_properties_set_int( properties, "height", *height ); + mlt_properties_set_int( properties, "format", *format ); mlt_frame_set_position( this, position ); } else if ( mlt_properties_get_data( properties, "image", NULL ) != NULL ) { - *format = mlt_image_yuv422; + *format = mlt_properties_get_int( properties, "format" ); *buffer = mlt_properties_get_data( properties, "image", NULL ); *width = mlt_properties_get_int( properties, "width" ); *height = mlt_properties_get_int( properties, "height" ); @@ -292,6 +285,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, NULL, NULL ); mlt_properties_set_int( properties, "width", *width ); mlt_properties_set_int( properties, "height", *height ); + mlt_properties_set_int( properties, "format", *format ); mlt_properties_set_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( test_frame ) ); } else @@ -310,6 +304,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for *height = *height == 0 ? 576 : *height; size = *width * *height; + mlt_properties_set_int( properties, "format", *format ); mlt_properties_set_int( properties, "width", *width ); mlt_properties_set_int( properties, "height", *height ); mlt_properties_set_int( properties, "aspect_ratio", 0 ); @@ -328,6 +323,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for memset( *buffer, 255, size ); break; case mlt_image_rgb24a: + case mlt_image_opengl: size *= 4; size += *width * 4; *buffer = mlt_pool_alloc( size ); @@ -424,10 +420,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 ) { @@ -438,8 +434,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; @@ -452,24 +449,24 @@ unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h ) mlt_audio_format format = mlt_audio_pcm; int frequency = 32000; // lower frequency available? int channels = 2; - double fps = mlt_properties_get_double( properties, "fps" ); + double fps = mlt_profile_fps( NULL ); int samples = mlt_sample_calculator( fps, frequency, mlt_frame_get_position( this ) ); - + // Get the pcm data mlt_frame_get_audio( this, &pcm, &format, &frequency, &channels, &samples ); - + // Make an 8-bit buffer large enough to hold rendering int size = w * h; unsigned char *bitmap = ( unsigned char* )mlt_pool_alloc( size ); if ( bitmap != NULL ) memset( bitmap, 0, size ); mlt_properties_set_data( properties, "waveform", bitmap, size, ( mlt_destructor )mlt_pool_release, NULL ); - + // Render vertical lines int16_t *ubound = pcm + samples * channels; int skip = samples / w - 1; int i, j, k; - + // Iterate sample stream and along x coordinate for ( i = 0; i < w && pcm < ubound; i++ ) { @@ -478,7 +475,7 @@ unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h ) { // Determine sample's magnitude from 2s complement; int pcm_magnitude = *pcm < 0 ? ~(*pcm) + 1 : *pcm; - // The height of a line is the ratio of the magnitude multiplied by + // The height of a line is the ratio of the magnitude multiplied by // half the vertical resolution int height = ( int )( ( double )( pcm_magnitude ) / 32768 * h / 2 ); // Determine the starting y coordinate - left channel above center, @@ -486,11 +483,11 @@ unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h ) int displacement = ( h / 2 ) - ( 1 - j ) * height; // Position buffer pointer using y coordinate, stride, and x coordinate unsigned char *p = &bitmap[ i + displacement * w ]; - + // Draw vertical line for ( k = 0; k < height; k++ ) p[ w * k ] = 0xFF; - + pcm++; } pcm += skip * channels; @@ -522,6 +519,34 @@ void mlt_frame_close( mlt_frame this ) /***** convenience functions *****/ +int mlt_convert_yuv422_to_rgb24a( uint8_t *yuv, uint8_t *rgba, unsigned int total ) +{ + int ret = 0; + int yy, uu, vv; + int r,g,b; + total /= 2; + while (total--) + { + yy = yuv[0]; + uu = yuv[1]; + vv = yuv[3]; + YUV2RGB(yy, uu, vv, r, g, b); + rgba[0] = r; + rgba[1] = g; + rgba[2] = b; + rgba[3] = 255; + yy = yuv[2]; + YUV2RGB(yy, uu, vv, r, g, b); + rgba[4] = r; + rgba[5] = g; + rgba[6] = b; + rgba[7] = 255; + yuv += 4; + rgba += 8; + } + return ret; +} + int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha ) { int ret = 0; @@ -530,6 +555,7 @@ int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stri register uint8_t *d = yuv; register int i, j; + if ( alpha ) for ( i = 0; i < height; i++ ) { register uint8_t *s = rgba + ( stride * i ); @@ -561,6 +587,39 @@ int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stri *d++ = u0; } } + else + for ( i = 0; i < height; i++ ) + { + register uint8_t *s = rgba + ( stride * i ); + for ( j = 0; j < ( width / 2 ); j++ ) + { + r = *s++; + g = *s++; + b = *s++; + s++; + RGB2YUV (r, g, b, y0, u0 , v0); + r = *s++; + g = *s++; + b = *s++; + s++; + RGB2YUV (r, g, b, y1, u1 , v1); + *d++ = y0; + *d++ = (u0+u1) >> 1; + *d++ = y1; + *d++ = (v0+v1) >> 1; + } + if ( width % 2 ) + { + r = *s++; + g = *s++; + b = *s++; + s++; + RGB2YUV (r, g, b, y0, u0 , v0); + *d++ = y0; + *d++ = u0; + } + } + return ret; } @@ -603,6 +662,195 @@ int mlt_convert_rgb24_to_yuv422( uint8_t *rgb, int width, int height, int stride return ret; } +int mlt_convert_bgr24a_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha ) +{ + int ret = 0; + register int y0, y1, u0, u1, v0, v1; + register int r, g, b; + register uint8_t *d = yuv; + register int i, j; + + if ( alpha ) + for ( i = 0; i < height; i++ ) + { + register uint8_t *s = rgba + ( stride * i ); + for ( j = 0; j < ( width / 2 ); j++ ) + { + b = *s++; + g = *s++; + r = *s++; + *alpha++ = *s++; + RGB2YUV (r, g, b, y0, u0 , v0); + b = *s++; + g = *s++; + r = *s++; + *alpha++ = *s++; + RGB2YUV (r, g, b, y1, u1 , v1); + *d++ = y0; + *d++ = (u0+u1) >> 1; + *d++ = y1; + *d++ = (v0+v1) >> 1; + } + if ( width % 2 ) + { + b = *s++; + g = *s++; + r = *s++; + *alpha++ = *s++; + RGB2YUV (r, g, b, y0, u0 , v0); + *d++ = y0; + *d++ = u0; + } + } + else + for ( i = 0; i < height; i++ ) + { + register uint8_t *s = rgba + ( stride * i ); + for ( j = 0; j < ( width / 2 ); j++ ) + { + b = *s++; + g = *s++; + r = *s++; + s++; + RGB2YUV (r, g, b, y0, u0 , v0); + b = *s++; + g = *s++; + r = *s++; + s++; + RGB2YUV (r, g, b, y1, u1 , v1); + *d++ = y0; + *d++ = (u0+u1) >> 1; + *d++ = y1; + *d++ = (v0+v1) >> 1; + } + if ( width % 2 ) + { + b = *s++; + g = *s++; + r = *s++; + s++; + RGB2YUV (r, g, b, y0, u0 , v0); + *d++ = y0; + *d++ = u0; + } + } + return ret; +} + +int mlt_convert_bgr24_to_yuv422( uint8_t *rgb, int width, int height, int stride, uint8_t *yuv ) +{ + int ret = 0; + register int y0, y1, u0, u1, v0, v1; + register int r, g, b; + register uint8_t *d = yuv; + register int i, j; + + for ( i = 0; i < height; i++ ) + { + register uint8_t *s = rgb + ( stride * i ); + for ( j = 0; j < ( width / 2 ); j++ ) + { + b = *s++; + g = *s++; + r = *s++; + RGB2YUV (r, g, b, y0, u0 , v0); + b = *s++; + g = *s++; + r = *s++; + RGB2YUV (r, g, b, y1, u1 , v1); + *d++ = y0; + *d++ = (u0+u1) >> 1; + *d++ = y1; + *d++ = (v0+v1) >> 1; + } + if ( width % 2 ) + { + b = *s++; + g = *s++; + r = *s++; + RGB2YUV (r, g, b, y0, u0 , v0); + *d++ = y0; + *d++ = u0; + } + } + return ret; +} + +int mlt_convert_argb_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha ) +{ + int ret = 0; + register int y0, y1, u0, u1, v0, v1; + register int r, g, b; + register uint8_t *d = yuv; + register int i, j; + + if ( alpha ) + for ( i = 0; i < height; i++ ) + { + register uint8_t *s = rgba + ( stride * i ); + for ( j = 0; j < ( width / 2 ); j++ ) + { + *alpha++ = *s++; + r = *s++; + g = *s++; + b = *s++; + RGB2YUV (r, g, b, y0, u0 , v0); + *alpha++ = *s++; + r = *s++; + g = *s++; + b = *s++; + RGB2YUV (r, g, b, y1, u1 , v1); + *d++ = y0; + *d++ = (u0+u1) >> 1; + *d++ = y1; + *d++ = (v0+v1) >> 1; + } + if ( width % 2 ) + { + *alpha++ = *s++; + r = *s++; + g = *s++; + b = *s++; + RGB2YUV (r, g, b, y0, u0 , v0); + *d++ = y0; + *d++ = u0; + } + } + else + for ( i = 0; i < height; i++ ) + { + register uint8_t *s = rgba + ( stride * i ); + for ( j = 0; j < ( width / 2 ); j++ ) + { + s++; + r = *s++; + g = *s++; + b = *s++; + RGB2YUV (r, g, b, y0, u0 , v0); + s++; + r = *s++; + g = *s++; + b = *s++; + RGB2YUV (r, g, b, y1, u1 , v1); + *d++ = y0; + *d++ = (u0+u1) >> 1; + *d++ = y1; + *d++ = (v0+v1) >> 1; + } + if ( width % 2 ) + { + s++; + r = *s++; + g = *s++; + b = *s++; + RGB2YUV (r, g, b, y0, u0 , v0); + *d++ = y0; + *d++ = u0; + } + } + return ret; +} + int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int stride, uint8_t *yuv ) { int ret = 0; @@ -632,81 +880,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; - - // 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; + offset_x -= offset_x % 2; - // 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; @@ -717,12 +921,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 ) ) { @@ -734,93 +939,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 @@ -842,6 +983,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 ); @@ -854,10 +997,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; } @@ -924,7 +1067,7 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) { // Start at the beginning of the line out_ptr = out_line; - + // Pointer to the middle of the input line in_line = in_middle + ( dy >> 16 ) * istride; @@ -1003,6 +1146,15 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, flo float weight = weight_start; float weight_step = ( weight_end - weight_start ) / *samples; + if ( src == dest ) + { + *samples = samples_src; + *channels = channels_src; + *buffer = src; + *frequency = frequency_src; + return ret; + } + // Mixdown for ( i = 0; i < *samples; i++ ) { @@ -1020,6 +1172,72 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, flo return ret; } +// Replacement for broken mlt_frame_audio_mix - this filter uses an inline low pass filter +// to allow mixing without volume hacking +int mlt_frame_combine_audio( mlt_frame this, mlt_frame that, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples ) +{ + int ret = 0; + int16_t *src, *dest; + 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 vp[ 6 ]; + double b_weight = 1.0; + + if ( mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "meta.mixdown" ) ) + b_weight = 1.0 - mlt_properties_get_double( MLT_FRAME_PROPERTIES( this ), "meta.volume" ); + + mlt_frame_get_audio( that, &src, format, &frequency_src, &channels_src, &samples_src ); + mlt_frame_get_audio( this, &dest, format, &frequency_dest, &channels_dest, &samples_dest ); + + int silent = mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "silent_audio" ); + mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "silent_audio", 0 ); + if ( silent ) + memset( dest, 0, samples_dest * channels_dest * sizeof( int16_t ) ); + + silent = mlt_properties_get_int( MLT_FRAME_PROPERTIES( that ), "silent_audio" ); + mlt_properties_set_int( MLT_FRAME_PROPERTIES( that ), "silent_audio", 0 ); + if ( silent ) + memset( src, 0, samples_src * channels_src * sizeof( int16_t ) ); + + if ( src == dest ) + { + *samples = samples_src; + *channels = channels_src; + *buffer = src; + *frequency = frequency_src; + return ret; + } + + // 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 = dest; + *frequency = frequency_dest; + + for ( j = 0; j < *channels; j++ ) + vp[ j ] = ( double )dest[ j ]; + + double Fc = 0.5; + double B = exp(-2.0 * M_PI * Fc); + double A = 1.0 - B; + double v; + + for ( i = 0; i < *samples; i++ ) + { + for ( j = 0; j < *channels; j++ ) + { + v = ( double )( b_weight * dest[ i * channels_dest + j ] + src[ i * channels_src + j ] ); + v = v < -32767 ? -32767 : v > 32768 ? 32768 : v; + vp[ j ] = dest[ i * channels_dest + j ] = ( int16_t )( v * A + vp[ j ] * B ); + } + } + + return ret; +} + +/* Will this break when mlt_position is converted to double? -Zach */ int mlt_sample_calculator( float fps, int frequency, int64_t position ) { int samples = 0; @@ -1065,3 +1283,32 @@ int mlt_sample_calculator( float fps, int frequency, int64_t position ) return samples; } + +int64_t mlt_sample_calculator_to_now( float fps, int frequency, int64_t frame ) +{ + int64_t samples = 0; + + // TODO: Correct rules for NTSC and drop the * 100 hack + if ( ( int )( fps * 100 ) == 2997 ) + { + samples = ( ( double )( frame * frequency ) / 30 ); + switch( frequency ) + { + case 48000: + samples += 2 * ( frame / 5 ); + break; + case 44100: + samples += frame + ( frame / 2 ) - ( frame / 30 ) + ( frame / 300 ); + break; + case 32000: + samples += ( 2 * frame ) - ( frame / 4 ) - ( frame / 29 ); + break; + } + } + else if ( fps != 0 ) + { + samples = ( ( frame * frequency ) / ( int )fps ); + } + + return samples; +}