// 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 );
// 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;
// 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
// 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;
- if ( mlt_properties_get( this_properties, "rescale" ) != NULL )
- mlt_properties_set( mlt_frame_properties( frame ), "rescale.interp", mlt_properties_get( this_properties, "rescale" ) );
-
// Get the image
mlt_frame_get_image( frame, &image, &fmt, &width, &height, 0 );
}
// 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;
}
// 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 );
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 );
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 );
// 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;
+ // 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 )