From 8789720d28f55ed72721cb4fe4c20c73e73114fc Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 12 Jul 2022 10:30:58 +0200 Subject: [PATCH] lavc/encode: generalize a check for setting dts=pts DTS may be different from PTS only if both of these are true: - the codec supports reordering - the encoder has delay --- libavcodec/encode.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index b275344bd1..72b92d2548 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -211,7 +211,7 @@ int ff_encode_encode_cb(AVCodecContext *avctx, AVPacket *avpkt, if (avctx->codec->type == AVMEDIA_TYPE_VIDEO && !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) - avpkt->pts = avpkt->dts = frame->pts; + avpkt->pts = frame->pts; if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) { if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) { if (avpkt->pts == AV_NOPTS_VALUE) @@ -221,9 +221,12 @@ int ff_encode_encode_cb(AVCodecContext *avctx, AVPacket *avpkt, frame->nb_samples); } } - if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) { + + // dts equals pts unless there is reordering + // there can be no reordering if there is no encoder delay + if (!(avctx->codec_descriptor->props & AV_CODEC_PROP_REORDER) || + !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) avpkt->dts = avpkt->pts; - } } else { unref: av_packet_unref(avpkt);