X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=660f3c1de4ffe3ce00be55c7e8c4e2d8e8aa9647;hb=da46016cc4e9c751ab346b9b8f451a59cd276b03;hp=9198807de5df91392d53913dc38857dfcf8cf05c;hpb=4a39b72c5ac8fd2dd6db81a95eab08adde0491b9;p=melted diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c index 9198807..660f3c1 100644 --- a/src/framework/mlt_frame.c +++ b/src/framework/mlt_frame.c @@ -53,7 +53,7 @@ mlt_frame mlt_frame_init( ) 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", 72.0/79.0 ); + mlt_properties_set_double( properties, "aspect_ratio", 59.0/54.0 ); } else { @@ -61,7 +61,7 @@ mlt_frame mlt_frame_init( ) 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", 128.0/117.0 ); + mlt_properties_set_double( properties, "aspect_ratio", 10.0/11.0 ); } mlt_properties_set_data( properties, "audio", NULL, 0, NULL, NULL ); @@ -70,6 +70,7 @@ mlt_frame mlt_frame_init( ) // 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; @@ -88,15 +89,15 @@ mlt_properties mlt_frame_properties( mlt_frame this ) int mlt_frame_is_test_card( mlt_frame this ) { - return mlt_deque_count( this->stack_image ) == 0 || 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. @@ -104,7 +105,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. @@ -112,7 +113,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. @@ -120,7 +121,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. @@ -128,7 +130,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. @@ -195,9 +197,53 @@ 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; +} + +/** [EXPERIMENTAL] 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 ) +{ + // Herein lies the potential problem for this function - it makes a potentially + // dangerous assumption that all content on the image stack can be removed without a destructor + 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; +} + +/** 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 ); @@ -221,10 +267,10 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for else if ( producer != NULL ) { mlt_frame test_frame = NULL; - mlt_service_get_frame( mlt_producer_service( producer ), &test_frame, 0 ); + mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), &test_frame, 0 ); if ( test_frame != NULL ) { - mlt_properties test_properties = mlt_frame_properties( 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 ); @@ -310,13 +356,14 @@ uint8_t *mlt_frame_get_alpha_mask( mlt_frame this ) int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples ) { - mlt_properties properties = mlt_frame_properties( this ); + 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" ); - if ( hide == 0 && this->get_audio != NULL ) + if ( hide == 0 && get_audio != NULL ) { mlt_position position = mlt_frame_get_position( this ); - this->get_audio( this, buffer, format, frequency, channels, samples ); + get_audio( this, buffer, format, frequency, channels, samples ); mlt_frame_set_position( this, position ); } else if ( mlt_properties_get_data( properties, "audio", NULL ) ) @@ -344,13 +391,34 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for mlt_properties_set_int( properties, "audio_channels", *channels ); mlt_properties_set_int( properties, "audio_samples", *samples ); + 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 ) + { + int total = *samples * *channels; + int16_t *p = *buffer; + while ( total -- ) + { + *p = *p * value; + p ++; + } + mlt_properties_set_double( properties, "meta.volume", 1.0 ); + } + } + return 0; } unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h ) { int16_t *pcm = NULL; - mlt_properties properties = mlt_frame_properties( this ); + mlt_properties properties = MLT_FRAME_PROPERTIES( this ); mlt_audio_format format = mlt_audio_pcm; int frequency = 32000; // lower frequency available? int channels = 2; @@ -404,16 +472,19 @@ unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h ) mlt_producer mlt_frame_get_original_producer( mlt_frame this ) { if ( this != NULL ) - return mlt_properties_get_data( mlt_frame_properties( this ), "_producer", NULL ); + return mlt_properties_get_data( MLT_FRAME_PROPERTIES( this ), "_producer", NULL ); return NULL; } void mlt_frame_close( mlt_frame this ) { - if ( this != NULL && mlt_properties_dec_ref( mlt_frame_properties( this ) ) <= 0 ) + if ( this != NULL && mlt_properties_dec_ref( MLT_FRAME_PROPERTIES( this ) ) <= 0 ) { 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 ); } @@ -535,7 +606,7 @@ uint8_t *mlt_resize_alpha( uint8_t *input, int owidth, int oheight, int iwidth, { uint8_t *output = NULL; - if ( input != NULL && ( iwidth != owidth || iheight != oheight ) ) + if ( input != NULL && ( iwidth != owidth || iheight != oheight ) && ( owidth > 6 && oheight > 6 ) ) { iwidth = iwidth - ( iwidth % 2 ); owidth = owidth - ( owidth % 2 ); @@ -617,14 +688,21 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input int istride = iwidth * 2; int ostride = owidth * 2; - iwidth = iwidth - ( iwidth % 4 ); - owidth = owidth - ( owidth % 4 ); + iwidth = iwidth - ( iwidth % 2 ); + owidth = owidth - ( owidth % 2 ); //iheight = iheight - ( iheight % 2 ); //oheight = oheight - ( oheight % 2 ); - + // Optimisation point - if ( iwidth == owidth && iheight == oheight ) + if ( output == NULL || input == NULL || ( owidth <= 6 || oheight <= 6 || iwidth <= 6 || oheight <= 6 ) ) + { + return; + } + else if ( iwidth == owidth && iheight == oheight ) + { memcpy( output, input, iheight * istride ); + return; + } // Coordinates (0,0 is middle of output) int y; @@ -640,7 +718,7 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input 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; + uint8_t *in_middle = input + istride * ( iheight / 2 ) + iwidth; int in_line = - in_y_range * istride - in_x_range * 2; int elements; @@ -656,10 +734,18 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input } int active_width = 2 * iwidth; - int inactive_width = out_x_range - in_x_range; + 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; + if ( in_line % 4 ) + { + active_width -= 2; + in_middle += 2; + right_inactive_width += 2; + } + // Loop for the entirety of our output height. while ( iheight -- ) { @@ -667,7 +753,7 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input out_ptr = out_line; // Fill the outer part with black - elements = inactive_width; + elements = left_inactive_width; while ( elements -- ) { *out_ptr ++ = 16; @@ -684,7 +770,7 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input } // Fill the outer part with black - elements = inactive_width; + elements = right_inactive_width; while ( elements -- ) { *out_ptr ++ = 16; @@ -714,7 +800,7 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight ) { // Get properties - mlt_properties properties = mlt_frame_properties( this ); + mlt_properties properties = MLT_FRAME_PROPERTIES( this ); // Get the input image, width and height uint8_t *input = mlt_properties_get_data( properties, "image", NULL ); @@ -759,7 +845,7 @@ uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight ) uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) { // Get properties - mlt_properties properties = mlt_frame_properties( this ); + mlt_properties properties = MLT_FRAME_PROPERTIES( this ); // Get the input image, width and height uint8_t *input = mlt_properties_get_data( properties, "image", NULL ); @@ -856,10 +942,18 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, flo double d = 0, s = 0; mlt_frame_get_audio( this, &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, &src, format, &frequency_src, &channels_src, &samples_src ); - //fprintf( stderr, "mix: frame src samples %d channels %d\n", samples_src, channels_src ); - + + 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 ( channels_src > 6 ) channels_src = 0; if ( channels_dest > 6 )