X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fconsumer_libdv.c;h=f6c468e33715ca0e4544586ac62e402fb5f0a933;hb=40b169c095486ba1b868486eb98a47c41f36ce8c;hp=1ca825f7ce908cf17c76831864273536dab406de;hpb=a01e64529a0e9d097bce26715a45fd4bb3de3538;p=melted diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c index 1ca825f..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,7 +56,7 @@ 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; @@ -69,6 +70,9 @@ mlt_consumer consumer_libdv_init( char *arg ) 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; @@ -91,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" ) ) @@ -117,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" ) ) @@ -145,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" ); } @@ -155,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 ); @@ -194,13 +198,13 @@ 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; // Is the image rendered - int rendered = mlt_properties_get_int( mlt_frame_properties( frame ), "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" ); @@ -214,6 +218,7 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram 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,7 +233,7 @@ 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 @@ -241,7 +246,7 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram 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; + size = height == 576 ? FRAME_SIZE_625_50 : FRAME_SIZE_525_60; } return size; @@ -253,10 +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 ); + mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame ); // Obtain the dv_encoder dv_encoder_t *encoder = libdv_get_encoder( this, frame ); @@ -270,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; @@ -278,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 = mlt_properties_get_double( frame_properties, "fps" ) == ( ( double ) 16.0 / 9.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 ] = calloc( 1, 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 ); @@ -300,6 +305,11 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra for ( j = 0; j < channels; j++ ) audio_buffers[ j ][ i ] = *pcm ++; } + else + { + for ( j = 0; j < channels; j++ ) + 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 ); @@ -313,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 ] ); } } @@ -323,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" ); @@ -359,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 ); @@ -367,7 +380,7 @@ 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 ); // Frame and size mlt_frame frame = NULL; @@ -382,6 +395,13 @@ static void *consumer_thread( void *arg ) // 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 ) { @@ -406,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; } @@ -425,4 +447,3 @@ static void consumer_close( mlt_consumer this ) // Free the memory free( this ); } -