{
producer_libdv this = calloc( sizeof( struct producer_libdv_s ), 1 );
- if ( this != NULL && mlt_producer_init( &this->parent, this ) == 0 )
+ if ( filename != NULL && this != NULL && mlt_producer_init( &this->parent, this ) == 0 )
{
mlt_producer producer = &this->parent;
+ mlt_properties properties = mlt_producer_properties( producer );
// Register transport implementation with the producer
producer->close = producer_close;
dv_set_audio_correction( this->dv_decoder, DV_AUDIO_CORRECT_AVERAGE );
// Open the file if specified
- if ( filename != NULL )
+ this->fd = open( filename, O_RDONLY );
+
+ // 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
{
- this->fd = open( filename, O_RDONLY );
- producer_collect_info( this );
+ // Reject this file
+ mlt_producer_close( producer );
+ producer = NULL;
}
// Return the producer
static int producer_collect_info( producer_libdv this )
{
int valid = 0;
+ // IRRIGATE ME
uint8_t *dv_data = malloc( frame_size_625_50 );
if ( dv_data != NULL )
this->frames_in_file = this->file_size / this->frame_size;
// Calculate default in/out points
- double fps = this->is_pal ? 25 : 30000 / 1001;
- 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 );
-
- // Set the speed to normal
- mlt_properties_set_double( properties, "speed", 1 );
+ double fps = this->is_pal ? 25 : 30000.0 / 1001.0;
+ 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, dv_data );
+ mlt_properties_set_double( properties, "aspect_ratio", dv_format_wide( this->dv_decoder ) ? 16.0/9.0 : 4.0/3.0 );
}
free( dv_data );
// Get the dv data
uint8_t *dv_data = mlt_properties_get_data( properties, "dv_data", NULL );
+ // Parse the header for meta info
+ dv_parse_header( decoder, dv_data );
+
// Assign width and height from properties
*width = mlt_properties_get_int( properties, "width" );
*height = mlt_properties_get_int( properties, "height" );
if ( *format == mlt_image_yuv422 )
{
// Allocate an image
- uint8_t *image = malloc( *width * *height * 2 );
+ // IRRIGATE ME
+ uint8_t *image = malloc( *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, free, NULL );
// Decode the image
pitches[ 0 ] = *width * 2;
else if ( *format == mlt_image_rgb24 )
{
// Allocate an image
- uint8_t *image = malloc( *width * *height * 3 );
+ // IRRIGATE ME
+ uint8_t *image = malloc( *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, free, NULL );
// Decode the frame
pitches[ 0 ] = 720 * 3;
// Get the dv data
uint8_t *dv_data = mlt_properties_get_data( properties, "dv_data", NULL );
+ // Parse the header for meta info
+ dv_parse_header( decoder, dv_data );
+
// Obtain required values
+ //fprintf( stderr, "libdv: frequency %d\n", decoder->audio->frequency );
*frequency = decoder->audio->frequency;
*samples = decoder->audio->samples_this_frame;
*channels = decoder->audio->num_channels;
// Parse the header for meta info
dv_parse_header( this->dv_decoder, data );
mlt_properties_set_int( properties, "progressive", dv_is_progressive( this->dv_decoder ) );
- mlt_properties_set_double( properties, "display_aspect", dv_format_wide( this->dv_decoder ) ? 16.0/9.0 : 4.0/3.0 );
+ mlt_properties_set_double( properties, "aspect_ratio", dv_format_wide( this->dv_decoder ) ? 16.0/9.0 : 4.0/3.0 );
// Hmm - register audio callback
( *frame )->get_audio = producer_get_audio;
}
// 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