[FFmpeg-devel] [PATCH 1/2] avcodec/liblc3dec: Retrieve duration of the last packet from the demux

[Antoine Soulier]

From: Antoine SOULIER <asoulier at google.com>

Use the packet duration field to invalid last samples of the last frame.
---
 libavcodec/liblc3dec.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/libavcodec/liblc3dec.c b/libavcodec/liblc3dec.c
index 90da28679b..d250ace38a 100644
--- a/libavcodec/liblc3dec.c
+++ b/libavcodec/liblc3dec.c
@@ -34,7 +34,6 @@ typedef struct LibLC3DecContext {
     int frame_us, srate_hz, hr_mode;
     void *decoder_mem;
     lc3_decoder_t decoder[DECODER_MAX_CHANNELS];
-    int64_t length;
 } LibLC3DecContext;
 
 static av_cold int liblc3_decode_init(AVCodecContext *avctx)
@@ -44,12 +43,12 @@ static av_cold int liblc3_decode_init(AVCodecContext *avctx)
     int ep_mode;
     unsigned decoder_size;
 
-    if (avctx->extradata_size < 10)
+    if (avctx->extradata_size < 6)
         return AVERROR_INVALIDDATA;
     if (channels < 0 || channels > DECODER_MAX_CHANNELS) {
         av_log(avctx, AV_LOG_ERROR,
                "Invalid number of channels %d. Max %d channels are accepted\n",
-               channels, DECODER_MAX_CHANNES);
+               channels, DECODER_MAX_CHANNELS);
         return AVERROR(EINVAL);
     }
 
@@ -57,7 +56,6 @@ static av_cold int liblc3_decode_init(AVCodecContext *avctx)
     liblc3->srate_hz = avctx->sample_rate;
     ep_mode          = AV_RL16(avctx->extradata + 2);
     liblc3->hr_mode  = AV_RL16(avctx->extradata + 4);
-    liblc3->length   = AV_RL32(avctx->extradata + 6);
     if (ep_mode != 0) {
         av_log(avctx, AV_LOG_ERROR,
                "Error protection mode is not supported.\n");
@@ -126,11 +124,7 @@ static int liblc3_decode(AVCodecContext *avctx, AVFrame *frame,
         in += nbytes;
     }
 
-    if (liblc3->length > 0) {
-        int64_t end_pts = liblc3->length + avctx->delay;
-        frame->nb_samples = FFMIN(frame->nb_samples,
-                                  FFMAX(end_pts - frame->pts, 0));
-    }
+    frame->nb_samples = FFMIN(frame->nb_samples, avpkt->duration);
 
     *got_frame_ptr = 1;
 
-- 
2.44.0.478.gd926399ef9-goog