X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconsumer_avformat.c;h=87e3f5f8ddfbc097a3a2b77519a364e929613d17;hb=c85a59d0290651bbf938938e7e59407e165f8eed;hp=fd8314c0071a1af8bb19b79d9dd31d609bcd119f;hpb=f6d5dd39ab3fef2895d09a63e2324f70c964663c;p=melted

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index fd8314c..87e3f5f 100644
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -31,6 +31,7 @@
 #include <pthread.h>
 #include <sys/time.h>
 #include <math.h>
+#include <unistd.h>
 
 // avformat header files
 #include <avformat.h>
@@ -314,7 +315,9 @@ static void apply_properties( void *obj, mlt_properties properties, int flags )
 		const char *opt_name = mlt_properties_get_name( properties, i );
 		const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags );
 		if ( opt != NULL )
-#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0)
+#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(7<<8)+0)
+			av_set_string3( obj, opt_name, mlt_properties_get( properties, opt_name), 0, NULL );
+#elif LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0)
 			av_set_string2( obj, opt_name, mlt_properties_get( properties, opt_name), 0 );
 #else
 			av_set_string( obj, opt_name, mlt_properties_get( properties, opt_name) );
@@ -482,6 +485,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
 		c->height = mlt_properties_get_int( properties, "height" );
 		c->time_base.num = mlt_properties_get_int( properties, "frame_rate_den" );
 		c->time_base.den = mlt_properties_get_int( properties, "frame_rate_num" );
+		st->time_base = c->time_base;
 		c->pix_fmt = pix_fmt ? avcodec_get_pix_fmt( pix_fmt ) : PIX_FMT_YUV420P;
 
 		if ( codec_id == CODEC_ID_DVVIDEO )
@@ -497,33 +501,21 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
 			{
 				c->sample_aspect_ratio.num = 10;
 				c->sample_aspect_ratio.den = 11;
-#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)
-				st->sample_aspect_ratio = c->sample_aspect_ratio;
-#endif
 			}
 			else if ( ar == 16.0/15.0 ) // 4:3 PAL
 			{
-				c->sample_aspect_ratio.num = 159;
+				c->sample_aspect_ratio.num = 59;
 				c->sample_aspect_ratio.den = 54;
-#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)
-				st->sample_aspect_ratio = c->sample_aspect_ratio;
-#endif
 			}
 			else if ( ar == 32.0/27.0 ) // 16:9 NTSC
 			{
 				c->sample_aspect_ratio.num = 40;
 				c->sample_aspect_ratio.den = 33;
-#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)
-				st->sample_aspect_ratio = c->sample_aspect_ratio;
-#endif
 			}
 			else // 16:9 PAL
 			{
 				c->sample_aspect_ratio.num = 118;
-				c->sample_aspect_ratio.den = 81;
-#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)
-				st->sample_aspect_ratio = c->sample_aspect_ratio;
-#endif
+				c->sample_aspect_ratio.den = 82;
 			}
 		}
 		else if ( mlt_properties_get( properties, "aspect" ) )
@@ -547,9 +539,6 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
 			// Now compute the sample aspect ratio
 			rational = av_d2q( ar * c->height / c->width, 255 );
 			c->sample_aspect_ratio = rational;
-#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)
-			st->sample_aspect_ratio = c->sample_aspect_ratio;
-#endif
 			// Update the profile and properties as well since this is an alias 
 			// for mlt properties that correspond to profile settings
 			mlt_properties_set_int( properties, "sample_aspect_num", rational.num );
@@ -566,10 +555,10 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
 		{
 			c->sample_aspect_ratio.num = mlt_properties_get_int( properties, "sample_aspect_num" );
 			c->sample_aspect_ratio.den = mlt_properties_get_int( properties, "sample_aspect_den" );
+		}
 #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)
-			st->sample_aspect_ratio = c->sample_aspect_ratio;
+		st->sample_aspect_ratio = c->sample_aspect_ratio;
 #endif
-		}
 
 		if ( mlt_properties_get_double( properties, "qscale" ) > 0 )
 		{
@@ -639,7 +628,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
 			c->flags |= CODEC_FLAG_PASS1;
 		else if ( i == 2 )
 			c->flags |= CODEC_FLAG_PASS2;
-		if ( c->flags & ( CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2 ) )
+		if ( codec_id != CODEC_ID_H264 && ( c->flags & ( CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2 ) ) )
 		{
 			char logfilename[1024];
 			FILE *f;
@@ -666,6 +655,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
 				}
 				else
 				{
+					mlt_properties_set( properties, "_logfilename", logfilename );
 					fseek( f, 0, SEEK_END );
 					size = ftell( f );
 					fseek( f, 0, SEEK_SET );
@@ -1324,6 +1314,28 @@ static void *consumer_thread( void *arg )
 
 	mlt_consumer_stopped( this );
 
+	if ( mlt_properties_get_int( properties, "pass" ) == 2 )
+	{
+		// Remove the dual pass log file
+		if ( mlt_properties_get( properties, "_logfilename" ) )
+			remove( mlt_properties_get( properties, "_logfilename" ) );
+
+		// Remove the x264 dual pass logs
+		char *cwd = getcwd( NULL, 0 );
+		char *file = "x264_2pass.log";
+		char *full = malloc( strlen( cwd ) + strlen( file ) + 2 );
+		sprintf( full, "%s/%s", cwd, file );
+		remove( full );
+		free( full );
+		file = "x264_2pass.log.temp";
+		full = malloc( strlen( cwd ) + strlen( file ) + 2 );
+		sprintf( full, "%s/%s", cwd, file );
+		remove( full );
+		free( full );
+		free( cwd );
+		remove( "x264_2pass.log.temp" );
+	}
+
 	return NULL;
 }