Bitstream filters inserted between the input and output were
never drained, resulting packets being lost if the bsf had any
buffered.
Signed-off-by: James Almer <jamr...@gmail.com>
---
Now also flushing packets when forcing a record duration.
fftools/ffmpeg.c | 13 ++++++++-----
fftools/ffmpeg.h | 1 +
fftools/ffmpeg_filter.c | 1 +
fftools/ffmpeg_opt.c | 4 ++++
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index e5de099d14..44043ef203 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2010,7 +2010,7 @@ static int check_output_constraints(InputStream *ist,
OutputStream *ost)
if (ost->source_index != ist_index)
return 0;
- if (ost->finished)
+ if (ost->finished & MUXER_FINISHED)
return 0;
if (of->start_time != AV_NOPTS_VALUE && ist->pts < of->start_time)
@@ -2743,7 +2743,9 @@ static int process_input_packet(InputStream *ist, const
AVPacket *pkt, int no_eo
}
ist->pts = ist->dts;
ist->next_pts = ist->next_dts;
- }
+ } else if (!ist->decoding_needed)
+ eof_reached = 1;
+
for (i = 0; i < nb_output_streams; i++) {
OutputStream *ost = output_streams[i];
@@ -4224,11 +4226,12 @@ static int process_input(int file_index)
for (i = 0; i < ifile->nb_streams; i++) {
ist = input_streams[ifile->ist_index + i];
avctx = ist->dec_ctx;
- if (ist->decoding_needed) {
+ if (ist->processing_needed) {
ret = process_input_packet(ist, NULL, 1);
if (ret>0)
return 0;
- avcodec_flush_buffers(avctx);
+ if (ist->decoding_needed)
+ avcodec_flush_buffers(avctx);
}
}
#if HAVE_THREADS
@@ -4258,7 +4261,7 @@ static int process_input(int file_index)
for (i = 0; i < ifile->nb_streams; i++) {
ist = input_streams[ifile->ist_index + i];
- if (ist->decoding_needed) {
+ if (ist->processing_needed) {
ret = process_input_packet(ist, NULL, 0);
if (ret>0)
return 0;
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 649f6ee047..82f3db6b6d 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -306,6 +306,7 @@ typedef struct InputStream {
int decoding_needed; /* non zero if the packets must be decoded in
'raw_fifo', see DECODING_FOR_* */
#define DECODING_FOR_OST 1
#define DECODING_FOR_FILTER 2
+ int processing_needed; /* non zero if the packets must be processed */
AVCodecContext *dec_ctx;
const AVCodec *dec;
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 31d9a8076e..0845c631a5 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -294,6 +294,7 @@ static void init_input_filter(FilterGraph *fg,
AVFilterInOut *in)
ist->discard = 0;
ist->decoding_needed |= DECODING_FOR_FILTER;
+ ist->processing_needed = 1;
ist->st->discard = AVDISCARD_NONE;
ifilter = ALLOC_ARRAY_ELEM(fg->inputs, fg->nb_inputs);
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index 76b9020e83..7ff3936dcf 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -2615,6 +2615,7 @@ loop_end:
if (ost->encoding_needed && ost->source_index >= 0) {
InputStream *ist = input_streams[ost->source_index];
ist->decoding_needed |= DECODING_FOR_OST;
+ ist->processing_needed = 1;
if (ost->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO ||
ost->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
@@ -2627,6 +2628,9 @@ loop_end:
exit_program(1);
}
}
+ } else if (ost->stream_copy && ost->source_index >= 0) {
+ InputStream *ist = input_streams[ost->source_index];
+ ist->processing_needed = 1;
}
/* set the filter output constraints */
--
2.35.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
