X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.C;h=75131dca2c878dd1843b7f998bbbf282526e88a0;hb=047485402c380ee034045712121c649ddf89eda4;hp=e031dcdbac7f19e184954f828683cb3eaf386a2a;hpb=85234fcbe5f3411fbff770d91472e13e0800a378;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index e031dcdb..75131dca 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -328,6 +328,8 @@ int FFStream::decode_activate()
 				if( decoder->capabilities & AV_CODEC_CAP_DR1 )
 					avctx->flags |= CODEC_FLAG_EMU_EDGE;
 				avcodec_parameters_to_context(avctx, st->codecpar);
+				if( !av_dict_get(copts, "threads", NULL, 0) )
+					avctx->thread_count = ffmpeg->ff_cpus();
 				ret = avcodec_open2(avctx, decoder, &copts);
 			}
 			if( ret >= 0 ) {
@@ -688,6 +690,7 @@ int FFAudioStream::decode_frame(AVFrame *frame)
 int FFAudioStream::encode_activate()
 {
 	if( writing >= 0 ) return writing;
+	if( !avctx->codec ) return writing = 0;
 	frame_sz = avctx->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE ?
 		10000 : avctx->frame_size;
 	return FFStream::encode_activate();
@@ -1740,8 +1743,11 @@ int FFMPEG::open_decoder()
 			estimated = 1;
 		}
 	}
-	if( estimated )
+	static int notified = 0;
+	if( !notified && estimated ) {
+		notified = 1;
 		printf("FFMPEG::open_decoder: some stream times estimated\n");
+	}
 
 	ff_lock("FFMPEG::open_decoder");
 	int ret = 0, bad_time = 0;
@@ -1907,6 +1913,19 @@ int FFMPEG::open_encoder(const char *type, const char *spec)
 				sprintf(arg, "%d", asset->ff_audio_bitrate);
 				av_dict_set(&sopts, "b", arg, 0);
 			}
+			else if( asset->ff_audio_quality >= 0 ) {
+				ctx->global_quality = asset->ff_audio_quality * FF_QP2LAMBDA;
+				ctx->qmin    = ctx->qmax =  asset->ff_audio_quality;
+				ctx->mb_lmin = ctx->qmin * FF_QP2LAMBDA;
+				ctx->mb_lmax = ctx->qmax * FF_QP2LAMBDA;
+				ctx->flags |= CODEC_FLAG_QSCALE;
+				char arg[BCSTRLEN];
+				av_dict_set(&sopts, "flags", "+qscale", 0);
+				sprintf(arg, "%d", asset->ff_audio_quality);
+				av_dict_set(&sopts, "qscale", arg, 0);
+				sprintf(arg, "%d", ctx->global_quality);
+				av_dict_set(&sopts, "global_quality", arg, 0);
+			}
 			int aidx = ffaudio.size();
 			int fidx = aidx + ffvideo.size();
 			FFAudioStream *aud = new FFAudioStream(this, st, aidx, fidx);
@@ -1983,6 +2002,7 @@ int FFMPEG::open_encoder(const char *type, const char *spec)
 				break;
 			}
 			ctx->time_base = (AVRational) { frame_rate.den, frame_rate.num };
+			st->avg_frame_rate = frame_rate;
 			st->time_base = ctx->time_base;
 			vid->writing = -1;
 			vid->interlaced = asset->interlace_mode == ILACE_MODE_TOP_FIRST ||
@@ -2001,6 +2021,8 @@ int FFMPEG::open_encoder(const char *type, const char *spec)
 		av_dict_set(&sopts, "cin_bitrate", 0, 0);
 		av_dict_set(&sopts, "cin_quality", 0, 0);
 
+		if( !av_dict_get(sopts, "threads", NULL, 0) )
+			ctx->thread_count = ff_cpus();
 		ret = avcodec_open2(ctx, codec, &sopts);
 		if( ret >= 0 ) {
 			ret = avcodec_parameters_from_context(st->codecpar, ctx);
@@ -2528,6 +2550,10 @@ int FFMPEG::ff_video_pid(int stream)
 	return ffvideo[stream]->st->id;
 }
 
+int FFMPEG::ff_video_mpeg_color_range(int stream)
+{
+	return ffvideo[stream]->st->codecpar->color_range == AVCOL_RANGE_MPEG ? 1 : 0;
+}
 
 int FFMPEG::ff_cpus()
 {
@@ -2682,6 +2708,8 @@ int FFMPEG::scan(IndexState *index_state, int64_t *scan_position, int *canceled)
 		}
 		if( ret >= 0 ) {
 			avcodec_parameters_to_context(avctx, st->codecpar);
+			if( !av_dict_get(copts, "threads", NULL, 0) )
+				avctx->thread_count = ff_cpus();
 			ret = avcodec_open2(avctx, decoder, &copts);
 		}
 		av_dict_free(&copts);