X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.C;h=1b4e100dfec252dc7295cedafa093a690bba07c5;hb=38cb4182e11e57fc426bede3825e825e9d61433b;hp=243c4e15cf145693d83b363096b59f982b3dd344;hpb=d077044be445c058142c2b92b981c53898a2c112;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 243c4e15..1b4e100d 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,12 +398,9 @@ int FFStream::decode(AVFrame *frame)
 
 int FFStream::load_filter(AVFrame *frame)
 {
-	int ret = av_buffersrc_add_frame_flags(buffersrc_ctx,
-			frame, AV_BUFFERSRC_FLAG_KEEP_REF);
-	if( ret < 0 ) {
-		av_frame_unref(frame);
+	int ret = av_buffersrc_add_frame_flags(buffersrc_ctx, frame, 0);
+	if( ret < 0 )
 		eprintf(_("av_buffersrc_add_frame_flags failed\n"));
-	}
 	return ret;
 }
 
@@ -418,6 +418,7 @@ int FFStream::read_filter(AVFrame *frame)
 
 int FFStream::read_frame(AVFrame *frame)
 {
+	av_frame_unref(frame);
 	if( !filter_graph || !buffersrc_ctx || !buffersink_ctx )
 		return decode(frame);
 	if( !fframe && !(fframe=av_frame_alloc()) ) {
@@ -491,7 +492,6 @@ int FFStream::flush()
 
 int FFStream::seek(int64_t no, double rate)
 {
-	int64_t tstmp = -INT64_MAX+1;
 // default ffmpeg native seek
 	int npkts = 1;
 	int64_t pos = no, pkt_pos = -1;
@@ -509,11 +509,24 @@ int FFStream::seek(int64_t no, double rate)
 		}
 	}
 	if( pos == curr_pos ) return 0;
-	if( pos > 0 && st->time_base.num > 0 ) {
-		double secs = pos / rate;
-		tstmp = secs * st->time_base.den / st->time_base.num;
-		if( nudge != AV_NOPTS_VALUE ) tstmp += nudge;
-	}
+	double secs = pos < 0 ? 0. : pos / rate;
+	AVRational time_base = st->time_base;
+	int64_t tstmp = time_base.num > 0 ? secs * time_base.den/time_base.num : 0;
+	if( !tstmp ) {
+		if( st->nb_index_entries > 0 ) tstmp = st->index_entries[0].timestamp;
+		else if( st->start_time != AV_NOPTS_VALUE ) tstmp = st->start_time;
+		else if( st->first_dts != AV_NOPTS_VALUE ) tstmp = st->first_dts;
+		else tstmp = INT64_MIN+1;
+	}
+	else if( nudge != AV_NOPTS_VALUE ) tstmp += nudge;
+	int idx = st->index;
+#if 0
+// seek all streams using the default timebase.
+//   this is how ffmpeg and ffplay work.  stream seeks are less tested.
+	tstmp = av_rescale_q(tstmp, time_base, AV_TIME_BASE_Q);
+	idx = -1;
+#endif
+
 	avcodec_flush_buffers(avctx);
 	avformat_flush(fmt_ctx);
 #if 0
@@ -523,9 +536,11 @@ int FFStream::seek(int64_t no, double rate)
 		seek = pkt_pos;
 		flags = AVSEEK_FLAG_BYTE;
 	}
-        int ret = avformat_seek_file(fmt_ctx, st->index, -INT64_MAX, seek, INT64_MAX, flags);
+	int ret = avformat_seek_file(fmt_ctx, st->index, -INT64_MAX, seek, INT64_MAX, flags);
 #else
-	int ret = av_seek_frame(fmt_ctx, st->index, tstmp, AVSEEK_FLAG_ANY);
+// finds the first index frame below the target time
+	int flags = AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY;
+	int ret = av_seek_frame(fmt_ctx, idx, tstmp, flags);
 #endif
 	int retry = MAX_RETRY;
 	while( ret >= 0 ) {
@@ -557,9 +572,9 @@ int FFStream::seek(int64_t no, double rate)
 		}
 	}
 	if( ret < 0 ) {
-printf("** seek fail %ld, %ld\n", pos, tstmp);
+printf("** seek fail %jd, %jd\n", pos, tstmp);
 		seeked = need_packet = 0;
-	        st_eof(flushed=1);
+		st_eof(flushed=1);
 		return -1;
 	}
 //printf("seeked pos = %ld, %ld\n", pos, tstmp);
@@ -574,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;
@@ -718,10 +734,10 @@ 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;
@@ -791,6 +807,11 @@ int FFAudioStream::encode_frame(AVFrame *frame)
 	return FFStream::encode_frame(frame);
 }
 
+int FFAudioStream::write_packet(FFPacket &pkt)
+{
+	return FFStream::write_packet(pkt);
+}
+
 void FFAudioStream::load_markers()
 {
 	IndexState *index_state = ffmpeg->file_base->asset->index_state;
@@ -847,7 +868,8 @@ 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;
 	}
@@ -921,6 +943,13 @@ int FFVideoStream::encode_frame(AVFrame *frame)
 	return FFStream::encode_frame(frame);
 }
 
+int FFVideoStream::write_packet(FFPacket &pkt)
+{
+	if( !(ffmpeg->fmt_ctx->oformat->flags & AVFMT_VARIABLE_FPS) )
+		pkt->duration = 1;
+	return FFStream::write_packet(pkt);
+}
+
 AVPixelFormat FFVideoConvert::color_model_to_pix_fmt(int color_model)
 {
 	switch( color_model ) {
@@ -1974,6 +2003,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);
@@ -2086,7 +2117,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; }
@@ -2094,7 +2126,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; }
@@ -2651,6 +2686,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);