X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=880cdef4395fa3b61bb9f52daea727ecb209320f;hb=0bd5d91026b8bd143f957f119d61d5fedd45cf70;hp=ba59ad9609cf21fedd0273cd51a8ae0e86474203;hpb=d0a840da47c2c35959641c26d74b1498df0ed6be;p=melted diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c index ba59ad9..880cdef 100644 --- a/src/framework/mlt_frame.c +++ b/src/framework/mlt_frame.c @@ -53,7 +53,7 @@ mlt_frame mlt_frame_init( ) mlt_properties_init( properties, this ); // Set default properties on the frame - mlt_properties_set_timecode( properties, "timecode", 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 +77,15 @@ mlt_properties mlt_frame_properties( mlt_frame this ) int mlt_frame_is_test_card( mlt_frame this ) { - return this->stack_get_image_size == 0; + return ( this->stack_get_image_size == 0 && mlt_properties_get_data( mlt_frame_properties( this ), "image", NULL ) == NULL ); +} + +/** Check if we have a way to derive something than test audio. +*/ + +int mlt_frame_is_test_audio( mlt_frame this ) +{ + return this->get_audio == NULL; } /** Get the aspect ratio of the frame. @@ -85,8 +93,7 @@ int mlt_frame_is_test_card( mlt_frame this ) double mlt_frame_get_aspect_ratio( mlt_frame this ) { - mlt_properties properties = mlt_frame_properties( this ); - return mlt_properties_get_double( properties, "aspect_ratio" ); + return mlt_properties_get_double( mlt_frame_properties( this ), "aspect_ratio" ); } /** Set the aspect ratio of the frame. @@ -94,26 +101,23 @@ double mlt_frame_get_aspect_ratio( mlt_frame this ) int mlt_frame_set_aspect_ratio( mlt_frame this, double value ) { - mlt_properties properties = mlt_frame_properties( this ); - return mlt_properties_set_double( properties, "aspect_ratio", value ); + return mlt_properties_set_double( mlt_frame_properties( this ), "aspect_ratio", value ); } -/** Get the timecode of this frame. +/** Get the position of this frame. */ -mlt_timecode mlt_frame_get_timecode( mlt_frame this ) +mlt_position mlt_frame_get_position( mlt_frame this ) { - mlt_properties properties = mlt_frame_properties( this ); - return mlt_properties_get_timecode( properties, "timecode" ); + return mlt_properties_get_position( mlt_frame_properties( this ), "position" ); } -/** Set the timecode of this frame. +/** Set the position of this frame. */ -int mlt_frame_set_timecode( mlt_frame this, mlt_timecode value ) +int mlt_frame_set_position( mlt_frame this, mlt_position value ) { - mlt_properties properties = mlt_frame_properties( this ); - return mlt_properties_set_timecode( properties, "timecode", value ); + return mlt_properties_set_position( mlt_frame_properties( this ), "position", value ); } /** Stack a get_image callback. @@ -245,7 +249,7 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for *channels = 2; if ( *frequency <= 0 ) *frequency = 48000; - if ( test_card.afmt != *format ) + 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 ) ); @@ -259,16 +263,7 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for void mlt_frame_close( mlt_frame this ) { - mlt_frame frame = mlt_frame_pop_frame( this ); - - while ( frame != NULL ) - { - mlt_frame_close( frame); - frame = mlt_frame_pop_frame( this ); - } - mlt_properties_close( &this->parent ); - free( this ); } @@ -397,9 +392,9 @@ int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float weight ) { int ret = 0; - int width_src, height_src; - int width_dest, height_dest; - mlt_image_format format_src, format_dest; + 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; @@ -416,7 +411,7 @@ int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float //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, 1 /* writable */ ); + 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); @@ -461,22 +456,32 @@ int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float 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++ ) { - uint8_t *p = p_src; - uint8_t *q = p_dest; - uint8_t *o = p_dest; - uint8_t *z = p_alpha; + p = p_src; + q = p_dest; + o = p_dest; + z = p_alpha; for ( j = 0; j < width_src; j ++ ) { - 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 ) ); + 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; @@ -491,8 +496,23 @@ int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float 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; + if ( l == 2 ) + { + uint8_t *p = dst; + uint8_t *src1 = src; + uint8_t *src2 = src + 1; + for ( i = 0; i < elements; i ++ ) + { + *p ++ = *src1; + *p ++ = *src2; + } + dst = p; + } + else + { + for ( i = 0; i < elements; i ++ ) + dst = memcpy( dst, src, l ) + l; + } return dst; } @@ -642,14 +662,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; @@ -661,22 +681,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 >> 1 ) * 4 + 2 * ( x & 1 ); - *out_ptr ++ = *in_ptr ++; - *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 @@ -701,17 +712,20 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t * int ret = 0; int16_t *p_src, *p_dest; int16_t *src, *dest; - static int16_t *extra_src = NULL, *extra_dest = NULL; + //static int16_t *extra_src = NULL, *extra_dest = NULL; static int extra_src_samples = 0, extra_dest_samples = 0; - int frequency_src = 0, frequency_dest = 0; - int channels_src = 0, channels_dest = 0; - int samples_src = 0, samples_dest = 0; + int frequency_src = *channels, frequency_dest = *channels; + 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 timecode %f\n", samples_dest, channels_dest, mlt_properties_get_timecode( mlt_frame_properties( this ), "timecode" ) ); + //fprintf( stderr, "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 ); + src = p_src; + dest = p_dest; if ( channels_src > 6 ) channels_src = 0; if ( channels_dest > 6 ) @@ -739,9 +753,6 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t * } else src = p_src; -#else - src = p_src; - dest = p_dest; #endif // determine number of samples to process @@ -758,8 +769,10 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t * { for ( j = 0; j < *channels; j++ ) { - double d = (double) dest[ i * channels_dest + j ]; - double s = (double) src[ i * channels_src + j ]; + if ( j < channels_dest ) + d = (double) dest[ i * channels_dest + j ]; + if ( j < channels_src ) + s = (double) src[ i * channels_src + j ]; dest[ i * channels_dest + j ] = s * weight + d * ( 1.0 - weight ); } }