From patchwork Mon Feb 5 12:55:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sergey radionov X-Patchwork-Id: 46041 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp727626pzh; Mon, 5 Feb 2024 04:55:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IFXOvutVmGJM8ivL9KWz4KrnbQ8rRRzikt+rwr5g5Qx5lr+G8V6SRopZRO8BeI7Z+cCB819 X-Received: by 2002:a05:651c:b22:b0:2d0:9322:8d0f with SMTP id b34-20020a05651c0b2200b002d093228d0fmr5344316ljr.26.1707137731511; Mon, 05 Feb 2024 04:55:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707137731; cv=none; d=google.com; s=arc-20160816; b=Y86n+LERGnj5bTgV6I/rhM3fEjnSHsd53sfQOAqs7OLZpcWnQgS5oevDbWdGyG2cTr 1GZ9zeOO3lFBeuN6iKQacv2G8+fjhC72xjhnN16u3eDQfZvo1+J38uy+RckHKmUxby/c wA5LfAe9dHvSr9uc2Tx65pSlfvIkF1ouWbf0/pfQ+dAdZA8I6dBKhzNg9P2gkClcgAET xwiUj6QTlkUEeOfQZo7+5c2MQBi2BQl1TQK78kAMzQCqfWJCj/kgnl/ONUDipaFt/VOB kZpfBmQRAOMcYYkiwvuZz8LPLPu7pl0aMudlkaj2WXjmLxbIMTOflx0V4MLUun9/55It YlbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=/w1hLPtsr8pu60dXsaBDuCPPQGJs+3D0EcShT75EZIA=; fh=zQsmG8As/dkjki5OviysOSLxhwq7dqF/Uq4PQPoVKEo=; b=X+lDnFbd8ZfZ5/6ZiFHzxG2wo72Bz8qVnN0EVG0qjxZOZwWt8FLBaooAQ+IdlO4t4o YxBzEgSKQkzVbLRr0QKRE+EncGBfG+sJcjpDYNfqbTqEpj7j7F6kRja++yVkRATeJvIf yR5nE5wMlJ6yW/DmIkcm/DH0aHlB/UHmJq/oC15qdTymUuhPiVYUtgQpbQscanmLDwQn ggd2XmxinTgxycdwnaH8H2pV5Uz5MH9H2i6qtDAykla3nVBTyuq2mi08cQq7MOc2JQME 9VUc4cY1evTdH71JP+YiCVHA1SizQOx3ATW6J/wdpWmgLYe8KhzN3H8iHBePCW4k9qIL m+FQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=XYIHQGtL; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com X-Forwarded-Encrypted: i=0; AJvYcCXKbXzi/rrehJUMa2DaTobsjxxIKtsBHRvD1t/99scKzjhT+xj846F3PGf3UCk196TCR00rHLNbd1f1OvQ7DbKDUSgmAg95nuYFFajUSUpxj3DmFrs6xYO90lQ/FyBwXavuVu8lJRltTAYH4TX4ODZuAp/0kPVngM7ewn3BGTJqB4PnLKMqN3h8e+kJR9Ab3xhPEfs6f4IDlpRFozcYhbO5TEQ+Jy6wIo8SV3HtzddAgWs5pUPnJgxONz/QwuLWLl+J4mOeInvCwiP4yUu0mlVFV7/JxTIXdTf58PKoy6ZXqz7Qz02CsJRlEIi/ayaYecC/aFl/a3CyApxehGO3vs3cOQEsFJpE5GAYX/nRawMlrUDmAKE+5QBttyKPa23vDa48U/j+sKPwtsTwquWn4reYe5cIiQ97Rgnqi9hg4iMDmJ/JFf3oSSl69cR6R6tsD3yjR7NT23dKSiX1XlN+4zJwEYxT8yF6SJGg5vTf58hgYSbfA/tSRCj53E9TKVR8qCpyIt3IzbOxCPEvCNfiRG9bWySNI7FbC5eEZR5b8DExsZhFkg7JC+AAKdx6oRGghsf3EQGCQvYUFxtj4IfLkGVSc96tAAl1s9psIngD4QNJcquI53L7TzwmAHTFuXxh0m4RFoLquvZ+OyhSGwAt8fB9HdzOT6aF9JxWjaDaEdStAzMYcVF8BhHK/61L7YUIgZetwEVhXqNvXg4C2ME6WqFlnpjyKTqincD1A5hwb21nihWn6kfnAG843I6iA6ljv8E2fw8oMzTywXtqfTdfXlRdxIQ5XoO0wqRW7bv1pwHmtHDIC50NVtoR7RZnQ3hi0x6Q43SqG+IvKbY/6WB+LMKRLYxG9C1okWw4qN166nIuCI6NLWwl3ndXzdX5zB07cL9HJfLcrohNZ0Lt6/8ghDvKtLpghxKEDKvfGsZd1jD1bHnfNp3znZVaSExtWri7In2Ym8 9/2Q523flh4wdkArQ4RTET9n+UXbUHdWRcyhMcJ/n3OOvTE1+AJyaCtEKn8ShsC+A3naFvjnjBXsfwSFJwuiGEH/PQffbj536RUV6HhRrZsQ699DfMdXgmrCJs7+JWhu+QNuDHwyAGZrA3WS5/QMPFA4l2r4ItC+f78gxVF2M4ubPnoqsPvKzdUMxRugb/k+prvgdeTNXiHgkPjasXfusWsb9tE8abhNaFmTZzzLHvohkhZlxQiLlWpYzPA2lD9L8gYMjmFOpozuf4GfS63BzlY6G1thBx3TNucncggzspjVzf+wQDdtoSyHXwoZa11Tp+eHuvjM2uwsgDsfm0AxUzltuda16x7BsO03VPJ1DNjg427IctutJzxMDO81zqSsnB7xiWL48SwZImoSmHOEKsgyO5Pq2uuaM4C2tBBC2GLa11+4+/mjXjtAUGcBWXu1SAQUgCT9WQbk3ZHU70dYIzXPvRO4ahg0mFXvC7jxT61kgcaEqN5mo39UMsvJmRWeH6Q6ma78ReM+gdlk/157/ydDbQYZBOESvbdpjSjUIc9+WjJfDaIN+2+h3ut5MwD0viGXdbODQSAyI095KHiWk/eK1Op3+cjpiZMCKTZkiVWmdYVTzpY6fdLKSHEsN+0dhUchYvsqw= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i6-20020a05640242c600b0055ffb74fd4asi3663447edc.192.2024.02.05.04.55.31; Mon, 05 Feb 2024 04:55:31 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=XYIHQGtL; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1993268D0EF; Mon, 5 Feb 2024 14:55:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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-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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jF/28t8hguw5 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); }