X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fproducer_avformat.c;h=c8fe492d6e9f1230d7f97d45432dfa61542c4802;hb=d7ae73d25cf5a38a3a8153ae52409fcbef16bb22;hp=b1631f6f369dbcfc364e6e499d0cad258376f758;hpb=b6a2f96c4bb16dcbb03d45f90a8b833f3c6dda8e;p=melted

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index b1631f6..c8fe492 100644
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -309,7 +309,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 	int ignore = 0;
 
 	// Current time calcs
-	double current_time = 0;
+	double current_time = mlt_properties_get_double( properties, "current_time" );
 
 	// We may want to use the source fps if available
 	double source_fps = mlt_properties_get_double( properties, "source_fps" );
@@ -358,7 +358,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 			av_seek_frame( context, -1, real_timecode * 1000000.0 );
 	
 			// Remove the cached info relating to the previous position
-			mlt_properties_set_double( properties, "current_time", 0 );
+			mlt_properties_set_double( properties, "current_time", real_timecode );
 			mlt_properties_set_data( properties, "current_image", NULL, 0, NULL, NULL );
 		}
 	}
@@ -395,13 +395,16 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 			// We only deal with video from the selected video_index
 			if ( ret >= 0 && pkt.stream_index == index && pkt.size > 0 )
 			{
-				current_time = ( double )pkt.pts / 1000000.0;
-
 				// Decode the image
 				ret = avcodec_decode_video( codec_context, &frame, &got_picture, pkt.data, pkt.size );
 
 				if ( got_picture )
 				{
+					if ( pkt.pts != AV_NOPTS_VALUE && pkt.pts != 0  )
+						current_time = ( double )pkt.pts / 1000000.0;
+					else
+						current_time = real_timecode;
+
 					// Handle ignore
 					if ( current_time < real_timecode )
 					{
@@ -410,9 +413,10 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 					}
 					else if ( current_time >= real_timecode )
 					{
+						//current_time = real_timecode;
 						ignore = 0;
 					}
-					else if ( got_picture && ignore -- )
+					else if ( ignore -- )
 					{
 						got_picture = 0;
 					}
@@ -444,9 +448,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 			{
 				register int i, j;
 				register int half = *width >> 1;
-				uint8_t *Y = ( ( AVPicture * )&frame )->data[ 0 ];
-				uint8_t *U = ( ( AVPicture * )&frame )->data[ 1 ];
-				uint8_t *V = ( ( AVPicture * )&frame )->data[ 2 ];
+				register uint8_t *Y = ( ( AVPicture * )&frame )->data[ 0 ];
+				register uint8_t *U = ( ( AVPicture * )&frame )->data[ 1 ];
+				register uint8_t *V = ( ( AVPicture * )&frame )->data[ 2 ];
 				register uint8_t *d = *buffer;
 				register uint8_t *y, *u, *v;
 
@@ -554,33 +558,8 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame )
 			// If we don't have a codec and we can't initialise it, we can't do much more...
 			if ( codec != NULL && avcodec_open( codec_context, codec ) >= 0 )
 			{
-				double aspect_ratio = 0;
-				double source_fps = 0;
-
-				// Set aspect ratio
-				if ( codec_context->sample_aspect_ratio.num == 0) 
-					aspect_ratio = 0;
-				else
-					aspect_ratio = av_q2d( codec_context->sample_aspect_ratio ) * codec_context->width / codec_context->height;
-
-        		if (aspect_ratio <= 0.0)
-					aspect_ratio = ( double )codec_context->width / ( double )codec_context->height;
-
-				mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
-				fprintf( stderr, "AVFORMAT: sample aspect %f\n", aspect_ratio );
-
-				// Determine the fps
-				source_fps = ( double )codec_context->frame_rate / codec_context->frame_rate_base;
-
-				// We'll use fps if it's available
-				if ( source_fps > 0 && source_fps < 30 )
-					mlt_properties_set_double( properties, "source_fps", source_fps );
-
 				// Now store the codec with its destructor
 				mlt_properties_set_data( properties, "video_codec", codec_context, 0, producer_codec_close, NULL );
-
-				// Set to the real timecode
-				av_seek_frame( context, -1, 0 );
 			}
 			else
 			{
@@ -592,8 +571,32 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame )
 		// No codec, no show...
 		if ( codec != NULL )
 		{
+			double aspect_ratio = 0;
+			double source_fps = 0;
+
+			// Set aspect ratio
+			if ( codec_context->sample_aspect_ratio.num == 0 )
+				aspect_ratio = 0;
+			else
+				aspect_ratio = av_q2d( codec_context->sample_aspect_ratio ) * codec_context->width / codec_context->height;
+
+			// XXX: This assumes square pixels!
+       		if (aspect_ratio <= 0.0)
+				aspect_ratio = ( double )codec_context->width / ( double )codec_context->height;
+				
+			mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
+			//fprintf( stderr, "AVFORMAT: sample aspect %f computed display aspect %f\n", av_q2d( codec_context->sample_aspect_ratio ), aspect_ratio );
+
+			// Determine the fps
+			source_fps = ( double )codec_context->frame_rate / codec_context->frame_rate_base;
+
+			// We'll use fps if it's available
+			if ( source_fps > 0 && source_fps < 30 )
+				mlt_properties_set_double( properties, "source_fps", source_fps );
+
 			mlt_frame_push_get_image( frame, producer_get_image );
 			mlt_properties_set_data( frame_properties, "avformat_producer", this, 0, NULL, NULL );
+
 		}
 		else
 		{
@@ -786,7 +789,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
 					mlt_properties_set_double( properties, "discrepancy", discrepancy );
 				}
 
-				if ( discrepancy * current_pts <= ( real_timecode - 0.02 ) )
+				if ( !ignore && discrepancy * current_pts <= ( real_timecode - 0.02 ) )
 					ignore = 1;
 			}