X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fproducer_libdv.c;h=0ab10e08e665bbc8c6b65fc85c6701673d6f2d09;hb=eae86b6ff2d11421e4839ffbe79c4c547d15751a;hp=249213d278943e31d30c18e95ee5ff271838d240;hpb=a420b41a9a0771635b340649961f9fb69d3774fe;p=melted

diff --git a/src/modules/dv/producer_libdv.c b/src/modules/dv/producer_libdv.c
index 249213d..0ab10e0 100644
--- a/src/modules/dv/producer_libdv.c
+++ b/src/modules/dv/producer_libdv.c
@@ -79,6 +79,7 @@ dv_decoder_t *dv_decoder_alloc( )
 			this->quality = DV_QUALITY_COLOR | DV_QUALITY_AC_2;
 			this->audio->arg_audio_emphasis = 2;
 			dv_set_audio_correction( this, DV_AUDIO_CORRECT_AVERAGE );
+			dv_set_error_log( this, NULL );
 
 			// Register it with the properties to ensure clean up
 			sprintf( label, "%p", this );
@@ -136,7 +137,7 @@ mlt_producer producer_libdv_init( char *filename )
 	if ( filename != NULL && this != NULL && mlt_producer_init( &this->parent, this ) == 0 )
 	{
 		mlt_producer producer = &this->parent;
-		mlt_properties properties = mlt_producer_properties( producer );
+		mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
 
 		// Register transport implementation with the producer
 		producer->close = ( mlt_destructor )producer_close;
@@ -199,7 +200,7 @@ static int producer_collect_info( producer_libdv this )
 		if ( valid )
 		{
 			// Get the properties
-			mlt_properties properties = mlt_producer_properties( &this->parent );
+			mlt_properties properties = MLT_PRODUCER_PROPERTIES( &this->parent );
 
 			// Get a dv_decoder
 			dv_decoder_t *dv_decoder = dv_decoder_alloc( );
@@ -236,7 +237,7 @@ 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 ? 512.0/351.0 : 96.0/79.0 ) : ( this->is_pal ? 128.0/117.0 : 72.0/79.0 ) );
+				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 ) );
 
 			// Return the decoder
 			dv_decoder_return( dv_decoder );
@@ -254,7 +255,7 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
 	uint8_t *pixels[3] = { NULL, NULL, NULL };
 	
 	// Get the frames properties
-	mlt_properties properties = mlt_frame_properties( this );
+	mlt_properties properties = MLT_FRAME_PROPERTIES( this );
 
 	// Get a dv_decoder
 	dv_decoder_t *decoder = dv_decoder_alloc( );
@@ -329,7 +330,7 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma
 	int16_t *audio_channels[ 4 ];
 	
 	// Get the frames properties
-	mlt_properties properties = mlt_frame_properties( this );
+	mlt_properties properties = MLT_FRAME_PROPERTIES( this );
 
 	// Get a dv_decoder
 	dv_decoder_t *decoder = dv_decoder_alloc( );
@@ -374,7 +375,6 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma
 	else
 	{
 		// No audio available on the frame, so get test audio (silence)
-		this->get_audio = NULL;
 		mlt_frame_get_audio( this, buffer, format, frequency, channels, samples );
 	}
 
@@ -404,7 +404,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 		 read_frame( this->fd, data, &this->is_pal ) )
 	{
 		// Get the frames properties
-		mlt_properties properties = mlt_frame_properties( *frame );
+		mlt_properties properties = MLT_FRAME_PROPERTIES( *frame );
 
 		// Get a dv_decoder
 		dv_decoder_t *dv_decoder = dv_decoder_alloc( );
@@ -415,19 +415,19 @@ 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 );
+		mlt_properties_set_int( properties, "top_field_first", !this->is_pal ? 0 : ( data[ 5 ] & 0x07 ) == 0 ? 0 : 1 );
 
 		// Parse the header for meta info
 		dv_parse_header( dv_decoder, data );
 		//mlt_properties_set_int( properties, "progressive", dv_is_progressive( dv_decoder ) );
 		mlt_properties_set_double( properties, "aspect_ratio", 
-			dv_format_wide( dv_decoder ) ? ( this->is_pal ? 512.0/351.0 : 96.0/79.0 ) : ( this->is_pal ? 128.0/117.0 : 72.0/79.0 ) );
+			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 ) );
 
 		// Hmm - register audio callback
-		( *frame )->get_audio = producer_get_audio;
+		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" ) );
+		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 );