From patchwork Mon Feb 19 07:58:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sergey radionov X-Patchwork-Id: 46362 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1114090pzb; Sun, 18 Feb 2024 23:58:48 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVpQQd9p1f0FJipTi/YcTHVpMuMPbEN8IcYHGCSNZtNlQBFV5aXCE+kfXIosglL7np0llEUhL/cg3cKu0XZoRn3yqJJ2UEfa5Zvmg== X-Google-Smtp-Source: AGHT+IHvktCUFrmIe0UZ/t/AHciu0ZaUk95qeNDMR8PCwb7JuXP8o6nkIBb4lOGOnPmm+CPZ9i7y X-Received: by 2002:a17:906:2b88:b0:a3e:34b2:a2fc with SMTP id m8-20020a1709062b8800b00a3e34b2a2fcmr2768270ejg.1.1708329527803; Sun, 18 Feb 2024 23:58:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708329527; cv=none; d=google.com; s=arc-20160816; b=Zpj2SRcmb4TIFJDoExNHrbJsWzHOae9Ab7KhUMXNRN0+5hna0f91v7aB0VhYMeRM3U bXK4xRCQLEPz3UCrpIwbCNJ0EuEAfQMNHtq+W1D9mNb8i5HUlPsSaipN0L/oKZ2Odo25 j8GKOtBjgt/CtQFCcPgMwm7KgCfOCJZ2ABlyKOsb7DJtlXXioMiLdTVsQxvKiVgsDEDn hRn7rER7RN9qcdPCXnkt0cmyrtmZy8Kixcjg/QDxOyIQbhEY0afCyJFtaJ63ZXs4R0YP OeU8ieesSntWBL/pkC1LpABTN8B/Rr7UdoOR91miqLz0uAo/MS13Re/DttucJa5eiEBO HCrQ== 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=pZMfiGnFpRCHqzrLOYVshoPRaiBoRD3ILFMabAIaQ1U=; b=uDZMXqVSWRyQG3CytaWzUh8v4e6MSw01sq0Ei1RH/RC0dOZtx2ZmcwvUdbb+Bd5YhE JPd/Slt0Img2FaX2g5MFFPU06iNMZ2az7szkwcUnM3oiW3WhpO6Oa9bxMqQDwYKPmLWd ngr3MypB4NtiJ2kYmGwc2krJipsbNHOSYcWV5m4qbfboVtjHS07rZ5LYzF16+bBOcXfL Qo8eDxCq0J+DFCt88OHIZIKdOA/d3BtVcwxh3h7L7iMbYgZkYYoasUfAGfqjSuP0ySMa S+Puthq/QjWR0zi2bWCjQzVJEUzQc6BbBx8VcELsAYos1d/r9auWvoGFYZ5oUPBmLdA+ S2OA==; 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=W4RyaEoA; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kf27-20020a17090776db00b00a3ec536d16fsi160134ejc.499.2024.02.18.23.58.47; Sun, 18 Feb 2024 23:58:47 -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=W4RyaEoA; 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 EE8B168D3D6; Mon, 19 Feb 2024 09:58:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1441D68D356 for ; Mon, 19 Feb 2024 09:58:37 +0200 (EET) Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-512b4388dafso513831e87.2 for ; Sun, 18 Feb 2024 23:58:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708329516; x=1708934316; 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=W4RyaEoAt8CfEQ94b2Fx4YJzDFpXRG5r/bLW4YoNaP76mDknx/e1E1W6RUjkibTaxJ +j09BYzGP+Lba6smux0xp5h7+njceKy4XmC1qq2yFOQXhUDCF8soR2rAM3LwJT0Glt3K 7GKsjC4gAL7leXSATng/UqQJPS5NpuIkR9WifKuDmbxGzYx3pvi0X3jKMYmyRQvHZ9WJ 6/Weem4Kmk2dX+bC/4IpllgrdffU4dXdMR+ppeOe+Mg44TxJKTmpHNaQKebd8EdJzMb8 jrAxxzueP6O9SIxKllP7CaicIJqpDFHKCIXQA+BUTfwLrC1rF6eJVHXi6XZLeyYCan20 GcAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708329516; x=1708934316; 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=R7DTRMELae4gS74BgfC2e2hRDwLCXbWcgCQsYK6G6Au9tUwYuwZGjNZ6tpqic8YbdL P2zHdDQZ+1VJagHJtVLK58A1b7hodMbaUm0urDjOzZAbqGk1frfp9KOEH+cPLDEz7r2F hYZU3JvzaurSAlSjg+Ma67LlQ8jx9KxvLcy8aNIv1qO7P7XTQbz4Ks+e0n/uiqVOgiGj 0AMJmszHssAO0KkabsOTqEhH1eKHTMoJPEOcXFfLau3lGanorvYup1C8IBMqHu1H+z8F klkxsrFVereJjzoncD4tOFP62ezfD5wrK0H/smX6Lv4wHAHV8ZIUzJcbu+inMs7B0nrz M2GA== X-Gm-Message-State: AOJu0YzKTvrcd5CqZ8C4vnnydiO6aqcSDDT4tKXmDORRep93uZTAB3dL lLH+fpOLyluzJDN2KPRI6V7WbYqe17aloRZCx6jVAblsb97Bw69ofFbsjY3V X-Received: by 2002:a19:761a:0:b0:512:b2b6:486d with SMTP id c26-20020a19761a000000b00512b2b6486dmr1464856lff.62.1708329515719; Sun, 18 Feb 2024 23:58:35 -0800 (PST) Received: from localhost.localdomain ([176.209.222.171]) by smtp.gmail.com with ESMTPSA id cf9-20020a056512280900b005118c556582sm800034lfb.273.2024.02.18.23.58.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 23:58:35 -0800 (PST) From: sergey radionov To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Feb 2024 14:58:31 +0700 Message-Id: <20240219075831.111038-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: WCu/as+dorgO 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); }