From c68f092dfa82d5ee2a5e22e9ccf3e25ae5e8f771 Mon Sep 17 00:00:00 2001 From: sergey radionov Date: Tue, 10 Oct 2023 15:48:18 +0700 Subject: [PATCH] avformat/cafenc: fixed packet_size calculation the problem is the very last packet can be shorter than default packet_size so it's required to exclude it from packet_size calculations --- libavformat/cafenc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index 67be59806c..fcc4838392 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -34,6 +34,8 @@ typedef struct { int size_buffer_size; int size_entries_used; int packets; + int64_t duration; + int64_t last_packet_duration; } CAFContext; static uint32_t codec_flags(enum AVCodecID codec_id) { @@ -238,6 +240,8 @@ static int caf_write_packet(AVFormatContext *s, AVPacket *pkt) pkt_sizes[caf->size_entries_used++] = 128 | top; } pkt_sizes[caf->size_entries_used++] = pkt->size & 127; + caf->duration += pkt->duration; + caf->last_packet_duration = pkt->duration; caf->packets++; } avio_write(s->pb, pkt->data, pkt->size); @@ -259,7 +263,11 @@ static int caf_write_trailer(AVFormatContext *s) if (!par->block_align) { int packet_size = samples_per_packet(par); if (!packet_size) { - packet_size = st->duration / (caf->packets - 1); + if (caf->duration) { + packet_size = (caf->duration - caf->last_packet_duration) / (caf->packets - 1); + } else { + packet_size = st->duration / (caf->packets - 1); + } avio_seek(pb, FRAME_SIZE_OFFSET, SEEK_SET); avio_wb32(pb, packet_size); } -- 2.39.2