X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fconsumer_libdv.c;h=1d4fafa107c789fce82f79cda2b5d7e6fb2faa1f;hb=5c299d1ae6f3535df35b3f30bae0476a1ca50aa6;hp=fa1a3260fb41759ab1b768c59736de8a307c8ddc;hpb=510ad0d31115a6a1522911c38555a32d8b0d3945;p=melted diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c index fa1a326..1d4fafa 100644 --- a/src/modules/dv/consumer_libdv.c +++ b/src/modules/dv/consumer_libdv.c @@ -34,6 +34,9 @@ #include // Forward references. +static int consumer_start( mlt_consumer this ); +static int consumer_stop( mlt_consumer this ); +static int consumer_is_stopped( mlt_consumer this ); static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_frame frame ); static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_frame frame ); static void consumer_output( mlt_consumer this, uint8_t *dv_frame, int size, mlt_frame frame ); @@ -54,26 +57,22 @@ mlt_consumer consumer_libdv_init( char *arg ) // Get properties from the consumer mlt_properties properties = mlt_consumer_properties( this ); - // Allocate a thread - pthread_t *thread = calloc( 1, sizeof( pthread_t ) ); - // Assign close callback this->close = consumer_close; - // Assign all properties - 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 ); - mlt_properties_set_data( properties, "thread", thread, sizeof( pthread_t ), free, NULL ); + // 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 ); - // Create the thread (this should not happen immediately) - mlt_properties_set_int( properties, "running", 1 ); - pthread_create( thread, NULL, consumer_thread, this ); + // Set up start/stop/terminated callbacks + this->start = consumer_start; + this->stop = consumer_stop; + this->is_stopped = consumer_is_stopped; } else { @@ -86,6 +85,70 @@ mlt_consumer consumer_libdv_init( char *arg ) return this; } +/** Start the consumer. +*/ + +static int consumer_start( mlt_consumer this ) +{ + // Get the properties + mlt_properties properties = mlt_consumer_properties( this ); + + // Check that we're not already running + if ( !mlt_properties_get_int( properties, "running" ) ) + { + // Allocate a thread + pthread_t *thread = calloc( 1, sizeof( pthread_t ) ); + + // Assign the thread to properties + mlt_properties_set_data( properties, "thread", thread, sizeof( pthread_t ), free, NULL ); + + // Set the running state + mlt_properties_set_int( properties, "running", 1 ); + + // Create the thread + pthread_create( thread, NULL, consumer_thread, this ); + } + return 0; +} + +/** Stop the consumer. +*/ + +static int consumer_stop( mlt_consumer this ) +{ + // Get the properties + mlt_properties properties = mlt_consumer_properties( this ); + + // Check that we're running + if ( mlt_properties_get_int( properties, "running" ) ) + { + // Get the thread + pthread_t *thread = mlt_properties_get_data( properties, "thread", NULL ); + + // Stop the thread + mlt_properties_set_int( properties, "running", 0 ); + + // 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; +} + +/** Determine if the consumer is stopped. +*/ + +static int consumer_is_stopped( mlt_consumer this ) +{ + // Get the properties + mlt_properties properties = mlt_consumer_properties( this ); + return !mlt_properties_get_int( properties, "running" ); +} + /** Get or create a new libdv encoder. */ @@ -115,10 +178,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 @@ -186,6 +245,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 ); @@ -206,14 +268,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 ] = calloc( 1, 2 * DV_AUDIO_MAX_SAMPLES ); // Get the audio mlt_frame_get_audio( frame, &pcm, &fmt, &frequency, &channels, &samples ); @@ -222,9 +284,12 @@ 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 ++ ) - for ( j = 0; j < channels; j++ ) - audio_buffers[ j ][ i ] = *pcm ++; + 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 ++; + } // Encode audio on frame dv_encode_full_audio( encoder, audio_buffers, channels, frequency, dv_frame ); @@ -247,8 +312,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. @@ -270,30 +359,35 @@ static void *consumer_thread( void *arg ) // Allocate a single PAL frame for encoding uint8_t *dv_frame = malloc( 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; - // Loop while running while( mlt_properties_get_int( properties, "running" ) ) { // Get the frame - if ( mlt_service_get_frame( service, &frame, 0 ) == 0 ) - { - // Encode the image - int size = video( this, dv_frame, frame ); - - // Encode the audio - if ( size > 0 ) - audio( this, dv_frame, frame ); - - // Output the frame - output( this, dv_frame, size, frame ); + mlt_frame frame = mlt_consumer_rt_frame( this, mlt_image_yuv422 ); - // Close the frame - mlt_frame_close( frame ); + // 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 ); + + // Encode the audio + if ( size > 0 ) + audio( this, dv_frame, frame ); + + // Output the frame + output( this, dv_frame, size, frame ); + + // Close the frame + mlt_frame_close( frame ); + } + else + { + fprintf( stderr, "Unable to obtain dv encoder.\n" ); + } } } @@ -308,17 +402,8 @@ static void *consumer_thread( void *arg ) static void consumer_close( mlt_consumer this ) { - // Get the properties - mlt_properties properties = mlt_consumer_properties( this ); - - // Get the thread - pthread_t *thread = mlt_properties_get_data( properties, "thread", NULL ); - - // Stop the thread - mlt_properties_set_int( properties, "running", 0 ); - - // Wait for termination - pthread_join( *thread, NULL ); + // Stop the consumer + mlt_consumer_stop( this ); // Close the parent mlt_consumer_close( this );