X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fconsumer_libdv.c;h=f6c468e33715ca0e4544586ac62e402fb5f0a933;hb=40b169c095486ba1b868486eb98a47c41f36ce8c;hp=5825cce39b44c26e930e1fbf58d2c533ef25b627;hpb=5a18fbd70d4b0459e885b0515cd6377350bf61aa;p=melted diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c index 5825cce..f6c468e 100644 --- a/src/modules/dv/consumer_libdv.c +++ b/src/modules/dv/consumer_libdv.c @@ -1,25 +1,26 @@ /* - * 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 * - * 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 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 program is distributed in the hope that it will be useful, + * 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 */ // Local header files #include "consumer_libdv.h" +#include "producer_libdv.h" // mlt Header files #include @@ -55,22 +56,23 @@ mlt_consumer consumer_libdv_init( char *arg ) if ( this != NULL && mlt_consumer_init( this, NULL ) == 0 ) { // Get properties from the consumer - mlt_properties properties = mlt_consumer_properties( this ); + mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); // Assign close callback this->close = consumer_close; - // Interpret the constructor argument - if ( arg == NULL || !strcmp( arg, "PAL" ) ) - mlt_properties_set_double( properties, "fps", 25 ); - else - mlt_properties_set_double( properties, "fps", 29.97 ); + // Interpret the argument + if ( arg != NULL ) + mlt_properties_set( properties, "target", arg ); // Set the encode and output handling method mlt_properties_set_data( properties, "video", consumer_encode_video, 0, NULL, NULL ); mlt_properties_set_data( properties, "audio", consumer_encode_audio, 0, NULL, NULL ); mlt_properties_set_data( properties, "output", consumer_output, 0, NULL, NULL ); + // Terminate at end of the stream by default + mlt_properties_set_int( properties, "terminate_on_pause", 1 ); + // Set up start/stop/terminated callbacks this->start = consumer_start; this->stop = consumer_stop; @@ -93,7 +95,7 @@ mlt_consumer consumer_libdv_init( char *arg ) static int consumer_start( mlt_consumer this ) { // Get the properties - mlt_properties properties = mlt_consumer_properties( this ); + mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); // Check that we're not already running if ( !mlt_properties_get_int( properties, "running" ) ) @@ -119,7 +121,7 @@ static int consumer_start( mlt_consumer this ) static int consumer_stop( mlt_consumer this ) { // Get the properties - mlt_properties properties = mlt_consumer_properties( this ); + mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); // Check that we're running if ( mlt_properties_get_int( properties, "running" ) ) @@ -132,6 +134,10 @@ static int consumer_stop( mlt_consumer this ) // Wait for termination pthread_join( *thread, NULL ); + + // Close the output file :-) - this is obtuse - doesn't matter if output file + // exists or not - the destructor will kick in if it does + mlt_properties_set_data( properties, "output_file", NULL, 0, NULL, NULL ); } return 0; @@ -143,7 +149,7 @@ static int consumer_stop( mlt_consumer this ) static int consumer_is_stopped( mlt_consumer this ) { // Get the properties - mlt_properties properties = mlt_consumer_properties( this ); + mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); return !mlt_properties_get_int( properties, "running" ); } @@ -153,7 +159,7 @@ static int consumer_is_stopped( mlt_consumer this ) static dv_encoder_t *libdv_get_encoder( mlt_consumer this, mlt_frame frame ) { // Get the properties of the consumer - mlt_properties this_properties = mlt_consumer_properties( this ); + mlt_properties this_properties = MLT_CONSUMER_PROPERTIES( this ); // Obtain the dv_encoder dv_encoder_t *encoder = mlt_properties_get_data( this_properties, "dv_encoder", NULL ); @@ -176,10 +182,6 @@ static dv_encoder_t *libdv_get_encoder( mlt_consumer this, mlt_frame frame ) // Store the encoder on the properties mlt_properties_set_data( this_properties, "dv_encoder", encoder, 0, ( mlt_destructor )dv_encoder_free, NULL ); - - // Convenience for image dimensions - mlt_properties_set_int( this_properties, "width", 720 ); - mlt_properties_set_int( this_properties, "height", fps == 25 ? 576 : 480 ); } // Return the encoder @@ -196,24 +198,27 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram dv_encoder_t *encoder = libdv_get_encoder( this, frame ); // Get the properties of the consumer - mlt_properties this_properties = mlt_consumer_properties( this ); + mlt_properties this_properties = MLT_CONSUMER_PROPERTIES( this ); // This will hold the size of the dv frame int size = 0; - // determine if this a test card - int is_test = mlt_frame_is_test_card( frame ); + // Is the image rendered + int rendered = mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "rendered" ); + + // Get width and height + int width = mlt_properties_get_int( this_properties, "width" ); + int height = mlt_properties_get_int( this_properties, "height" ); // If we get an encoder, then encode the image - if ( encoder != NULL ) + if ( rendered && encoder != NULL ) { // Specify desired image properties mlt_image_format fmt = mlt_image_yuv422; - int width = mlt_properties_get_int( this_properties, "width" ); - int height = mlt_properties_get_int( this_properties, "height" ); uint8_t *image = NULL; // Get the image + mlt_events_fire( this_properties, "consumer-frame-show", frame, NULL ); mlt_frame_get_image( frame, &image, &fmt, &width, &height, 0 ); // Check that we get what we expected @@ -228,22 +233,21 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram else { // Calculate the size of the dv frame - size = height == 576 ? frame_size_625_50 : frame_size_525_60; + size = height == 576 ? FRAME_SIZE_625_50 : FRAME_SIZE_525_60; } // Process the frame - if ( size != 0 && !( mlt_properties_get_int( this_properties, "was_test_card" ) && is_test ) ) + if ( size != 0 ) { - if ( mlt_properties_get_int( mlt_frame_properties( frame ), "top_field_first" ) == 0 ) - image += width * 2; - // Encode the image dv_encode_full_frame( encoder, &image, e_dv_color_yuv, dv_frame ); - - // Note test card status - mlt_properties_set_int( this_properties, "was_test_card", is_test ); } } + else if ( encoder != NULL ) + { + // Calculate the size of the dv frame (duplicate of previous) + size = height == 576 ? FRAME_SIZE_625_50 : FRAME_SIZE_525_60; + } return size; } @@ -254,7 +258,10 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_frame frame ) { // Get the properties of the consumer - mlt_properties this_properties = mlt_consumer_properties( this ); + mlt_properties this_properties = MLT_CONSUMER_PROPERTIES( this ); + + // Get the properties of the frame + mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame ); // Obtain the dv_encoder dv_encoder_t *encoder = libdv_get_encoder( this, frame ); @@ -268,7 +275,7 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra // Default audio args mlt_audio_format fmt = mlt_audio_pcm; int channels = 2; - int frequency = 48000; + int frequency = mlt_properties_get_int( this_properties, "frequency" ); int samples = mlt_sample_calculator( mlt_properties_get_double( this_properties, "fps" ), frequency, count ); int16_t *pcm = NULL; @@ -276,14 +283,14 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra time_t start = time( NULL ); int height = mlt_properties_get_int( this_properties, "height" ); int is_pal = height == 576; - int is_wide = 0; + int is_wide = mlt_properties_get_int( this_properties, "display_aspect_num" ) == 16; // Temporary - audio buffer allocation int16_t *audio_buffers[ 4 ]; int i = 0; int j = 0; for ( i = 0 ; i < 4; i ++ ) - audio_buffers[ i ] = malloc( 2 * DV_AUDIO_MAX_SAMPLES ); + audio_buffers[ i ] = mlt_pool_alloc( 2 * DV_AUDIO_MAX_SAMPLES ); // Get the audio mlt_frame_get_audio( frame, &pcm, &fmt, &frequency, &channels, &samples ); @@ -292,9 +299,17 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra encoder->samples_this_frame = samples; // Fill the audio buffers correctly - for ( i = 0; i < samples; i ++ ) + if ( mlt_properties_get_double( frame_properties, "_speed" ) == 1.0 ) + { + for ( i = 0; i < samples; i ++ ) + for ( j = 0; j < channels; j++ ) + audio_buffers[ j ][ i ] = *pcm ++; + } + else + { for ( j = 0; j < channels; j++ ) - audio_buffers[ j ][ i ] = *pcm ++; + memset( audio_buffers[ j ], 0, 2 * DV_AUDIO_MAX_SAMPLES ); + } // Encode audio on frame dv_encode_full_audio( encoder, audio_buffers, channels, frequency, dv_frame ); @@ -308,7 +323,7 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra // Temporary - free audio buffers for ( i = 0 ; i < 4; i ++ ) - free( audio_buffers[ i ] ); + mlt_pool_release( audio_buffers[ i ] ); } } @@ -318,7 +333,7 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra static void consumer_output( mlt_consumer this, uint8_t *dv_frame, int size, mlt_frame frame ) { // Get the properties - mlt_properties properties = mlt_consumer_properties( this ); + mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); FILE *output = stdout; char *target = mlt_properties_get( properties, "target" ); @@ -354,7 +369,10 @@ static void *consumer_thread( void *arg ) mlt_consumer this = arg; // Get the properties - mlt_properties properties = mlt_consumer_properties( this ); + mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); + + // Get the terminate_on_pause property + int top = mlt_properties_get_int( properties, "terminate_on_pause" ); // Get the handling methods int ( *video )( mlt_consumer, uint8_t *, mlt_frame ) = mlt_properties_get_data( properties, "video", NULL ); @@ -362,25 +380,33 @@ static void *consumer_thread( void *arg ) int ( *output )( mlt_consumer, uint8_t *, int, mlt_frame ) = mlt_properties_get_data( properties, "output", NULL ); // Allocate a single PAL frame for encoding - uint8_t *dv_frame = malloc( frame_size_625_50 ); + uint8_t *dv_frame = mlt_pool_alloc( FRAME_SIZE_625_50 ); - // Get the service associated to the consumer - mlt_service service = mlt_consumer_service( this ); - - // Define a frame pointer - mlt_frame frame; + // Frame and size + mlt_frame frame = NULL; + int size = 0; // Loop while running while( mlt_properties_get_int( properties, "running" ) ) { // Get the frame - if ( mlt_service_get_frame( service, &frame, 0 ) == 0 ) + frame = mlt_consumer_rt_frame( this ); + + // Check that we have a frame to work with + if ( frame != NULL ) { + // Terminate on pause + if ( top && mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" ) == 0 ) + { + mlt_frame_close( frame ); + break; + } + // Obtain the dv_encoder if ( libdv_get_encoder( this, frame ) != NULL ) { // Encode the image - int size = video( this, dv_frame, frame ); + size = video( this, dv_frame, frame ); // Encode the audio if ( size > 0 ) @@ -400,7 +426,9 @@ static void *consumer_thread( void *arg ) } // Tidy up - free( dv_frame ); + mlt_pool_release( dv_frame ); + + mlt_consumer_stopped( this ); return NULL; } @@ -419,4 +447,3 @@ static void consumer_close( mlt_consumer this ) // Free the memory free( this ); } -