RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-24 07:46:56 +00:00
Code Issues Projects Releases Wiki Activity

libfdk-aacdec: Apply the decoder's output delay on timestamps

Browse Source 
The delay is normally zero when the level limiter is disabled,
but if enabled, there's a small delay.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2020-02-04 16:03:57 +02:00
parent dd81f73946
commit 0f2b6594fc
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/libfdk-aacdec.c
View File

@ -57,6 +57,7 @@ typedef struct FDKAACDecContext {
int drc_effect;
int drc_cut;
int level_limit;
int output_delay;
} FDKAACDecContext;
@ -115,6 +116,9 @@ static int get_stream_info(AVCodecContext *avctx)
}
avctx->sample_rate = info->sampleRate;
avctx->frame_size = info->frameSize;
#if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10
s->output_delay = info->outputDelay;
#endif
for (i = 0; i < info->numChannels; i++) {
AUDIO_CHANNEL_TYPE ctype = info->pChannelType[i];
@ -367,6 +371,11 @@ static int fdk_aac_decode_frame(AVCodecContext *avctx, void *data,
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
goto end;
if (frame->pts != AV_NOPTS_VALUE)
frame->pts -= av_rescale_q(s->output_delay,
(AVRational){1, avctx->sample_rate},
avctx->time_base);
memcpy(frame->extended_data[0], s->decoder_buffer,
avctx->channels * avctx->frame_size *
av_get_bytes_per_sample(avctx->sample_fmt));