From b01d2a5533a99cbd803159a4a7f365d12a0bc5c5 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 1 Sep 2014 04:13:49 +0200
Subject: [PATCH] ffmpeg: Enable compute_edt only when the subtitles are used
for a output stream instead of a filter
Fixes/works around Ticket3768
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
ffmpeg.c | 8 ++++++--
ffmpeg.h | 5 ++++-
ffmpeg_filter.c | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 8bca9e76a6c..220816b851f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2297,8 +2297,12 @@ static int init_input_stream(int ist_index, char *error, int error_len)
ist->dec_ctx->thread_safe_callbacks = 1;
av_opt_set_int(ist->dec_ctx, "refcounted_frames", 1, 0);
- if(ist->dec_ctx->codec_id == AV_CODEC_ID_DVB_SUBTITLE)
+ if (ist->dec_ctx->codec_id == AV_CODEC_ID_DVB_SUBTITLE &&
+ (ist->decoding_needed & DECODING_FOR_OST)) {
av_dict_set(&ist->decoder_opts, "compute_edt", "1", AV_DICT_DONT_OVERWRITE);
+ if (ist->decoding_needed & DECODING_FOR_FILTER)
+ av_log(NULL, AV_LOG_WARNING, "Warning using DVB subtitles for filtering and output at the same time is not fully supported, also see -compute_edt [0|1]\n");
+ }
if (!av_dict_get(ist->decoder_opts, "threads", NULL, 0))
av_dict_set(&ist->decoder_opts, "threads", "auto", 0);
@@ -2678,7 +2682,7 @@ static int transcode_init(void)
}
if (ist)
- ist->decoding_needed++;
+ ist->decoding_needed |= DECODING_FOR_OST;
ost->encoding_needed = 1;
set_encoder_id(output_files[ost->file_index], ost);
diff --git a/ffmpeg.h b/ffmpeg.h
index 6545286ad0c..56eb66a6e85 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -243,7 +243,10 @@ typedef struct InputStream {
AVStream *st;
int discard; /* true if stream data should be discarded */
int user_set_discard;
- int decoding_needed; /* true if the packets must be decoded in 'raw_fifo' */
+ 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
+
AVCodecContext *dec_ctx;
AVCodec *dec;
AVFrame *decoded_frame;
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 7acff283c8c..93af8cef186 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -275,7 +275,7 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in)
av_assert0(ist);
ist->discard = 0;
- ist->decoding_needed++;
+ ist->decoding_needed |= DECODING_FOR_FILTER;
ist->st->discard = AVDISCARD_NONE;
GROW_ARRAY(fg->inputs, fg->nb_inputs);
--
GitLab