From patchwork Thu Jan 13 01:57:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33404 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp29296iog; Wed, 12 Jan 2022 18:19:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzmMizT5MO+m4whTf5RQlxJEAw0Kad8pUnbhyNIqCOmq1q96jssuJ1+VXnE4qZoNrx9lnzk X-Received: by 2002:a50:bb21:: with SMTP id y30mr2305625ede.404.1642040341540; Wed, 12 Jan 2022 18:19:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040341; cv=none; d=google.com; s=arc-20160816; b=V0viIzwtvIIBIW6yoZFpcl+ddzWW+9BT8PWN12ekkXxAEmh0Lr+3/1gmn2NgCUxCrU C1zRgFBwRwGxJ6xQ/Ge7NqHZ0E0DQPrf6KbDij0NKykJKUP2eHJXVV5otQDWPpZq/RbL cyaW+pudpyhgp6AgPWNKGPErVAtOcg2WpJ/QrO/VyLwE3GxaG1DxBxoFmJfFb1TJKTKx bc1ukI9ymPRWaa4ezgoi5Pljec7uuLdDRrrdNkF8PLjUrXC7Sh++6pnIZq/RbIzzk1ZH IkABLb1aTdX9vjDJ8fQu9BqPwe9/mKnySHncchLFWwx59nwBjRy0jb5lBWL3MfD/A5oT /4jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=eqIk5gnpLHSU7su6Qui/jueBTeSXg0XIIj3l/gh0dGQ=; b=eVzTsbaaoPGweC5G3R+MdoJeioqEGZJrRfFgDEj1Ewu89t5Zqt7zi4XxCzytDUYUV5 TWpGJreenmIYUY/ubKWjyenGaiDrfImumuuw3CHWYuocA3By0/87M7DWfmqiTlNzNW1f njbtKLAwWT9Z5LvLWzULy8NDrJM4KDTkrV4jpomGl3vGZKLmvtm5pVq11S9XZpuJ7Sii oHooSJ7fZRFRJKxTZrcCwWNQkTkVVtJ9l7lC4dyaZs7SOEa/CY1OkP1bBLE5dx4SpRU3 Zl68q8g1egdL+ncFA6fxMSjWSxLbmfdttXa6b1t9lqb1YaLVo4DLDvR66DcI4eeuEhjK OY9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AtWqW5KZ; 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 i21si722684ejk.103.2022.01.12.18.19.01; Wed, 12 Jan 2022 18:19:01 -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=20210112 header.b=AtWqW5KZ; 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 5139168B356; Thu, 13 Jan 2022 03:58:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 52F9368B32C for ; Thu, 13 Jan 2022 03:58:37 +0200 (EET) Received: by mail-qk1-f174.google.com with SMTP id t24so5537992qkg.11 for ; Wed, 12 Jan 2022 17:58:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1OVEGgsPGy7jbOV6i7sge14s2gN+0TNw9FhPT284eZ8=; b=AtWqW5KZe8NI1+pJsxSNlM8NHlFejejTXxOqCVSr3yTfh9Gq62neb8OR7jYeWDnnji sMydn8d9Df7cG2Q1PdMq+yu8Q/1c1Sdr99g5Tg393CXGeTzq2vF4YkwypooTG7xwDy03 DlpivK9Z87/6cxWXlxKi3TNUSd0tRxHXdDjvTc9036zDdQcZjqC232VuNKHN+ufkTBF2 grC/al7VzBif+hpBrFaIs+4/BpcrJHCaupor2Yf4IWI8F+Tf4iiaFWYyC1NzAUPB/xzk NDLGmS7kc4zn8sMyyviGhiA8TB1/3NJYhtY705Mp6cFB24UkTyF4tAgXFnC03SWYhscY oIJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1OVEGgsPGy7jbOV6i7sge14s2gN+0TNw9FhPT284eZ8=; b=Ngat4CQxHjhS+KJ6rbjJF0aaUFlkAVYebKrGxwYdJATW0l9R1xq1wsnOZU/n+S1nvs fvbhzhssXUWCxK9UCTk6CB9EkLD37OZDHdLripk0TcGyvaKMtKu/NmQCRxkoJLjfVbuX ouf7m+NHu3/feYAQR8QQjY5lUjIoXByO+rOPxKqPAYbBZh+zv3PsBszYBAapWjAYfZcZ cO1O8izB1BewcnIk8c9RhalLVUJ+7iWj4ojf/MVzd0djxivmIWA726qdXsIKlpTwx4D/ mln3wfGBW2MnTWH+bdzmtqf6r1AD9tFcE6qQj8rmRjagRmw65EjR9UwoG+MKwKnlTI5k s1sQ== X-Gm-Message-State: AOAM531h5QCMLtuMeTORs3DUQyhhIWTQubT1CXDTx/gfSq8xKB/j5kip hLQFgCrCAvnxkxhcw1UOQwGZfiweaX4= X-Received: by 2002:a05:620a:17a0:: with SMTP id ay32mr1754604qkb.515.1642039115659; Wed, 12 Jan 2022 17:58:35 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u19sm893081qke.1.2022.01.12.17.58.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:58:35 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:57:44 -0300 Message-Id: <20220113015806.519-9-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113015101.4-1-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 127/281] rawenc: convert to new channel layout API 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: AJqb9VtcpYds From: Anton Khirnov Signed-off-by: James Almer --- libavformat/rawenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 4bbae7717b..54a0c2fa78 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -79,7 +79,7 @@ static int adx_write_trailer(AVFormatContext *s) if (pb->seekable & AVIO_SEEKABLE_NORMAL) { int64_t file_size = avio_tell(pb); - uint64_t sample_count = (file_size - 36) / par->channels / 18 * 32; + uint64_t sample_count = (file_size - 36) / par->ch_layout.nb_channels / 18 * 32; if (sample_count <= UINT32_MAX) { avio_seek(pb, 12, SEEK_SET); avio_wb32(pb, sample_count);