X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fproducer_libdv.c;h=eee02f9ab74123180fe851c19da31e02e5a035fb;hb=30f37b7209c9f2c981113c508321d58ce091619f;hp=a7c10b34dc3a1e8cdf88470c1f2c9e4ad2577f0f;hpb=a07c3da76259d6ba479d800ffecc5617a9ad158f;p=mlt diff --git a/src/modules/dv/producer_libdv.c b/src/modules/dv/producer_libdv.c index a7c10b34..eee02f9a 100644 --- a/src/modules/dv/producer_libdv.c +++ b/src/modules/dv/producer_libdv.c @@ -18,10 +18,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "producer_libdv.h" +#include #include #include #include +#include + #include #include #include @@ -32,6 +34,9 @@ #include #include +#define FRAME_SIZE_525_60 10 * 150 * 80 +#define FRAME_SIZE_625_50 12 * 150 * 80 + /** To conserve resources, we maintain a stack of dv decoders. */ @@ -129,9 +134,9 @@ struct producer_libdv_s static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int index ); static void producer_close( mlt_producer parent ); -static int producer_collect_info( producer_libdv this ); +static int producer_collect_info( producer_libdv this, mlt_profile profile ); -mlt_producer producer_libdv_init( char *filename ) +mlt_producer producer_libdv_init( mlt_profile profile, mlt_service_type type, const char *id, char *filename ) { producer_libdv this = calloc( sizeof( struct producer_libdv_s ), 1 ); @@ -156,7 +161,8 @@ mlt_producer producer_libdv_init( char *filename ) strncasecmp( strrchr( filename, '.' ), ".mov", 4 ) == 0 ) ) { // Load via an alternative mechanism - this->alternative = mlt_factory_producer( "kino", filename ); + mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ); + this->alternative = mlt_factory_producer( profile, "kino", filename ); // If it's unavailable, then clean up if ( this->alternative == NULL ) @@ -171,7 +177,7 @@ mlt_producer producer_libdv_init( char *filename ) this->fd = open( filename, O_RDONLY ); // Collect info - if ( this->fd == -1 || !producer_collect_info( this ) ) + if ( this->fd == -1 || !producer_collect_info( this, profile ) ) destroy = 1; } @@ -195,7 +201,6 @@ static int read_frame( int fd, uint8_t* frame_buf, int *isPAL ) if ( result ) { *isPAL = ( frame_buf[3] & 0x80 ); - if ( *isPAL ) { int diff = FRAME_SIZE_625_50 - FRAME_SIZE_525_60; @@ -206,7 +211,7 @@ static int read_frame( int fd, uint8_t* frame_buf, int *isPAL ) return result; } -static int producer_collect_info( producer_libdv this ) +static int producer_collect_info( producer_libdv this, mlt_profile profile ) { int valid = 0; @@ -220,6 +225,8 @@ static int producer_collect_info( producer_libdv this ) // If it looks like a valid frame, the get stats if ( valid ) { + double aspect_ratio; + // Get the properties mlt_properties properties = MLT_PRODUCER_PROPERTIES( &this->parent ); @@ -240,8 +247,8 @@ 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.0 / 1001.0; - if ( mlt_producer_get_fps( &this->parent ) == fps ) + int fps = 1000 * ( this->is_pal ? 25 : ( 30000.0 / 1001.0 ) ); + if ( ( int )( mlt_profile_fps( profile ) * 1000 ) == fps ) { if ( this->frames_in_file > 0 ) { @@ -257,8 +264,31 @@ static int producer_collect_info( producer_libdv this ) // Parse the header for meta info dv_parse_header( dv_decoder, dv_data ); - mlt_properties_set_double( properties, "aspect_ratio", - dv_format_wide( dv_decoder ) ? ( this->is_pal ? 118.0/81.0 : 40.0/33.0 ) : ( this->is_pal ? 59.0/54.0 : 10.0/11.0 ) ); + if ( this->is_pal ) + { + if ( dv_format_wide( dv_decoder ) ) + aspect_ratio = 64.0 / 45.0; + else + aspect_ratio = 16.0 / 15.0; + } + else + { + if ( dv_format_wide( dv_decoder ) ) + aspect_ratio = 32.0 / 27.0; + else + aspect_ratio = 8 / 9; + } + mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio); + mlt_properties_set_double( properties, "source_fps", this->is_pal ? 25 : ( 30000.0 / 1001.0 ) ); + mlt_properties_set_int( properties, "meta.media.nb_streams", 2 ); + mlt_properties_set_int( properties, "video_index", 0 ); + mlt_properties_set( properties, "meta.media.0.stream.type", "video" ); + mlt_properties_set( properties, "meta.media.0.codec.name", "dvvideo" ); + mlt_properties_set( properties, "meta.media.0.codec.long_name", "DV (Digital Video)" ); + mlt_properties_set_int( properties, "audio_index", 1 ); + mlt_properties_set( properties, "meta.media.1.stream.type", "audio" ); + mlt_properties_set( properties, "meta.media.1.codec.name", "pcm_s16le" ); + mlt_properties_set( properties, "meta.media.1.codec.long_name", "signed 16-bit little-endian PCM" ); // Return the decoder dv_decoder_return( dv_decoder ); @@ -311,7 +341,7 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma 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 + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL ); + mlt_frame_set_image( this, image, *width * ( *height + 1 ) * 2, mlt_pool_release ); // Decode the image pitches[ 0 ] = *width * 2; @@ -328,7 +358,7 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma 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 + 1 ) * 3, ( mlt_destructor )mlt_pool_release, NULL ); + mlt_frame_set_image( this, image, *width * ( *height + 1 ) * 3, mlt_pool_release ); // Decode the frame pitches[ 0 ] = 720 * 3; @@ -346,7 +376,7 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma return 0; } -static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples ) +static int producer_get_audio( mlt_frame this, void **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples ) { int16_t *p; int i, j; @@ -367,20 +397,23 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma // Check that we have audio if ( decoder->audio->num_channels > 0 ) { + int size = *channels * DV_AUDIO_MAX_SAMPLES * sizeof( int16_t ); + // Obtain required values *frequency = decoder->audio->frequency; *samples = decoder->audio->samples_this_frame; *channels = decoder->audio->num_channels; + *format = mlt_audio_s16; // Create a temporary workspace for ( i = 0; i < 4; i++ ) audio_channels[ i ] = mlt_pool_alloc( DV_AUDIO_MAX_SAMPLES * sizeof( int16_t ) ); // Create a workspace for the result - *buffer = mlt_pool_alloc( *channels * DV_AUDIO_MAX_SAMPLES * sizeof( int16_t ) ); + *buffer = mlt_pool_alloc( size ); // Pass the allocated audio buffer as a property - mlt_properties_set_data( properties, "audio", *buffer, *channels * DV_AUDIO_MAX_SAMPLES * sizeof( int16_t ), ( mlt_destructor )mlt_pool_release, NULL ); + mlt_frame_set_audio( this, *buffer, *format, size, mlt_pool_release ); // Decode the audio dv_decode_full_audio( decoder, dv_data, audio_channels ); @@ -427,7 +460,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i data = mlt_pool_alloc( FRAME_SIZE_625_50 ); // Create an empty frame - *frame = mlt_frame_init( ); + *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) ); // Seek and fetch if ( this->fd != 0 && @@ -470,7 +503,10 @@ 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, "real_width", 720 ); + mlt_properties_set_int( properties, "real_height", this->is_pal ? 576 : 480 ); mlt_properties_set_int( properties, "top_field_first", !this->is_pal ? 0 : ( data[ 5 ] & 0x07 ) == 0 ? 0 : 1 ); + mlt_properties_set_int( properties, "colorspace", 601 ); // Parse the header for meta info dv_parse_header( dv_decoder, data ); @@ -479,17 +515,21 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i dv_format_wide( dv_decoder ) ? ( this->is_pal ? 118.0/81.0 : 40.0/33.0 ) : ( this->is_pal ? 59.0/54.0 : 10.0/11.0 ) ); - mlt_properties_set_int( properties, "frequency", dv_decoder->audio->frequency ); - mlt_properties_set_int( properties, "channels", dv_decoder->audio->num_channels ); + mlt_properties_set_int( properties, "audio_frequency", dv_decoder->audio->frequency ); + mlt_properties_set_int( properties, "audio_channels", dv_decoder->audio->num_channels ); - // Hmm - register audio callback - mlt_frame_push_audio( *frame, producer_get_audio ); - - // Push the quality string - mlt_frame_push_service( *frame, mlt_properties_get( MLT_PRODUCER_PROPERTIES( producer ), "quality" ) ); + // Register audio callback + if ( mlt_properties_get_int( MLT_PRODUCER_PROPERTIES( producer ), "audio_index" ) > 0 ) + mlt_frame_push_audio( *frame, producer_get_audio ); - // Push the get_image method on to the stack - mlt_frame_push_get_image( *frame, producer_get_image ); + if ( mlt_properties_get_int( MLT_PRODUCER_PROPERTIES( producer ), "video_index" ) > -1 ) + { + // Push the quality string + mlt_frame_push_service( *frame, mlt_properties_get( MLT_PRODUCER_PROPERTIES( producer ), "quality" ) ); + + // Push the get_image method on to the stack + mlt_frame_push_get_image( *frame, producer_get_image ); + } // Return the decoder dv_decoder_return( dv_decoder );