X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.C;h=c536a2652291595c3f2c7b12e3c4e00eac2a9ee2;hp=dcbb49c63d4eeee18333df5bbacac178112e0d39;hb=667ff598ae2a94f48c7056aee1d77d7cde39066b;hpb=9304882bd349ce15be054efb7cdcf69a0829f0f9

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index dcbb49c6..c536a265 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -33,6 +33,7 @@
 #define AUDIO_INBUF_SIZE 0x10000
 #define VIDEO_REFILL_THRESH 0
 #define AUDIO_REFILL_THRESH 0x1000
+#define AUDIO_MIN_FRAME_SZ 128
 
 Mutex FFMPEG::fflock("FFMPEG::fflock");
 
@@ -327,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 ) {
@@ -395,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;
@@ -588,6 +589,7 @@ FFAudioStream::FFAudioStream(FFMPEG *ffmpeg, AVStream *strm, int idx, int fidx)
 	channel0 = channels = 0;
 	sample_rate = 0;
 	mbsz = 0;
+	frame_sz = AUDIO_MIN_FRAME_SZ;
 	length = 0;
 	resample_context = 0;
 	swr_ichs = swr_ifmt = swr_irate = 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();
@@ -732,14 +735,13 @@ int FFAudioStream::load(int64_t pos, int len)
 	}
 	if( mbsz < len ) mbsz = len;
 	int64_t end_pos = pos + len;
-	int ret = 0;
-	for( int i=0; ret>=0 && !flushed && curr_pos<end_pos && i<MAX_RETRY; ++i ) {
+	int ret = 0, i = len / frame_sz + MAX_RETRY;
+	while( ret>=0 && !flushed && curr_pos<end_pos && --i>=0 ) {
 		ret = read_frame(frame);
-		if( ret > 0 ) {
+		if( ret > 0 && frame->nb_samples > 0 ) {
 			init_swr(frame->channels, frame->format, frame->sample_rate);
 			load_history(&frame->extended_data[0], frame->nb_samples);
 			curr_pos += frame->nb_samples;
-			i = 0;
 		}
 	}
 	if( end_pos > curr_pos ) {
@@ -867,9 +869,10 @@ int FFVideoStream::load(VFrame *vframe, int64_t pos)
 		fprintf(stderr, "FFVideoStream::load: av_frame_alloc failed\n");
 		return -1;
 	}
-	for( int i=0; ret>=0 && !flushed && curr_pos<=pos && i<MAX_RETRY; ++i ) {
+	int i = MAX_RETRY + pos - curr_pos;
+	while( ret>=0 && !flushed && curr_pos<=pos && --i>=0 ) {
 		ret = read_frame(frame);
-		if( ret > 0 ) { ++curr_pos;  i = 0; }
+		if( ret > 0 ) ++curr_pos;
 	}
 	if( frame->format == AV_PIX_FMT_NONE || frame->width <= 0 || frame->height <= 0 )
 		ret = -1;
@@ -2001,6 +2004,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);
@@ -2113,7 +2118,8 @@ int FFMPEG::decode_activate()
 				if( st->start_time == AV_NOPTS_VALUE ) continue;
 				int vidx = ffvideo.size();
 				while( --vidx >= 0 && ffvideo[vidx]->fidx != i );
-				if( vidx >= 0 && ffvideo[vidx]->nudge != AV_NOPTS_VALUE ) continue;
+				if( vidx < 0 ) continue;
+				if( ffvideo[vidx]->nudge != AV_NOPTS_VALUE ) continue;
 				if( vstart_time < st->start_time )
 					vstart_time = st->start_time;
 				break; }
@@ -2121,7 +2127,10 @@ int FFMPEG::decode_activate()
 				if( st->start_time == AV_NOPTS_VALUE ) continue;
 				int aidx = ffaudio.size();
 				while( --aidx >= 0 && ffaudio[aidx]->fidx != i );
-				if( aidx >= 0 && ffaudio[aidx]->nudge != AV_NOPTS_VALUE ) continue;
+				if( aidx < 0 ) continue;
+				if( ffaudio[aidx]->frame_sz < avpar->frame_size )
+					ffaudio[aidx]->frame_sz = avpar->frame_size;
+				if( ffaudio[aidx]->nudge != AV_NOPTS_VALUE ) continue;
 				if( astart_time < st->start_time )
 					astart_time = st->start_time;
 				break; }
@@ -2678,6 +2687,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);