// Create the dv_decoder
this->dv_decoder = dv_decoder_new( FALSE, FALSE, FALSE );
- this->dv_decoder->quality = DV_QUALITY_BEST;
+ this->dv_decoder->quality = DV_QUALITY_COLOR | DV_QUALITY_AC_1;
this->dv_decoder->audio->arg_audio_emphasis = 2;
dv_set_audio_correction( this->dv_decoder, DV_AUDIO_CORRECT_AVERAGE );
// Open the file if specified
this->fd = open( filename, O_RDONLY );
- producer_collect_info( this );
- // Set the resource property (required for all producers)
- mlt_properties_set( properties, "resource", filename );
+ // Collect info
+ if ( this->fd != -1 && producer_collect_info( this ) )
+ {
+ // Set the resource property (required for all producers)
+ mlt_properties_set( properties, "resource", filename );
+ }
+ else
+ {
+ // Reject this file
+ mlt_producer_close( producer );
+ producer = NULL;
+ }
// Return the producer
return producer;
static int producer_collect_info( producer_libdv this )
{
int valid = 0;
- uint8_t *dv_data = malloc( frame_size_625_50 );
+
+ uint8_t *dv_data = mlt_pool_alloc( frame_size_625_50 );
if ( dv_data != NULL )
{
// Calculate default in/out points
double fps = this->is_pal ? 25 : 30000.0 / 1001.0;
- mlt_timecode length = ( mlt_timecode )( this->frames_in_file ) / fps;
- mlt_properties_set_double( properties, "fps", fps );
- mlt_properties_set_timecode( properties, "length", length );
- mlt_properties_set_timecode( properties, "in", 0.0 );
- mlt_properties_set_timecode( properties, "out", length );
+ if ( mlt_properties_get_double( properties, "fps" ) == fps )
+ {
+ mlt_properties_set_position( properties, "length", this->frames_in_file );
+ mlt_properties_set_position( properties, "in", 0 );
+ mlt_properties_set_position( properties, "out", this->frames_in_file - 1 );
+ }
+ else
+ {
+ valid = 0;
+ }
// Parse the header for meta info
- dv_parse_header( this->dv_decoder, data );
+ dv_parse_header( this->dv_decoder, dv_data );
mlt_properties_set_double( properties, "aspect_ratio", dv_format_wide( this->dv_decoder ) ? 16.0/9.0 : 4.0/3.0 );
-
- // Set the speed to normal
- mlt_properties_set_double( properties, "speed", 1 );
}
- free( dv_data );
+ mlt_pool_release( dv_data );
}
return valid;
uint8_t *dv_data = mlt_properties_get_data( properties, "dv_data", NULL );
// Parse the header for meta info
- dv_parse_header( this->dv_decoder, data );
+ dv_parse_header( decoder, dv_data );
// Assign width and height from properties
*width = mlt_properties_get_int( properties, "width" );
if ( *format == mlt_image_yuv422 )
{
// Allocate an image
- uint8_t *image = malloc( *width * *height * 2 );
+ uint8_t *image = mlt_pool_alloc( *width * ( *height + 1 ) * 2 );
// Pass to properties for clean up
- mlt_properties_set_data( properties, "image", image, *width * *height * 2, free, NULL );
+ mlt_properties_set_data( properties, "image", image, *width * ( *height + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL );
// Decode the image
pitches[ 0 ] = *width * 2;
else if ( *format == mlt_image_rgb24 )
{
// Allocate an image
- uint8_t *image = malloc( *width * *height * 3 );
+ uint8_t *image = mlt_pool_alloc( *width * ( *height + 1 ) * 3 );
// Pass to properties for clean up
- mlt_properties_set_data( properties, "image", image, *width * *height * 3, free, NULL );
+ mlt_properties_set_data( properties, "image", image, *width * ( *height + 1 ) * 3, ( mlt_destructor )mlt_pool_release, NULL );
// Decode the frame
pitches[ 0 ] = 720 * 3;
uint8_t *dv_data = mlt_properties_get_data( properties, "dv_data", NULL );
// Parse the header for meta info
- dv_parse_header( this->dv_decoder, data );
+ dv_parse_header( decoder, dv_data );
// Obtain required values
*frequency = decoder->audio->frequency;
// Create a temporary workspace
for ( i = 0; i < 4; i++ )
- audio_channels[ i ] = malloc( DV_AUDIO_MAX_SAMPLES * sizeof( int16_t ) );
+ audio_channels[ i ] = mlt_pool_alloc( DV_AUDIO_MAX_SAMPLES * sizeof( int16_t ) );
// Create a workspace for the result
- *buffer = malloc( *channels * DV_AUDIO_MAX_SAMPLES * sizeof( int16_t ) );
+ *buffer = mlt_pool_alloc( *channels * DV_AUDIO_MAX_SAMPLES * sizeof( int16_t ) );
// Pass the allocated audio buffer as a property
- mlt_properties_set_data( properties, "audio", *buffer, *channels * DV_AUDIO_MAX_SAMPLES * sizeof( int16_t ), free, NULL );
+ mlt_properties_set_data( properties, "audio", *buffer, *channels * DV_AUDIO_MAX_SAMPLES * sizeof( int16_t ), ( mlt_destructor )mlt_pool_release, NULL );
// Decode the audio
dv_decode_full_audio( decoder, dv_data, audio_channels );
// Free the temporary work space
for ( i = 0; i < 4; i++ )
- free( audio_channels[ i ] );
+ mlt_pool_release( audio_channels[ i ] );
return 0;
}
static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index )
{
producer_libdv this = producer->child;
- uint8_t *data = malloc( frame_size_625_50 );
+ uint8_t *data = mlt_pool_alloc( frame_size_625_50 );
// Obtain the current frame number
uint64_t position = mlt_producer_frame( producer );
mlt_properties_set_data( properties, "dv_decoder", this->dv_decoder, 0, NULL, NULL );
// Pass the dv data
- mlt_properties_set_data( properties, "dv_data", data, frame_size_625_50, free, NULL );
+ mlt_properties_set_data( properties, "dv_data", data, frame_size_625_50, ( mlt_destructor )mlt_pool_release, NULL );
// Update other info on the frame
mlt_properties_set_int( properties, "width", 720 );
}
else
{
- free( data );
+ mlt_pool_release( data );
}
// Update timecode on the frame we're creating
- mlt_frame_set_timecode( *frame, mlt_producer_position( producer ) );
+ mlt_frame_set_position( *frame, mlt_producer_position( producer ) );
// Calculate the next timecode
mlt_producer_prepare_next( producer );
producer_libdv this = parent->child;
// Free the dv deconder
- dv_decoder_free( this->dv_decoder );
+ //dv_decoder_free( this->dv_decoder );
// Close the file
- if ( this->fd != 0 )
+ if ( this->fd > 0 )
close( this->fd );
// Close the parent
projects / melted / blobdiff