mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
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>
This commit is contained in:
parent
fcc50674de
commit
746d27455b
@ -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);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user