From: lilo_booter Date: Mon, 22 Mar 2004 12:31:40 +0000 (+0000) Subject: producer hold, experimental ac3 audio support X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=01453096ad1094889d18c81f7012908465db18c9;p=melted producer hold, experimental ac3 audio support git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@226 d19143bc-622f-0410-bfdd-b5b2a6649095 --- diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index b5f7f62..0f3a559 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.c @@ -758,7 +758,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form pthread_mutex_lock( &avformat_mutex ); // Check for resample and create if necessary - if ( resample == NULL ) + if ( resample == NULL && codec_context->channels <= 2 ) { // Create the resampler resample = audio_resample_init( *channels, codec_context->channels, *frequency, codec_context->sample_rate ); @@ -766,6 +766,11 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form // And store it on properties mlt_properties_set_data( properties, "audio_resample", resample, 0, ( mlt_destructor )audio_resample_close, NULL ); } + else if ( resample == NULL ) + { + *channels = codec_context->channels; + *frequency = codec_context->sample_rate; + } // Check for audio buffer and create if necessary if ( audio_buffer == NULL ) @@ -827,7 +832,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form uint8_t *ptr = pkt.data; int data_size; - // We only deal with video from the selected video_index + // We only deal with audio from the selected audio_index while ( ptr != NULL && ret >= 0 && pkt.stream_index == index && len > 0 ) { // Decode the audio @@ -844,9 +849,15 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form if ( data_size > 0 ) { - int size_out = audio_resample( resample, &audio_buffer[ audio_used * *channels ], temp, data_size / ( codec_context->channels * sizeof( int16_t ) ) ); - - audio_used += size_out; + if ( resample != NULL ) + { + audio_used += audio_resample( resample, &audio_buffer[ audio_used * *channels ], temp, data_size / ( codec_context->channels * sizeof( int16_t ) ) ); + } + else + { + memcpy( &audio_buffer[ audio_used * *channels ], temp, data_size ); + audio_used += data_size / ( codec_context->channels * sizeof( int16_t ) ); + } // Handle ignore while ( ignore && audio_used > *samples ) diff --git a/src/modules/core/producer_colour.c b/src/modules/core/producer_colour.c index 43d019d..415b595 100644 --- a/src/modules/core/producer_colour.c +++ b/src/modules/core/producer_colour.c @@ -193,6 +193,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // Set producer-specific frame properties mlt_properties_set_int( properties, "progressive", 1 ); + mlt_properties_set_int( properties, "aspect_ratio", 1 ); // colour is an alias for resource // CY: Do we really need this? diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c index 1ca825f..b771492 100644 --- a/src/modules/dv/consumer_libdv.c +++ b/src/modules/dv/consumer_libdv.c @@ -1,5 +1,5 @@ /* - * producer_libdv.c -- a DV encoder based on libdv + * consumer_libdv.c -- a DV encoder based on libdv * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Charles Yates * diff --git a/src/modules/fezzik/Makefile b/src/modules/fezzik/Makefile index b2c9368..b0e98f7 100644 --- a/src/modules/fezzik/Makefile +++ b/src/modules/fezzik/Makefile @@ -2,7 +2,8 @@ TARGET = ../libmltfezzik.so OBJS = factory.o \ - producer_fezzik.o + producer_fezzik.o \ + producer_hold.o CFLAGS = -O3 -I../../ -Wall -g -D_FILE_OFFSET_BITS=64 -pthread diff --git a/src/modules/fezzik/configure b/src/modules/fezzik/configure index 0576042..b7880ad 100755 --- a/src/modules/fezzik/configure +++ b/src/modules/fezzik/configure @@ -5,6 +5,7 @@ then cat << EOF >> ../producers.dat fezzik libmltfezzik.so +hold libmltfezzik.so EOF fi diff --git a/src/modules/fezzik/factory.c b/src/modules/fezzik/factory.c index f37316f..c7e5cca 100644 --- a/src/modules/fezzik/factory.c +++ b/src/modules/fezzik/factory.c @@ -21,11 +21,14 @@ #include #include "producer_fezzik.h" +#include "producer_hold.h" void *mlt_create_producer( char *id, void *arg ) { if ( !strcmp( id, "fezzik" ) ) return producer_fezzik_init( arg ); + if ( !strcmp( id, "hold" ) ) + return producer_hold_init( arg ); return NULL; } diff --git a/src/modules/fezzik/producer_hold.c b/src/modules/fezzik/producer_hold.c new file mode 100644 index 0000000..d2ce7f8 --- /dev/null +++ b/src/modules/fezzik/producer_hold.c @@ -0,0 +1,148 @@ +/* + * producer_hold.c -- frame holding producer + * Copyright (C) 2003-2004 Ushodaya Enterprises Limited + * Author: Charles Yates + * + * 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. + * + * This program 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. + * + * 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. + */ + +#include "producer_hold.h" + +#include +#include +#include + +#include + +// Forward references +static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index ); + +/** Constructor for the frame holding producer. Basically, all this producer does is + provide a producer wrapper for the requested producer, allows the specifcation of + the frame required and will then repeatedly obtain that frame for each get_frame + and get_image requested. +*/ + +mlt_producer producer_hold_init( char *arg ) +{ + // Construct a new holding producer + mlt_producer this = mlt_producer_new( ); + + // Construct the requested producer via fezzik + mlt_producer producer = mlt_factory_producer( "fezzik", arg ); + + // Initialise the frame holding capabilities + if ( this != NULL && producer != NULL ) + { + // Get the properties of this producer + mlt_properties properties = mlt_producer_properties( this ); + + // Store the producer + mlt_properties_set_data( properties, "producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL ); + + // Set frame, in, out and length for this producer + mlt_properties_set_position( properties, "frame", 0 ); + mlt_properties_set_position( properties, "in", 0 ); + mlt_properties_set_position( properties, "out", 25 ); + mlt_properties_set_position( properties, "length", 15000 ); + + // Override the get_frame method + this->get_frame = producer_get_frame; + } + else + { + // Clean up (not sure which one failed, can't be bothered to find out, so close both) + mlt_producer_close( this ); + mlt_producer_close( producer ); + + // Make sure we return NULL + this = NULL; + } + + // Return this producer + return this; +} + +static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable ) +{ + // Get the properties of the frame + mlt_properties properties = mlt_frame_properties( frame ); + + // Obtain the real frame + mlt_frame real_frame = mlt_frame_pop_service( frame ); + + // We want distorted to ensure we don't hit the resize filter twice + mlt_properties_set_int( properties, "distort", 1 ); + + // Get the image from the real frame + mlt_frame_get_image( real_frame, buffer, format, width, height, writable ); + + // Set the values obtained on the 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 ); + + // We'll deinterlace on the downstream deinterlacer + mlt_properties_set_int( mlt_frame_properties( real_frame ), "consumer_deinterlace", 1 ); + + // All done + return 0; +} + +static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index ) +{ + // Get the properties of this producer + mlt_properties properties = mlt_producer_properties( this ); + + // Construct a new frame + *frame = mlt_frame_init( ); + + // If we have a frame, then stack the producer itself and the get_image method + if ( *frame != NULL ) + { + // Define the real frame + mlt_frame real_frame = NULL; + + // Get the producer + mlt_producer producer = mlt_properties_get_data( properties, "producer", NULL ); + + // Get the frame position requested + mlt_position position = mlt_properties_get_position( properties, "frame" ); + + // Seek the producer to the correct place + mlt_producer_seek( producer, position ); + + // Get the real frame + mlt_service_get_frame( mlt_producer_service( producer ), &real_frame, index ); + + // Ensure that the real frame gets wiped + mlt_properties_set_data( mlt_frame_properties( *frame ), "real_frame", real_frame, 0, ( mlt_destructor )mlt_frame_close, NULL ); + + // Stack the real frame and method + mlt_frame_push_service( *frame, real_frame ); + mlt_frame_push_service( *frame, producer_get_image ); + + // Ensure that the consumer sees what the real frame has + mlt_properties_pass( mlt_frame_properties( *frame ), mlt_frame_properties( real_frame ), "" ); + + // Mirror the properties of the frame + mlt_properties_mirror( mlt_frame_properties( *frame ), mlt_frame_properties( real_frame ) ); + } + + // Move to the next position + mlt_producer_prepare_next( this ); + + return 0; +} diff --git a/src/modules/fezzik/producer_hold.h b/src/modules/fezzik/producer_hold.h new file mode 100644 index 0000000..d80a9e2 --- /dev/null +++ b/src/modules/fezzik/producer_hold.h @@ -0,0 +1,28 @@ +/* + * producer_hold.h -- a frame holding producer + * Copyright (C) 2003-2004 Ushodaya Enterprises Limited + * Author: Charles Yates + * + * 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. + * + * This program 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. + * + * 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. + */ + +#ifndef _PRODUCER_HOLD_H_ +#define _PRODUCER_HOLD_H_ + +#include + +extern mlt_producer producer_hold_init( char *args ); + +#endif diff --git a/src/modules/resample/filter_resample.c b/src/modules/resample/filter_resample.c index 57f9aad..adfe067 100644 --- a/src/modules/resample/filter_resample.c +++ b/src/modules/resample/filter_resample.c @@ -58,11 +58,9 @@ static int resample_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form // Duplicate channels as necessary if ( channels_avail < *channels ) { - int size = *channels * *samples * 2; + int size = *channels * *samples * sizeof( int16_t ); int16_t *new_buffer = mlt_pool_alloc( size ); - mlt_properties_set_data( properties, "audio", new_buffer, size, ( mlt_destructor )mlt_pool_release, NULL ); - // Duplicate the existing channels for ( i = 0; i < *samples; i++ ) { @@ -74,10 +72,31 @@ static int resample_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form } } + // Update the audio buffer now - destroys the old + mlt_properties_set_data( properties, "audio", new_buffer, size, ( mlt_destructor )mlt_pool_release, NULL ); + + *buffer = new_buffer; + } + else if ( channels_avail > *channels ) + { + // Nasty hack for ac3 5.1 audio - may be a cause of failure? + int size = *channels * *samples * sizeof( int16_t ); + int16_t *new_buffer = mlt_pool_alloc( size ); + + // Drop all but the first *channels + for ( i = 0; i < *samples; i++ ) + { + new_buffer[ ( i * *channels ) + 0 ] = (*buffer)[ ( i * channels_avail ) + 2 ]; + new_buffer[ ( i * *channels ) + 1 ] = (*buffer)[ ( i * channels_avail ) + 3 ]; + } + + // Update the audio buffer now - destroys the old + mlt_properties_set_data( properties, "audio", new_buffer, size, ( mlt_destructor )mlt_pool_release, NULL ); + *buffer = new_buffer; } - // Return now if now work to do + // Return now if no work to do if ( output_rate == *frequency ) return 0; diff --git a/src/tests/dan.c b/src/tests/dan.c index 051fb39..3488768 100644 --- a/src/tests/dan.c +++ b/src/tests/dan.c @@ -21,7 +21,7 @@ int main( int argc, char **argv ) file2 = argv[ 2 ]; // Start the consumer... - int vstd = mlt_video_standard_ntsc; + //int vstd = mlt_video_standard_ntsc; //mlt_consumer consumer = mlt_factory_consumer( "bluefish", &vstd ); //mlt_consumer consumer = mlt_factory_consumer( "sdl", NULL ); mlt_consumer consumer = consumer_libdv_init( NULL ); diff --git a/src/tests/pango.c b/src/tests/pango.c index fb56113..fb5e19a 100644 --- a/src/tests/pango.c +++ b/src/tests/pango.c @@ -33,7 +33,6 @@ int main( int argc, char **argv ) mlt_playlist pl2 = mlt_playlist_init(); mlt_producer title = mlt_factory_producer( "pango", NULL ); //"Mutton Lettuce Tomato" ); mlt_playlist_append( pl2, title ); - mlt_properties_set_int( mlt_producer_properties( title ), "video_standard", mlt_video_standard_pal ); mlt_properties_set( mlt_producer_properties( title ), "font", "Sans Bold 36" ); mlt_properties_set( mlt_producer_properties( title ), "text", text ); mlt_properties_set_int( mlt_producer_properties( title ), "bgcolor", 0x0000007f ); diff --git a/src/tests/pixbuf.c b/src/tests/pixbuf.c index 64a23b7..fd0f0b6 100644 --- a/src/tests/pixbuf.c +++ b/src/tests/pixbuf.c @@ -33,7 +33,6 @@ int main( int argc, char **argv ) mlt_playlist pl2 = mlt_playlist_init(); mlt_producer overlay = mlt_factory_producer( "pixbuf", file2 ); mlt_playlist_append( pl2, overlay ); - mlt_properties_set_int( mlt_producer_properties( overlay ), "video_standard", mlt_video_standard_pal ); mlt_properties_set_int( mlt_producer_properties( overlay ), "x", 600 ); mlt_properties_set_int( mlt_producer_properties( overlay ), "y", 460 ); mlt_properties_set_double( mlt_producer_properties( overlay ), "mix", 0.8 );