X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=85114624ecf8b73dc8376159ba9aa7c9f6bbf528;hb=81aa68b148b760bd7e40db04071c294eb4f09d8d;hp=3b5c556b5521cf82a4ba372b16aa2fedf22990f8;hpb=6159bd78fa8e72c784747776a2c4c63d9c461ff5;p=mlt diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c index 3b5c556b..85114624 100644 --- a/src/framework/mlt_frame.c +++ b/src/framework/mlt_frame.c @@ -1,26 +1,32 @@ -/* - * 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 "mlt_log.h" + #include #include #include @@ -28,13 +34,15 @@ /** 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 ) { + mlt_profile profile = mlt_service_profile( service ); + // Initialise the properties mlt_properties properties = &this->parent; mlt_properties_init( properties, this ); @@ -42,12 +50,20 @@ 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 ); - mlt_properties_set_int( properties, "width", 720 ); - mlt_properties_set_int( properties, "height", 576 ); - mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.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 ); + + // Construct stacks for frames and methods + this->stack_image = mlt_deque_init( ); + this->stack_audio = mlt_deque_init( ); + this->stack_service = mlt_deque_init( ); } + return this; } @@ -56,7 +72,7 @@ mlt_frame mlt_frame_init( ) mlt_properties mlt_frame_properties( mlt_frame this ) { - return &this->parent; + return this != NULL ? &this->parent : NULL; } /** Check if we have a way to derive something other than a test card. @@ -64,15 +80,15 @@ mlt_properties mlt_frame_properties( mlt_frame this ) int mlt_frame_is_test_card( mlt_frame this ) { - return mlt_properties_get_int( mlt_frame_properties( this ), "test_image" ); + return mlt_deque_count( this->stack_image ) == 0 || mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "test_image" ); } -/** Check if we have a way to derive something than test audio. +/** Check if we have a way to derive something other than test audio. */ int mlt_frame_is_test_audio( mlt_frame this ) { - return this->get_audio == NULL || mlt_properties_get_int( mlt_frame_properties( this ), "test_audio" ); + return mlt_deque_count( this->stack_audio ) == 0 || mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "test_audio" ); } /** Get the aspect ratio of the frame. @@ -80,7 +96,7 @@ int mlt_frame_is_test_audio( mlt_frame this ) double mlt_frame_get_aspect_ratio( mlt_frame this ) { - return mlt_properties_get_double( mlt_frame_properties( this ), "aspect_ratio" ); + return mlt_properties_get_double( MLT_FRAME_PROPERTIES( this ), "aspect_ratio" ); } /** Set the aspect ratio of the frame. @@ -88,7 +104,7 @@ double mlt_frame_get_aspect_ratio( mlt_frame this ) int mlt_frame_set_aspect_ratio( mlt_frame this, double value ) { - return mlt_properties_set_double( mlt_frame_properties( this ), "aspect_ratio", value ); + return mlt_properties_set_double( MLT_FRAME_PROPERTIES( this ), "aspect_ratio", value ); } /** Get the position of this frame. @@ -96,7 +112,8 @@ int mlt_frame_set_aspect_ratio( mlt_frame this, double value ) mlt_position mlt_frame_get_position( mlt_frame this ) { - return mlt_properties_get_position( mlt_frame_properties( this ), "_position" ); + int pos = mlt_properties_get_position( MLT_FRAME_PROPERTIES( this ), "_position" ); + return pos < 0 ? 0 : pos; } /** Set the position of this frame. @@ -104,7 +121,7 @@ mlt_position mlt_frame_get_position( mlt_frame this ) int mlt_frame_set_position( mlt_frame this, mlt_position value ) { - return mlt_properties_set_position( mlt_frame_properties( this ), "_position", value ); + return mlt_properties_set_position( MLT_FRAME_PROPERTIES( this ), "_position", value ); } /** Stack a get_image callback. @@ -112,10 +129,7 @@ int mlt_frame_set_position( mlt_frame this, mlt_position value ) int mlt_frame_push_get_image( mlt_frame this, mlt_get_image get_image ) { - int ret = this->stack_get_image_size >= 10; - if ( ret == 0 ) - this->stack_get_image[ this->stack_get_image_size ++ ] = get_image; - return ret; + return mlt_deque_push_back( this->stack_image, get_image ); } /** Pop a get_image callback. @@ -123,10 +137,7 @@ int mlt_frame_push_get_image( mlt_frame this, mlt_get_image get_image ) mlt_get_image mlt_frame_pop_get_image( mlt_frame this ) { - mlt_get_image result = NULL; - if ( this->stack_get_image_size > 0 ) - result = this->stack_get_image[ -- this->stack_get_image_size ]; - return result; + return mlt_deque_pop_back( this->stack_image ); } /** Push a frame. @@ -134,10 +145,7 @@ mlt_get_image mlt_frame_pop_get_image( mlt_frame this ) int mlt_frame_push_frame( mlt_frame this, mlt_frame that ) { - int ret = this->stack_frame_size >= 10; - if ( ret == 0 ) - this->stack_frame[ this->stack_frame_size ++ ] = that; - return ret; + return mlt_deque_push_back( this->stack_image, that ); } /** Pop a frame. @@ -145,42 +153,159 @@ int mlt_frame_push_frame( mlt_frame this, mlt_frame that ) mlt_frame mlt_frame_pop_frame( mlt_frame this ) { - mlt_frame result = NULL; - if ( this->stack_frame_size > 0 ) - result = this->stack_frame[ -- this->stack_frame_size ]; - return result; + return mlt_deque_pop_back( this->stack_image ); +} + +/** Push a service. +*/ + +int mlt_frame_push_service( mlt_frame this, void *that ) +{ + return mlt_deque_push_back( this->stack_image, that ); +} + +/** Pop a service. +*/ + +void *mlt_frame_pop_service( mlt_frame this ) +{ + return mlt_deque_pop_back( this->stack_image ); +} + +/** Push a service. +*/ + +int mlt_frame_push_service_int( mlt_frame this, int that ) +{ + return mlt_deque_push_back_int( this->stack_image, that ); +} + +/** Pop a service. +*/ + +int mlt_frame_pop_service_int( mlt_frame this ) +{ + return mlt_deque_pop_back_int( this->stack_image ); +} + +/** Push an audio item on the stack. +*/ + +int mlt_frame_push_audio( mlt_frame this, void *that ) +{ + return mlt_deque_push_back( this->stack_audio, that ); +} + +/** Pop an audio item from the stack +*/ + +void *mlt_frame_pop_audio( mlt_frame this ) +{ + return mlt_deque_pop_back( this->stack_audio ); +} + +/** Return the service stack +*/ + +mlt_deque mlt_frame_service_stack( mlt_frame this ) +{ + return this->stack_service; +} + +/** Replace image stack with the information provided. + + This might prove to be unreliable and restrictive - the idea is that a transition + which normally uses two images may decide to only use the b frame (ie: in the case + 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... + 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 + multiple tracks each with their own transition and these transitions are applied + 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 + and the upper tracks should simply not be invited to stack... +*/ + +void mlt_frame_replace_image( mlt_frame this, uint8_t *image, mlt_image_format format, int width, int height ) +{ + // Remove all items from the stack + while( mlt_deque_pop_back( this->stack_image ) ) ; + + // 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 ); + mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "format", format ); + this->get_alpha_mask = NULL; +} + +const char * mlt_image_format_name( mlt_image_format format ) +{ + switch ( format ) + { + case mlt_image_none: return "none"; + case mlt_image_rgb24: return "rgb24"; + case mlt_image_rgb24a: return "rgb24a"; + case mlt_image_yuv422: return "yuv422"; + case mlt_image_yuv420p: return "yuv420p"; + case mlt_image_opengl: return "opengl"; + } + return "invalid"; } +/** Get the image associated to the frame. +*/ + int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable ) { - mlt_properties properties = mlt_frame_properties( this ); + mlt_properties properties = MLT_FRAME_PROPERTIES( this ); mlt_get_image get_image = mlt_frame_pop_get_image( this ); mlt_producer producer = mlt_properties_get_data( properties, "test_card_producer", NULL ); - - if ( get_image != NULL ) + mlt_image_format requested_format = *format; + int error = 0; + + if ( get_image ) { - return get_image( this, buffer, format, width, height, writable ); + 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 ); + if ( this->convert_image ) + this->convert_image( this, buffer, format, requested_format ); } - else if ( mlt_properties_get_data( properties, "image", NULL ) != NULL ) + else if ( mlt_properties_get_data( properties, "image", 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" ); + if ( this->convert_image ) + this->convert_image( this, buffer, format, requested_format ); } - else if ( producer != NULL ) + else if ( producer ) { mlt_frame test_frame = NULL; - mlt_service_get_frame( mlt_producer_service( producer ), &test_frame, 0 ); - if ( test_frame != NULL ) + mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), &test_frame, 0 ); + if ( test_frame ) { + mlt_properties test_properties = MLT_FRAME_PROPERTIES( test_frame ); + mlt_properties_set_double( test_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "consumer_aspect_ratio" ) ); + mlt_properties_set( test_properties, "rescale.interp", mlt_properties_get( properties, "rescale.interp" ) ); mlt_frame_get_image( test_frame, buffer, format, width, height, writable ); - mlt_properties_inherit( mlt_frame_properties( this ), mlt_frame_properties( test_frame ) ); mlt_properties_set_data( properties, "test_card_frame", test_frame, 0, ( mlt_destructor )mlt_frame_close, NULL ); - - 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_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( test_frame ) ); +// 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 ); } else { @@ -190,16 +315,18 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for } else { - uint8_t *p; - uint8_t *q; + register uint8_t *p; + register uint8_t *q; int size = 0; *width = *width == 0 ? 720 : *width; *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 ); switch( *format ) { @@ -209,56 +336,109 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for break; case mlt_image_rgb24: size *= 3; - *buffer = malloc( size ); + size += *width * 3; + *buffer = mlt_pool_alloc( size ); if ( *buffer ) memset( *buffer, 255, size ); break; case mlt_image_rgb24a: + case mlt_image_opengl: size *= 4; - *buffer = malloc( size ); + size += *width * 4; + *buffer = mlt_pool_alloc( size ); if ( *buffer ) memset( *buffer, 255, size ); break; case mlt_image_yuv422: size *= 2; - *buffer = malloc( size ); + size += *width * 2; + *buffer = mlt_pool_alloc( size ); p = *buffer; q = p + size; while ( p != NULL && p != q ) { - *p ++ = 255; + *p ++ = 235; *p ++ = 128; } break; case mlt_image_yuv420p: size = size * 3 / 2; - *buffer = malloc( size ); - if ( *buffer ) + *buffer = mlt_pool_alloc( size ); + if ( *buffer ) memset( *buffer, 255, size ); break; } - mlt_properties_set_data( properties, "image", *buffer, size, free, NULL ); + mlt_properties_set_data( properties, "image", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL ); mlt_properties_set_int( properties, "test_image", 1 ); } - return 0; + mlt_properties_set_int( properties, "scaled_width", *width ); + mlt_properties_set_int( properties, "scaled_height", *height ); + + return error; } uint8_t *mlt_frame_get_alpha_mask( mlt_frame this ) { - if ( this->get_alpha_mask != NULL ) - return this->get_alpha_mask( this ); - return NULL; + uint8_t *alpha = NULL; + if ( this != NULL ) + { + if ( this->get_alpha_mask != NULL ) + alpha = this->get_alpha_mask( this ); + if ( alpha == NULL ) + alpha = mlt_properties_get_data( &this->parent, "alpha", NULL ); + if ( alpha == NULL ) + { + int size = mlt_properties_get_int( &this->parent, "scaled_width" ) * mlt_properties_get_int( &this->parent, "scaled_height" ); + alpha = mlt_pool_alloc( size ); + memset( alpha, 255, size ); + mlt_properties_set_data( &this->parent, "alpha", alpha, size, mlt_pool_release, NULL ); + } + } + return alpha; } -int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples ) +const char * mlt_audio_format_name( mlt_audio_format format ) { - mlt_properties properties = mlt_frame_properties( this ); + switch ( format ) + { + case mlt_audio_none: return "none"; + case mlt_audio_s16: return "s16"; + case mlt_audio_s32: return "s32"; + case mlt_audio_float: return "float"; + } + return "invalid"; +} + +int mlt_frame_get_audio( mlt_frame this, void **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples ) +{ + mlt_get_audio get_audio = mlt_frame_pop_audio( this ); + mlt_properties properties = MLT_FRAME_PROPERTIES( this ); + int hide = mlt_properties_get_int( properties, "test_audio" ); + mlt_audio_format requested_format = *format; - if ( this->get_audio != NULL ) + if ( hide == 0 && get_audio != NULL ) { - return this->get_audio( this, buffer, format, frequency, channels, samples ); + mlt_position position = mlt_frame_get_position( this ); + get_audio( this, buffer, format, frequency, channels, samples ); + mlt_frame_set_position( this, position ); + mlt_properties_set_int( properties, "audio_frequency", *frequency ); + mlt_properties_set_int( properties, "audio_channels", *channels ); + mlt_properties_set_int( properties, "audio_samples", *samples ); + mlt_properties_set_int( properties, "audio_format", *format ); + if ( this->convert_audio ) + this->convert_audio( this, buffer, format, requested_format ); + } + else if ( mlt_properties_get_data( properties, "audio", NULL ) ) + { + *buffer = mlt_properties_get_data( properties, "audio", NULL ); + *format = mlt_properties_get_int( properties, "audio_format" ); + *frequency = mlt_properties_get_int( properties, "audio_frequency" ); + *channels = mlt_properties_get_int( properties, "audio_channels" ); + *samples = mlt_properties_get_int( properties, "audio_samples" ); + if ( this->convert_audio ) + this->convert_audio( this, buffer, format, requested_format ); } else { @@ -266,519 +446,180 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for *samples = *samples <= 0 ? 1920 : *samples; *channels = *channels <= 0 ? 2 : *channels; *frequency = *frequency <= 0 ? 48000 : *frequency; - size = *samples * *channels * sizeof( int16_t ); - *buffer = malloc( size ); - if ( *buffer != NULL ) - memset( *buffer, 0, size ); - mlt_properties_set_data( properties, "audio", *buffer, size, free, NULL ); - mlt_properties_set_int( properties, "test_audio", 1 ); - } - return 0; -} + mlt_properties_set_int( properties, "audio_frequency", *frequency ); + mlt_properties_set_int( properties, "audio_channels", *channels ); + mlt_properties_set_int( properties, "audio_samples", *samples ); + mlt_properties_set_int( properties, "audio_format", *format ); -void mlt_frame_close( mlt_frame this ) -{ - mlt_properties_close( &this->parent ); - free( this ); -} - -/***** convenience functions *****/ -#define RGB2YUV(r, g, b, y, u, v)\ - y = (306*r + 601*g + 117*b) >> 10;\ - u = ((-172*r - 340*g + 512*b) >> 10) + 128;\ - v = ((512*r - 429*g - 83*b) >> 10) + 128;\ - y = y < 0 ? 0 : y;\ - u = u < 0 ? 0 : u;\ - v = v < 0 ? 0 : v;\ - y = y > 255 ? 255 : y;\ - u = u > 255 ? 255 : u;\ - v = v > 255 ? 255 : v - -int mlt_convert_rgb24a_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; - - 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++; - *alpha++ = *s++; - RGB2YUV (r, g, b, y0, u0 , v0); - r = *s++; - g = *s++; - b = *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 ) + switch( *format ) { - r = *s++; - g = *s++; - b = *s++; - *alpha++ = *s++; - RGB2YUV (r, g, b, y0, u0 , v0); - *d++ = y0; - *d++ = u0; + case mlt_image_none: + size = 0; + *buffer = NULL; + break; + case mlt_audio_s16: + size = *samples * *channels * sizeof( int16_t ); + break; + case mlt_audio_s32: + size = *samples * *channels * sizeof( int32_t ); + break; + case mlt_audio_float: + size = *samples * *channels * sizeof( float ); + break; } + if ( size ) + *buffer = mlt_pool_alloc( size ); + if ( *buffer ) + memset( *buffer, 0, size ); + mlt_properties_set_data( properties, "audio", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL ); + mlt_properties_set_int( properties, "test_audio", 1 ); } - return ret; -} - -int mlt_convert_rgb24_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++ ) + // TODO: This does not belong here + if ( *format == mlt_audio_s16 && mlt_properties_get( properties, "meta.volume" ) ) { - register uint8_t *s = rgb + ( stride * i ); - for ( j = 0; j < ( width / 2 ); j++ ) + double value = mlt_properties_get_double( properties, "meta.volume" ); + + if ( value == 0.0 ) { - r = *s++; - g = *s++; - b = *s++; - RGB2YUV (r, g, b, y0, u0 , v0); - 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; + memset( *buffer, 0, *samples * *channels * 2 ); } - if ( width % 2 ) + else if ( value != 1.0 ) { - r = *s++; - g = *s++; - b = *s++; - RGB2YUV (r, g, b, y0, u0 , v0); - *d++ = y0; - *d++ = u0; + int total = *samples * *channels; + int16_t *p = *buffer; + while ( total -- ) + { + *p = *p * value; + p ++; + } } + + mlt_properties_set( properties, "meta.volume", NULL ); } - return ret; + + return 0; } -int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int stride, uint8_t *yuv ) +int mlt_frame_set_audio( mlt_frame this, void *buffer, mlt_audio_format format, int size, mlt_destructor destructor ) { - 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; + mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "audio_format", format ); + return mlt_properties_set_data( MLT_FRAME_PROPERTIES( this ), "audio", buffer, size, destructor, NULL ); } -void *memfill( void *dst, void *src, int l, int elements ) +unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h ) { - int i = 0; - if ( l == 2 ) + int16_t *pcm = NULL; + mlt_properties properties = MLT_FRAME_PROPERTIES( this ); + mlt_audio_format format = mlt_audio_s16; + int frequency = 32000; // lower frequency available? + int channels = 2; + 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, (void**)&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++ ) { - uint8_t *p = dst; - uint8_t *src1 = src; - uint8_t *src2 = src + 1; - for ( i = 0; i < elements; i ++ ) + // pcm data has channels interleaved + for ( j = 0; j < channels; j++ ) { - *p ++ = *src1; - *p ++ = *src2; + // 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 + // half the vertical resolution + int height = ( int )( ( double )( pcm_magnitude ) / 32768 * h / 2 ); + // Determine the starting y coordinate - left channel above center, + // right channel below - currently assumes 2 channels + 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++; } - dst = p; + pcm += skip * channels; } - else - { - for ( i = 0; i < elements; i ++ ) - dst = memcpy( dst, src, l ) + l; - } - return dst; + + return bitmap; } -void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input, int iwidth, int iheight ) +mlt_producer mlt_frame_get_original_producer( mlt_frame this ) { - // 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 ); - - // Optimisation point - if ( iwidth == owidth && iheight == oheight ) - memcpy( output, input, iheight * istride ); - - // 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; - } + if ( this != NULL ) + return mlt_properties_get_data( MLT_FRAME_PROPERTIES( this ), "_producer", NULL ); + return NULL; } -/** 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. -*/ - -uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight ) +void mlt_frame_close( mlt_frame this ) { - // Get properties - mlt_properties properties = mlt_frame_properties( this ); - - // Get the input image, width and height - uint8_t *input = mlt_properties_get_data( properties, "image", NULL ); - int iwidth = mlt_properties_get_int( properties, "width" ); - int iheight = mlt_properties_get_int( properties, "height" ); - - // If width and height are correct, don't do anything - if ( iwidth != owidth || iheight != oheight ) + if ( this != NULL && mlt_properties_dec_ref( MLT_FRAME_PROPERTIES( this ) ) <= 0 ) { - // Create the output image - uint8_t *output = malloc( owidth * oheight * 2 ); - - // 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 ); - mlt_properties_set_int( properties, "width", owidth ); - mlt_properties_set_int( properties, "height", oheight ); - mlt_frame_set_aspect_ratio( this, 4.0/3.0/*( float )owidth / oheight*/ ); - - // Return the output - return output; + mlt_deque_close( this->stack_image ); + mlt_deque_close( this->stack_audio ); + while( mlt_deque_peek_back( this->stack_service ) ) + mlt_service_close( mlt_deque_pop_back( this->stack_service ) ); + mlt_deque_close( this->stack_service ); + mlt_properties_close( &this->parent ); + free( this ); } - - // No change, return input - return input; } -/** A rescaling function for yuv422 frames - low quality, and provided for testing - only. It assumes yuv422 images available on the frame so use with care. -*/ +/***** convenience functions *****/ -uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) +/* Will this break when mlt_position is converted to double? -Zach */ +int mlt_sample_calculator( float fps, int frequency, int64_t position ) { - // Get properties - mlt_properties properties = mlt_frame_properties( this ); - - // Get the input image, width and height - uint8_t *input = mlt_properties_get_data( properties, "image", NULL ); - int iwidth = mlt_properties_get_int( properties, "width" ); - int iheight = mlt_properties_get_int( properties, "height" ); + int samples = 0; - // If width and height are correct, don't do anything - if ( iwidth != owidth || iheight != oheight ) + if ( fps ) { - // Create the output image - uint8_t *output = malloc( owidth * oheight * 2 ); - - // Calculate strides - int istride = iwidth * 2; - int ostride = owidth * 2; - - iwidth = iwidth - ( iwidth % 4 ); - - // Coordinates (0,0 is middle of output) - int y, x; - - // Derived coordinates - int dy, dx; - - // 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 pointer - uint8_t *in_middle = input + istride * in_y_range + in_x_range * 2; - uint8_t *in_line; - uint8_t *in_ptr; - - // Generate the affine transform scaling values - 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 ) >> 16; - - // Start at the beginning of the line - out_ptr = out_line; - - // Pointer to the middle of the input line - in_line = in_middle + dy * istride; - - // Loop for the entirety of our output row. - for ( x = - out_x_range; x < out_x_range; x += 1 ) - { - // Calculated the derived x - 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 - out_line += ostride; - } - - // Now update the frame - mlt_properties_set_data( properties, "image", output, owidth * oheight * 2, free, NULL ); - mlt_properties_set_int( properties, "width", owidth ); - mlt_properties_set_int( properties, "height", oheight ); - - // Return the output - return output; + /* Compute the cumulative number of samples until the start of this frame and the + cumulative number of samples until the start of the next frame. Round each to the + nearest integer and take the difference to determine the number of samples in + this frame. + + This approach should prevent rounding errors that can accumulate over a large number + of frames causing A/V sync problems. */ + + int64_t samples_at_this = + (int64_t)( (double) position * (double) frequency / (double) fps + + ( position < 0 ? -0.5 : 0.5 ) ); + int64_t samples_at_next = + (int64_t)( (double) (position + 1) * (double) frequency / (double) fps + + ( position < 0 ? -0.5 : 0.5 ) ); + samples = (int)( samples_at_next - samples_at_this ); } - // No change, return input - return input; -} - -int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, float weight_end, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples ) -{ - int ret = 0; - int16_t *p_src, *p_dest; - int16_t *src, *dest; - //static int16_t *extra_src = NULL, *extra_dest = NULL; - static int extra_src_samples = 0, extra_dest_samples = 0; - 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 d = 0, s = 0; - - mlt_frame_get_audio( this, &p_dest, format, &frequency_dest, &channels_dest, &samples_dest ); - //fprintf( stderr, "mix: 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, "mix: 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 ) - channels_dest = 0; - if ( samples_src > 4000 ) - samples_src = 0; - if ( samples_dest > 4000 ) - samples_dest = 0; - -#if 0 - // Append new samples to leftovers - if ( extra_dest_samples > 0 ) - { - fprintf( stderr, "prepending %d samples to dest\n", extra_dest_samples ); - dest = realloc( extra_dest, ( samples_dest + extra_dest_samples ) * 2 * channels_dest ); - memcpy( &extra_dest[ extra_dest_samples * channels_dest ], p_dest, samples_dest * 2 * channels_dest ); - } - else - dest = p_dest; - if ( extra_src_samples > 0 ) - { - fprintf( stderr, "prepending %d samples to src\n", extra_src_samples ); - src = realloc( extra_src, ( samples_src + extra_src_samples ) * 2 * channels_src ); - memcpy( &extra_src[ extra_src_samples * channels_src ], p_src, samples_src * 2 * channels_src ); - } - else - src = p_src; -#endif - - // determine number of samples to process - if ( samples_src + extra_src_samples < samples_dest + extra_dest_samples ) - *samples = samples_src + extra_src_samples; - else if ( samples_dest + extra_dest_samples < samples_src + extra_src_samples ) - *samples = samples_dest + extra_dest_samples; - - *channels = channels_src < channels_dest ? channels_src : channels_dest; - *buffer = p_dest; - *frequency = frequency_dest; - - // Compute a smooth ramp over start to end - float weight = weight_start; - float weight_step = ( weight_end - weight_start ) / *samples; - - // Mixdown - for ( i = 0; i < *samples; i++ ) - { - for ( j = 0; j < *channels; 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 ); - } - weight += weight_step; - } - - // We have to copy --sigh - if ( dest != p_dest ) - memcpy( p_dest, dest, *samples * 2 * *channels ); - -#if 0 - // Store the leftovers - if ( samples_src + extra_src_samples < samples_dest + extra_dest_samples ) - { - extra_dest_samples = ( samples_dest + extra_dest_samples ) - ( samples_src + extra_src_samples ); - size_t size = extra_dest_samples * 2 * channels_dest; - fprintf( stderr, "storing %d samples from dest\n", extra_dest_samples ); - if ( extra_dest ) - free( extra_dest ); - extra_dest = malloc( size ); - if ( extra_dest ) - memcpy( extra_dest, &p_dest[ ( samples_dest - extra_dest_samples - 1 ) * channels_dest ], size ); - else - extra_dest_samples = 0; - } - else if ( samples_dest + extra_dest_samples < samples_src + extra_src_samples ) - { - extra_src_samples = ( samples_src + extra_src_samples ) - ( samples_dest + extra_dest_samples ); - size_t size = extra_src_samples * 2 * channels_src; - fprintf( stderr, "storing %d samples from src\n", extra_dest_samples ); - if ( extra_src ) - free( extra_src ); - extra_src = malloc( size ); - if ( extra_src ) - memcpy( extra_src, &p_src[ ( samples_src - extra_src_samples - 1 ) * channels_src ], size ); - else - extra_src_samples = 0; - } -#endif - - return ret; + return samples; } -int mlt_sample_calculator( float fps, int frequency, int64_t position ) +int64_t mlt_sample_calculator_to_now( float fps, int frequency, int64_t frame ) { - int samples = 0; + int64_t samples = 0; - if ( fps > 29 && fps <= 30 ) + if ( fps ) { - 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; + samples = (int64_t)( (double) frame * (double) frequency / (double) fps + + ( frame < 0 ? -0.5 : 0.5 ) ); } return samples; } -