X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconsumer_avformat.c;h=62339b1e3a9bcaf0b1476a8b70a6b19c2856bfab;hb=1ff2f3c07a8ac0bb4e99e8f6a273ae8ccf938e29;hp=febd134741dc87a02bacf4ac1c485f06f93ead2a;hpb=72815200c65ff4587df5e8da908b9281e044f1ca;p=melted

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index febd134..62339b1 100644
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -158,7 +158,6 @@ mlt_consumer consumer_avformat_init( char *arg )
 		mlt_properties_set_int( properties, "audio_bit_rate", 128000 );
 		mlt_properties_set_int( properties, "video_bit_rate", 200 * 1000 );
 		mlt_properties_set_int( properties, "video_bit_rate_tolerance", 4000 * 1000 );
-		mlt_properties_set_int( properties, "frame_rate_base", 1 );
 		mlt_properties_set_int( properties, "gop_size", 12 );
 		mlt_properties_set_int( properties, "b_frames", 0 );
 		mlt_properties_set_int( properties, "mb_decision", FF_MB_DECISION_SIMPLE );
@@ -323,7 +322,7 @@ static AVStream *add_audio_stream( mlt_consumer this, AVFormatContext *oc, int c
 	// If created, then initialise from properties
 	if ( st != NULL ) 
 	{
-		AVCodecContext *c = &st->codec;
+		AVCodecContext *c = st->codec;
 		c->codec_id = codec_id;
 		c->codec_type = CODEC_TYPE_AUDIO;
 
@@ -331,6 +330,17 @@ static AVStream *add_audio_stream( mlt_consumer this, AVFormatContext *oc, int c
 		c->bit_rate = mlt_properties_get_int( properties, "audio_bit_rate" );
 		c->sample_rate = mlt_properties_get_int( properties, "frequency" );
 		c->channels = mlt_properties_get_int( properties, "channels" );
+
+		// Allow the user to override the audio fourcc
+		if ( mlt_properties_get( properties, "afourcc" ) )
+		{
+			char *tail = NULL;
+			char *arg = mlt_properties_get( properties, "afourcc" );
+    		int tag = strtol( arg, &tail, 0);
+    		if( !tail || *tail )
+        		tag = arg[ 0 ] + ( arg[ 1 ] << 8 ) + ( arg[ 2 ] << 16 ) + ( arg[ 3 ] << 24 );
+			c->codec_tag = tag;
+		}
 	}
 	else
 	{
@@ -346,7 +356,7 @@ static int open_audio( AVFormatContext *oc, AVStream *st, int audio_outbuf_size
 	int audio_input_frame_size = 0;
 
 	// Get the context
-	AVCodecContext *c = &st->codec;
+	AVCodecContext *c = st->codec;
 
 	// Find the encoder
 	AVCodec *codec = avcodec_find_encoder( c->codec_id );
@@ -359,7 +369,7 @@ static int open_audio( AVFormatContext *oc, AVStream *st, int audio_outbuf_size
 		if ( c->frame_size <= 1 ) 
 		{
 			audio_input_frame_size = audio_outbuf_size / c->channels;
-			switch(st->codec.codec_id) 
+			switch(st->codec->codec_id) 
 			{
 				case CODEC_ID_PCM_S16LE:
 				case CODEC_ID_PCM_S16BE:
@@ -392,7 +402,7 @@ static int open_audio( AVFormatContext *oc, AVStream *st, int audio_outbuf_size
 
 static void close_audio( AVFormatContext *oc, AVStream *st )
 {
-	avcodec_close( &st->codec );
+	avcodec_close( st->codec );
 }
 
 /** Add a video output stream 
@@ -408,7 +418,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
 
 	if ( st != NULL ) 
 	{
-		AVCodecContext *c = &st->codec;
+		AVCodecContext *c = st->codec;
 		c->codec_id = codec_id;
 		c->codec_type = CODEC_TYPE_VIDEO;
 
@@ -417,8 +427,8 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
 		c->bit_rate_tolerance = mlt_properties_get_int( properties, "video_bit_rate_tolerance" );
 		c->width = mlt_properties_get_int( properties, "width" );
 		c->height = mlt_properties_get_int( properties, "height" );
-		c->time_base.den = mlt_properties_get_int( properties, "frame_rate_den" );
-		c->time_base.num = mlt_properties_get_int( properties, "frame_rate_num" );
+		c->time_base.num = mlt_properties_get_int( properties, "frame_rate_den" );
+		c->time_base.den = mlt_properties_get_int( properties, "frame_rate_num" );
 		c->gop_size = mlt_properties_get_int( properties, "gop_size" );
 		c->pix_fmt = PIX_FMT_YUV420P;
 
@@ -430,7 +440,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
 		}
 
 	 	c->mb_decision = mlt_properties_get_int( properties, "mb_decision" );
-		c->sample_aspect_ratio = av_d2q( mlt_properties_get_double( properties, "aspect_ratio" ), 255 );
+		c->sample_aspect_ratio = av_d2q( mlt_properties_get_double( properties, "display_ratio" ) * c->height / c->width, 255 );
 		c->mb_cmp = mlt_properties_get_int( properties, "mb_cmp" );
 		c->ildct_cmp = mlt_properties_get_int( properties, "ildct_cmp" );
 		c->me_sub_cmp = mlt_properties_get_int( properties, "sub_cmp" );
@@ -459,10 +469,19 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
 			st->quality = FF_QP2LAMBDA * mlt_properties_get_double( properties, "qscale" );
 		}
 
-		// Some formats want stream headers to be seperate (hmm)
-		if( !strcmp( oc->oformat->name, "mp4" ) || 
-			!strcmp( oc->oformat->name, "mov" ) || 
-			!strcmp( oc->oformat->name, "3gp" ) )
+		// Allow the user to override the video fourcc
+		if ( mlt_properties_get( properties, "vfourcc" ) )
+		{
+			char *tail = NULL;
+			const char *arg = mlt_properties_get( properties, "vfourcc" );
+    		int tag = strtol( arg, &tail, 0);
+    		if( !tail || *tail )
+        		tag = arg[ 0 ] + ( arg[ 1 ] << 8 ) + ( arg[ 2 ] << 16 ) + ( arg[ 3 ] << 24 );
+			c->codec_tag = tag;
+		}
+
+		// Some formats want stream headers to be seperate
+		if ( oc->oformat->flags & AVFMT_GLOBALHEADER ) 
 			c->flags |= CODEC_FLAG_GLOBAL_HEADER;
 
 		c->rc_max_rate = mlt_properties_get_int( properties, "video_rc_max_rate" );
@@ -530,32 +549,11 @@ static AVFrame *alloc_picture( int pix_fmt, int width, int height )
 static int open_video(AVFormatContext *oc, AVStream *st)
 {
 	// Get the codec
-	AVCodecContext *video_enc = &st->codec;
+	AVCodecContext *video_enc = st->codec;
 
 	// find the video encoder
 	AVCodec *codec = avcodec_find_encoder( video_enc->codec_id );
 
-	if( codec && codec->supported_framerates )
-	{
-		const AVRational *p = codec->supported_framerates;
-		AVRational req = ( AVRational ){ video_enc->time_base.den, video_enc->time_base.num };
-		const AVRational *best = NULL;
-		AVRational best_error = (AVRational){ INT_MAX, 1 };
-		for( ; p->den!=0; p++ )
-		{
-			AVRational error= av_sub_q( req, *p );
-			if( error.num < 0 ) 
-				error.num *= -1;
-			if( av_cmp_q( error, best_error ) < 0 )
-			{
-				best_error = error;
-				best = p;
-			}
-		}
-		video_enc->time_base.den = best->num;
-		video_enc->time_base.num = best->den;
-	}
- 
 	if( codec && codec->pix_fmts )
 	{
 		const enum PixelFormat *p = codec->pix_fmts;
@@ -574,7 +572,7 @@ static int open_video(AVFormatContext *oc, AVStream *st)
 
 void close_video(AVFormatContext *oc, AVStream *st)
 {
-	avcodec_close(&st->codec);
+	avcodec_close(st->codec);
 }
 
 static inline long time_difference( struct timeval *time1 )
@@ -772,7 +770,7 @@ static void *consumer_thread( void *arg )
 
 	// Allocate picture
 	if ( video_st )
-		output = alloc_picture( video_st->codec.pix_fmt, width, height );
+		output = alloc_picture( video_st->codec->pix_fmt, width, height );
 
 	// Last check - need at least one stream
 	if ( audio_st == NULL && video_st == NULL )
@@ -849,7 +847,7 @@ static void *consumer_thread( void *arg )
 					AVPacket pkt;
 					av_init_packet( &pkt );
 
-					c = &audio_st->codec;
+					c = audio_st->codec;
 
 					sample_fifo_fetch( fifo, buffer, channels * audio_input_frame_size );
 
@@ -881,7 +879,7 @@ static void *consumer_thread( void *arg )
 					frame = mlt_deque_pop_front( queue );
 					frame_properties = MLT_FRAME_PROPERTIES( frame );
 
-					c = &video_st->codec;
+					c = video_st->codec;
  					
 					if ( mlt_properties_get_int( frame_properties, "rendered" ) )
 					{
@@ -914,7 +912,7 @@ static void *consumer_thread( void *arg )
 							}
 						}
 
-						img_convert( ( AVPicture * )output, video_st->codec.pix_fmt, ( AVPicture * )input, PIX_FMT_YUV422, width, height );
+						img_convert( ( AVPicture * )output, video_st->codec->pix_fmt, ( AVPicture * )input, PIX_FMT_YUV422, width, height );
 					}
  
  					if (oc->oformat->flags & AVFMT_RAWPICTURE) 
@@ -947,7 +945,7 @@ static void *consumer_thread( void *arg )
 
 							if ( c->coded_frame )
 								pkt.pts= av_rescale_q( c->coded_frame->pts, c->time_base, video_st->time_base );
-							if(c->coded_frame->key_frame)
+							if( c->coded_frame && c->coded_frame->key_frame )
 								pkt.flags |= PKT_FLAG_KEY;
 							pkt.stream_index= video_st->index;
 							pkt.data= video_outbuf;