From patchwork Thu Jan 13 01:50:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33325 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp16581iog; Wed, 12 Jan 2022 18:00:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxmekLqOcHgrFPjYkVLYyaQVg7OH6IKUvNzSQk0UFN/IrG8/6EZ39iIHPbB3hBnKQBoHPme X-Received: by 2002:a17:907:7ea6:: with SMTP id qb38mr1913266ejc.59.1642039213885; Wed, 12 Jan 2022 18:00:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039213; cv=none; d=google.com; s=arc-20160816; b=sZ++pxKBZjyloK7qhee9VNjAIvGI8cfUoj1gVntTXfLcnMRlTPJjv8LU3fDfRX1aK9 g/fv+CcN37vHddihMwIkO2vJCm6j6rozjN50LBEloVDPusv4DfUC3sWCp+JYtEZ06eCc xIscqNa1YRHNqsHJg+u809Qq5vwR6XXvoIUqijxd1r7V8RP3rS7TMY8TjlUkynMQL0mG /UtwBm9DLU9aj28SVG2Blnf9FjpDjJWKnJMZubEAMXgZlnEYlvyQeMvsMy/itAi6YdJB ddc/zhvR76lcxrkgn0rjjt+f7j2LaFad6BwUqQ1ijdbk0eiVIsz65QaK78etbQLDS6wP +nEg== 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=ZlJL5jwMGfrd586yG5PzQdxN+5n2hAHB4AS5NfWXQlQ=; b=QBUOcWwD5+ts9G1LWblMAeUWWLpYt0/TlQYxSc42NV/nvanhkx/48nJ/0k1g9ERy2P X0nK4XvdKGr77+9SrsQn8kaydgThC+eUU9Gy/C3AEZ8ytFD5IbhWUOIz712kEYQblYH6 j/PRl7n0rTZfZTdfzKmo01n1JumaRcoF2jVNObM4RAzDDIUmHrTE4GzkQcTVwqAzJ5jp aVNJ6ERdILrtzx586w/0l7s8a5F8tj2AU7+oc+VvOooIgz+Z7zZA9d45EmvI+9VQwQ4o ZVgPa9GbcLlwK4dwguacqP3ikhtXoY/Df5ccctVMstVw5IQbGk6kBCIyYJE5MY6AIGQf IRTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=p4s8UQgX; 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 hv15si204525ejc.869.2022.01.12.18.00.13; Wed, 12 Jan 2022 18:00:13 -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=p4s8UQgX; 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 8504268B093; Thu, 13 Jan 2022 03:52:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1AED68AFF7 for ; Thu, 13 Jan 2022 03:52:49 +0200 (EET) Received: by mail-qt1-f179.google.com with SMTP id f17so5323025qtf.8 for ; Wed, 12 Jan 2022 17:52:49 -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=G4hNofkoadpYUaDiTmbUxycEExNXAjJ1OjMmQlU7WZQ=; b=p4s8UQgXGihhyrWSX13bWUcl2zv/KMufXo57lO3ESPPdBE3zSgzBDwVXmjFFKX0LGB 68limOPQ+RWzSpE5vqP41L2PJSklQbQtF/I9wdslMWsDOKTyaKdrYvaPdps1+wKQMeLo nbxGSsP8xS3nvevZadXcPwI9x3rrrLZ5ijiqKpy0vMOZ2JmdfKeYHC3Tqhu0nA+TXaUD WWy8VVqgKyztGveGpKV+hx/4xNVR1dHnooFlnUQwEXraoia6s90e5j6BvVomWhV0d1qG KFd+khuam1prkrcwWpYgVW27r+ccIxRCY4j/7lxQX7qoPYOXtD8IK+ISt4X67prpJydX DPcA== 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=G4hNofkoadpYUaDiTmbUxycEExNXAjJ1OjMmQlU7WZQ=; b=Qhdwyitg436kyjMse/Y6gmUfUn8Ca8AWGn1FaKSgTLDGJ43hB9EK/NJmqdX6yb9eDW OYbZmRMvHHHclZKvqmdYyMXskORRzYRuwROQIrhk7KbWhcHdhHVzVPuSnEM8AJHHbRc8 E6LJCma4ezALi+a6KLSuIU7sJH1DBeliqD37LyuiHl9OunrpoZ7VUmiKoRZrykxj1ZdM 2JGvOQrM+0q+o+KJplEGnps6X8UjWRC5hbXqln6k/pJHFilYYoHmQZNmTObVxvR4D+ay kmHKzQprGoG654HL6s3QD9Sy31SMyxsekkWpByatAWpHVeCyWutJsYLwu3rAwuiOTLd/ vgRA== X-Gm-Message-State: AOAM533V0h8MehyZ7dXpdAJRiWxSw8nzvY9snRtXqYdYpGKx7/TmCqrY eMG0pzgpJINlvh/egPUiCiDXNIMEYVY= X-Received: by 2002:ac8:5c90:: with SMTP id r16mr1972186qta.599.1642038768251; Wed, 12 Jan 2022 17:52:48 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:47 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:02 -0300 Message-Id: <20220113015101.4-41-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 040/281] boa: 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: hYnwh9SJ4k5E From: Anton Khirnov Signed-off-by: James Almer --- libavformat/boadec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavformat/boadec.c b/libavformat/boadec.c index 536300a895..a5104bbed0 100644 --- a/libavformat/boadec.c +++ b/libavformat/boadec.c @@ -55,15 +55,17 @@ static int read_header(AVFormatContext *s) avio_rl32(s->pb); avio_rl32(s->pb); st->codecpar->sample_rate = avio_rl32(s->pb); - st->codecpar->channels = avio_rl32(s->pb); - if (st->codecpar->channels > FF_SANE_NB_CHANNELS || st->codecpar->channels <= 0) + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_rl32(s->pb); + if (st->codecpar->ch_layout.nb_channels > FF_SANE_NB_CHANNELS || + st->codecpar->ch_layout.order <= 0) return AVERROR(ENOSYS); ffformatcontext(s)->data_offset = data_offset = avio_rl32(s->pb); avio_r8(s->pb); st->codecpar->block_align = avio_rl32(s->pb); if (st->codecpar->block_align > INT_MAX / FF_SANE_NB_CHANNELS || st->codecpar->block_align <= 0) return AVERROR_INVALIDDATA; - st->codecpar->block_align *= st->codecpar->channels; + st->codecpar->block_align *= st->codecpar->ch_layout.nb_channels; avio_seek(s->pb, data_offset, SEEK_SET);