X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fproducer_libdv.c;h=6ab349c403924776066bd2a7488b0ebc6236ec24;hb=e727806e894128be3004502eee4d41537fb31c7d;hp=9ed89780d7eb0e53bfbdbd378111f15f5a68fa34;hpb=2c0cf75e5da5906e48c5a6398bd48d04501283b9;p=melted

diff --git a/src/modules/dv/producer_libdv.c b/src/modules/dv/producer_libdv.c
index 9ed8978..6ab349c 100644
--- a/src/modules/dv/producer_libdv.c
+++ b/src/modules/dv/producer_libdv.c
@@ -76,15 +76,13 @@ dv_decoder_t *dv_decoder_alloc( )
 
 			// Configure the decoder
 			this = dv_decoder_new( FALSE, FALSE, FALSE );
-			this->quality = DV_QUALITY_COLOR | DV_QUALITY_AC_1;
+			this->quality = DV_QUALITY_COLOR | DV_QUALITY_AC_2;
 			this->audio->arg_audio_emphasis = 2;
 			dv_set_audio_correction( this, DV_AUDIO_CORRECT_AVERAGE );
 
 			// Register it with the properties to ensure clean up
-			// BUG: dv_decoder_free core dumps here
 			sprintf( label, "%p", this );
-			//mlt_properties_set_data( dv_decoders, label, this, 0, ( mlt_destructor )dv_decoder_free, NULL );
-			mlt_properties_set_data( dv_decoders, label, this, 0, NULL, NULL );
+			mlt_properties_set_data( dv_decoders, label, this, 0, ( mlt_destructor )dv_decoder_free, NULL );
 		}
 	}
 
@@ -141,7 +139,7 @@ mlt_producer producer_libdv_init( char *filename )
 		mlt_properties properties = mlt_producer_properties( producer );
 
 		// Register transport implementation with the producer
-		producer->close = producer_close;
+		producer->close = ( mlt_destructor )producer_close;
 
 		// Register our get_frame implementation with the producer
 		producer->get_frame = producer_get_frame;
@@ -171,15 +169,15 @@ mlt_producer producer_libdv_init( char *filename )
 
 static int read_frame( int fd, uint8_t* frame_buf, int *isPAL )
 {
-	int result = read( fd, frame_buf, frame_size_525_60 ) == frame_size_525_60;
+	int result = read( fd, frame_buf, FRAME_SIZE_525_60 ) == FRAME_SIZE_525_60;
 	if ( result )
 	{
 		*isPAL = ( frame_buf[3] & 0x80 );
 
 		if ( *isPAL )
 		{
-			int diff = frame_size_625_50 - frame_size_525_60;
-			result = read( fd, frame_buf + frame_size_525_60, diff ) == diff;
+			int diff = FRAME_SIZE_625_50 - FRAME_SIZE_525_60;
+			result = read( fd, frame_buf + FRAME_SIZE_525_60, diff ) == diff;
 		}
 	}
 	
@@ -190,7 +188,7 @@ static int producer_collect_info( producer_libdv this )
 {
 	int valid = 0;
 
-	uint8_t *dv_data = mlt_pool_alloc( frame_size_625_50 );
+	uint8_t *dv_data = mlt_pool_alloc( FRAME_SIZE_625_50 );
 
 	if ( dv_data != NULL )
 	{
@@ -214,7 +212,7 @@ static int producer_collect_info( producer_libdv this )
 			this->file_size = buf.st_size;
 
 			// Determine the frame size
-			this->frame_size = this->is_pal ? frame_size_625_50 : frame_size_525_60;
+			this->frame_size = this->is_pal ? FRAME_SIZE_625_50 : FRAME_SIZE_525_60;
 
 			// Determine the number of frames in the file
 			this->frames_in_file = this->file_size / this->frame_size;
@@ -223,9 +221,12 @@ static int producer_collect_info( producer_libdv this )
 			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 );
+				if ( this->frames_in_file > 0 )
+				{
+					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
 			{
@@ -386,7 +387,7 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma
 static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index )
 {
 	producer_libdv this = producer->child;
-	uint8_t *data = mlt_pool_alloc( 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 );
@@ -409,16 +410,16 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 		dv_decoder_t *dv_decoder = dv_decoder_alloc( );
 
 		// Pass the dv data
-		mlt_properties_set_data( properties, "dv_data", data, frame_size_625_50, ( mlt_destructor )mlt_pool_release, 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 );
 		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_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 ) );