Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

lavc/encode: pass through frame durations to encoded packets

Browse source 
The generic code can only handle the no-delay case. Encoders with delay
need to be handled individually, which will be done in the following
commits.
This commit is contained in:
Anton Khirnov 2022-07-12 11:25:09 +02:00
parent 8d73f3ce56
commit a1a80f2e64
4 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libavcodec/encode.c
View file

@ -231,10 +231,13 @@ int ff_encode_encode_cb(AVCodecContext *avctx, AVPacket *avpkt,
if (avpkt->pts == AV_NOPTS_VALUE)
avpkt->pts = frame->pts;
if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) {
if (!avpkt->duration)
if (!avpkt->duration) {
if (frame->duration)
avpkt->duration = frame->duration;
else if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) {
avpkt->duration = ff_samples_to_time_base(avctx,
frame->nb_samples);
}
}
ret = ff_encode_reordered_opaque(avctx, avpkt, frame);
@ -463,6 +466,13 @@ FF_ENABLE_DEPRECATION_WARNINGS
return ret;
}
// unset frame duration unless AV_CODEC_FLAG_FRAME_DURATION is set,
// since otherwise we cannot be sure that whatever value it has is in the
// right timebase, so we would produce an incorrect value, which is worse
// than none at all
if (!(avctx->flags & AV_CODEC_FLAG_FRAME_DURATION))
dst->duration = 0;
return 0;
}