RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/liblc3dec: retrieve duration of the last packet from the demuxer 

Use the packet duration field to invalid last samples of the last frame.
This commit is contained in:
Antoine SOULIER 2024-04-04 22:57:33 +00:00 committed by Stefano Sabatini
parent 6de00dc5f1
commit 4865ea48cc
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/liblc3dec.c
View File

@ -34,7 +34,6 @@ typedef struct LibLC3DecContext {
int frame_us, srate_hz, hr_mode; int frame_us, srate_hz, hr_mode;
void *decoder_mem; void *decoder_mem;
lc3_decoder_t decoder[DECODER_MAX_CHANNELS]; lc3_decoder_t decoder[DECODER_MAX_CHANNELS];
int64_t length;
} LibLC3DecContext; } LibLC3DecContext;
static av_cold int liblc3_decode_init(AVCodecContext *avctx) static av_cold int liblc3_decode_init(AVCodecContext *avctx)
@ -57,7 +56,6 @@ static av_cold int liblc3_decode_init(AVCodecContext *avctx)
liblc3->srate_hz = avctx->sample_rate; liblc3->srate_hz = avctx->sample_rate;
ep_mode = AV_RL16(avctx->extradata + 2); ep_mode = AV_RL16(avctx->extradata + 2);
liblc3->hr_mode = AV_RL16(avctx->extradata + 4); liblc3->hr_mode = AV_RL16(avctx->extradata + 4);
liblc3->length = AV_RL32(avctx->extradata + 6);
if (ep_mode != 0) { if (ep_mode != 0) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Error protection mode is not supported.\n"); "Error protection mode is not supported.\n");
@ -126,11 +124,7 @@ static int liblc3_decode(AVCodecContext *avctx, AVFrame *frame,
in += nbytes; in += nbytes;
} }
if (liblc3->length > 0) { frame->nb_samples = FFMIN(frame->nb_samples, avpkt->duration);
int64_t end_pts = liblc3->length + avctx->delay;
frame->nb_samples = FFMIN(frame->nb_samples,
FFMAX(end_pts - frame->pts, 0));
}
*got_frame_ptr = 1; *got_frame_ptr = 1;