From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1569A491B9 for ; Mon, 5 Feb 2024 12:55:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D2A6B68CF4B; Mon, 5 Feb 2024 14:55:27 +0200 (EET) Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3904A68CB7F for ; Mon, 5 Feb 2024 14:55:22 +0200 (EET) Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2cf4fafa386so55175331fa.1 for ; Mon, 05 Feb 2024 04:55:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707137721; x=1707742521; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RsP9vEAumcmi8ifSIgg6OYd5kIiv6nrCKGBB6XTTJDw=; b=XYIHQGtL8x6rdiiwx2gaQzVvt3phrEQnFKwxBJwL2G0wh2D4ySghB8bmJ5dmEe2BFB w/tHXLXIAzFoJtURkERYnyF+3K1j4Hr1xyT7Ixq+r+YhLRcfAPgjBN/O4qV26x6ZRQ9y WMgewnqFvvEP+TZxBEiaHvtBXKbIdt6kUXNu3hKnGzDYluollFypLjwTR+RPsycZua0F JkAjP37G2JYg0ly5ifHioP79dLeHr7nRnI+NDfSKmCC8SWH0OIiyj0nuegD/jjXKzLlO 2AhCpMcTZ5b5J0MQ92aq+oBEoMV03x6tS2/nxndbYD+9xiC5CnVqIvhg2Eh6L6zwuUcQ z/8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707137721; x=1707742521; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RsP9vEAumcmi8ifSIgg6OYd5kIiv6nrCKGBB6XTTJDw=; b=n7MzUM9dOHFrdz89DyuML3E9qoKkDfSdsgJMyq1h04VXFN5KUMMtCQTxG0zpAq4M5z z8giaUDRp5uDlT+TTehMKKxylqKCouWR8IX/sOJED4xWGRkzF8S6cMp/e453gF4IUOJk Z5pmmw04WFkLenR+OITrVB2xpiJVrmFNk6R/GYpel66RCr0xaa8UGz+v/UKQT2jnBSo0 /Hq42jplO2jXlQZnDg0mT4DPtvLlbaXkXMjA6TofBAXDQo9xieEcDRCDhMdX68ZiR9vf kE6fRr2sAknunp82ACxMs5QWhIWWpswppYaEJlEEMshzeXxK+NlXay5LMhKT74446Ytf R2PQ== X-Gm-Message-State: AOJu0Yy9zcCtWCWMdHcKpDgZGmktDeh2gYAQiH+TvEv2hrKjFg16hU46 jsHwRf7fN+uRcXhK04/zTrxaG5+ZV08bwT3SwbVS3RxSg7lM/zAWebrHjHTQ X-Google-Smtp-Source: AGHT+IHLve1p/C3uHD10R2nkszgMjc0TNZSATbL2X6DNvdp6N8GtnWcauRVtFZ5wgb+4ljAGUU7EBg== X-Received: by 2002:a2e:9cc6:0:b0:2d0:9d8b:719e with SMTP id g6-20020a2e9cc6000000b002d09d8b719emr3503284ljj.4.1707137720129; Mon, 05 Feb 2024 04:55:20 -0800 (PST) Received: from localhost.localdomain ([176.209.222.171]) by smtp.gmail.com with ESMTPSA id t20-20020a2e8e74000000b002d0aaee3986sm425191ljk.19.2024.02.05.04.55.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 04:55:19 -0800 (PST) From: sergey radionov To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Feb 2024 19:55:11 +0700 Message-Id: <20240205125511.118359-1-rsatom@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/cafenc: fixed packet_size calculation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: sergey radionov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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. fixes #10465 --- 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.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".