diff options
| author | Jan Ekström <jan.ekstrom@24i.com> | 2022-08-05 10:50:57 +0300 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2023-02-03 12:21:02 +0200 |
| commit | 746d27455b00f6baca2a1e4ab206cd40bf187598 (patch) | |
| tree | c6fe8d6a3b7450da9d9c4399a856a0bc0df6fee2 | |
| parent | fcc50674ded2d70b44be32be0331c7d925aa53dc (diff) | |
| download | ffmpeg-746d27455b00f6baca2a1e4ab206cd40bf187598.tar.gz | |
ffmpeg: move decoded frame counter from after post-processing to decode
This way we can call process_subtitles without causing the decoded
frame counter to get bumped.
Additionally, this now takes into mention all of the decoded
subtitle frames without fix_sub_duration latency/buffering, or filtering
out decoded reset/end subtitles without any rendered rectangles, which
matches the original intent in 4754345027eb85cfa51aeb88beec68d7b036c11e
.
Signed-off-by: Jan Ekström <jan.ekstrom@24i.com>
| -rw-r--r-- | fftools/ffmpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index ba045b454c..e0a02260f5 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2341,8 +2341,6 @@ static int process_subtitle(InputStream *ist, AVSubtitle *subtitle, int *got_out if (!subtitle->num_rects) goto out; - ist->frames_decoded++; - for (OutputStream *ost = ost_iter(NULL); ost; ost = ost_iter(ost)) { if (!check_output_constraints(ist, ost) || !ost->enc_ctx || ost->enc_ctx->codec_type != AVMEDIA_TYPE_SUBTITLE) @@ -2373,6 +2371,8 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output, return ret; } + ist->frames_decoded++; + return process_subtitle(ist, &subtitle, got_output); } |