move audio sample calculator to mlt_frame and use from ffmpeg and mcmpeg, add mlt_fra...

[melted] / mlt / src / modules / dv / producer_libdv.c

diff --git a/mlt/src/modules/dv/producer_libdv.c b/mlt/src/modules/dv/producer_libdv.c
index 5d2c768..f3d63a6 100644 (file)
--- a/mlt/src/modules/dv/producer_libdv.c
+++ b/mlt/src/modules/dv/producer_libdv.c
@@ -51,9 +51,10 @@ mlt_producer producer_libdv_init( char *filename )
 {
        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;
@@ -68,11 +69,11 @@ mlt_producer producer_libdv_init( char *filename )
                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 );
-                       producer_collect_info( this );
-               }
+               this->fd = open( filename, O_RDONLY );
+               producer_collect_info( this );
+
+               // Set the resource property (required for all producers)
+               mlt_properties_set( properties, "resource", filename );
 
                // Return the producer
                return producer;
@@ -128,14 +129,17 @@ static int producer_collect_info( producer_libdv this )
                        this->frames_in_file = this->file_size / this->frame_size;
 
                        // Calculate default in/out points
-                       double fps = this->is_pal ? 25 : 30000 / 1001;
+                       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, "playtime", length );
                        mlt_properties_set_timecode( properties, "length", length );
                        mlt_properties_set_timecode( properties, "in", 0.0 );
                        mlt_properties_set_timecode( properties, "out", length );
 
+                       // Parse the header for meta info
+                       dv_parse_header( this->dv_decoder, 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 );
                }
@@ -146,49 +150,6 @@ static int producer_collect_info( producer_libdv this )
        return valid;
 }
 
-#if 0
-static int mc_producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
-{
-       // Get the frames properties
-       mlt_properties properties = mlt_frame_properties( this );
-
-       // Get the dv data
-       uint8_t *dv_data = mlt_properties_get_data( properties, "dv_data", NULL );
-
-       // Determine bytes in frame
-       int bytes_in_frame = dv_data[ 3 ] & 0x80 ? frame_size_625_50 : frame_size_525_60;
-
-       // 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 image
-               *buffer = malloc( *width * *height * 2 );
-
-               // Decompress
-               DecompressBuffer_DV( dv_data, bytes_in_frame, *buffer, *width * 2, *width, *height, 0, FOURCC_YUYV, 0, NULL );
-
-               // Set the image on the properties
-               mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, free, NULL );
-       }
-       else
-       {
-               // Allocate image
-               *buffer = malloc( *width * *height * 3 );
-
-               // Decompress
-               DecompressBuffer_DV( dv_data, bytes_in_frame, *buffer, *width * 3, *width, *height, 0, FOURCC_R24C, 0, NULL );
-
-               // Set the image on the properties
-               mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, free, NULL );
-       }
-
-       return 0;
-}
-#endif
-
 static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
 {
        int pitches[3] = { 0, 0, 0 };
@@ -203,13 +164,13 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
        // 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( this->dv_decoder, data );
+       
        // Assign width and height from properties
        *width = mlt_properties_get_int( properties, "width" );
        *height = mlt_properties_get_int( properties, "height" );
 
-       // Parse the header
-       dv_parse_header( decoder, dv_data );
-
        // Extract an image of the format requested
        if ( *format == mlt_image_yuv422 )
        {
@@ -263,7 +224,7 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma
        uint8_t *dv_data = mlt_properties_get_data( properties, "dv_data", NULL );
 
        // Parse the header for meta info
-       dv_parse_header( decoder, dv_data );
+       dv_parse_header( this->dv_decoder, data );
 
        // Obtain required values
        *frequency = decoder->audio->frequency;
@@ -327,6 +288,12 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
                // Update other info on the frame
                mlt_properties_set_int( properties, "width", 720 );
                mlt_properties_set_int( properties, "height", this->is_pal ? 576 : 480 );
+               mlt_properties_set_int( properties, "top_field_first", 0 );
+               
+               // 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, "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;