X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fconsumer_libdv.c;h=132cb6de56cc1ad6f399f4db525a2c52eaf0f0aa;hb=6425ff4dd74c65b2f82939647744da49edabe0ce;hp=de64f46767f4c48ae3c7ce6013307fa18849866f;hpb=812170855207691a0ce6fa152cb3d917221eb66f;p=melted diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c index de64f46..132cb6d 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 * @@ -20,6 +20,7 @@ // Local header files #include "consumer_libdv.h" +#include "producer_libdv.h" // mlt Header files #include @@ -60,11 +61,9 @@ mlt_consumer consumer_libdv_init( char *arg ) // 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 ); @@ -100,6 +99,7 @@ static int consumer_start( mlt_consumer this ) { // Allocate a thread pthread_t *thread = calloc( 1, sizeof( pthread_t ) ); + pthread_attr_t thread_attributes; // Assign the thread to properties mlt_properties_set_data( properties, "thread", thread, sizeof( pthread_t ), free, NULL ); @@ -107,8 +107,12 @@ static int consumer_start( mlt_consumer this ) // Set the running state mlt_properties_set_int( properties, "running", 1 ); + // Inherit the scheduling priority + pthread_attr_init( &thread_attributes ); + pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED ); + // Create the thread - pthread_create( thread, NULL, consumer_thread, this ); + pthread_create( thread, &thread_attributes, consumer_thread, this ); } return 0; } @@ -132,6 +136,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; @@ -176,10 +184,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 @@ -201,16 +205,18 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram // 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 @@ -228,19 +234,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 ) { // 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; } @@ -253,6 +261,9 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra // Get the properties of the consumer 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 ); @@ -265,7 +276,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; @@ -273,14 +284,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_double( frame_properties, "fps" ) == ( ( double ) 16.0 / 9.0 ); // 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 ); @@ -289,9 +300,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 ); @@ -305,7 +324,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 ] ); } } @@ -314,8 +333,32 @@ 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 ) { - fwrite( dv_frame, size, 1, stdout ); - fflush( stdout ); + // Get the properties + mlt_properties properties = mlt_consumer_properties( this ); + + FILE *output = stdout; + char *target = mlt_properties_get( properties, "target" ); + + if ( target != NULL ) + { + output = mlt_properties_get_data( properties, "output_file", NULL ); + if ( output == NULL ) + { + output = fopen( target, "w" ); + if ( output != NULL ) + mlt_properties_set_data( properties, "output_file", output, 0, ( mlt_destructor )fclose, 0 ); + } + } + + if ( output != NULL ) + { + fwrite( dv_frame, size, 1, output ); + fflush( output ); + } + else + { + fprintf( stderr, "Unable to open %s\n", target ); + } } /** The main thread - the argument is simply the consumer. @@ -335,25 +378,26 @@ 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 ) { // 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 ) @@ -373,7 +417,7 @@ static void *consumer_thread( void *arg ) } // Tidy up - free( dv_frame ); + mlt_pool_release( dv_frame ); return NULL; } @@ -392,4 +436,3 @@ static void consumer_close( mlt_consumer this ) // Free the memory free( this ); } -