X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.C;h=66003120eebb2e663947902dacedda0a295f50c7;hb=be678a5c5c4ec7dd15b9f49e4f476375f98649e0;hp=511d37dd58944ea94f5f001c84639fb88083216a;hpb=ea0dfe3cd57bb60ef824cd0d3512fcd251020c76;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 511d37dd..66003120 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 ) {
@@ -396,9 +398,7 @@ int FFStream::decode(AVFrame *frame)
 
 int FFStream::load_filter(AVFrame *frame)
 {
-	av_frame_unref(frame);
-	int ret = av_buffersrc_add_frame_flags(buffersrc_ctx,
-			frame, AV_BUFFERSRC_FLAG_KEEP_REF);
+	int ret = av_buffersrc_add_frame_flags(buffersrc_ctx, frame, 0);
 	if( ret < 0 )
 		eprintf(_("av_buffersrc_add_frame_flags failed\n"));
 	return ret;
@@ -690,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();
@@ -1985,6 +1986,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 ||
@@ -2003,6 +2005,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);
@@ -2530,6 +2534,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()
 {
@@ -2684,6 +2692,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);