From patchwork Wed Dec 8 01:06:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 32125 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7044850iog; Tue, 7 Dec 2021 17:09:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJxhLe+NRpI1aETrtOO+sgWcvA+CLk8v8SQHq/MxkT7eg0o5XKeNOiZjo+q4RsdfCzK08wlv X-Received: by 2002:a17:906:7315:: with SMTP id di21mr257705ejc.193.1638925776702; Tue, 07 Dec 2021 17:09:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638925776; cv=none; d=google.com; s=arc-20160816; b=W2beEh+Rc45RekgUq7tUfjwmGSJjtnOwLGYvBrKAJ4xizq7iGWcbP7JNsCCkO0ac9F 4uyNWQemkRns8h2rlNmZMeWllAPpEwpA7MgCxHGc9sxyZ8yU+P9GPYfBB3LOomlPQS3X /u5zLK5ejCuWNIa+NFKjXRpcIhVgYOErXcwMSrH4pGCBjtRI3Qn/fNyE9HBu1M2jwLgm KMgJFKjyyVNU71c70/rvOVdbKS6pr+lF8TyOZ3nGAgjgQfQvnq6bKr6tA1DWxWR/z9xb y6d9GYpS5K7On8UZHMRBuYC7lGMGeVt+C9TmH4+ZotqN2nB2bbYB5PyOHxwZ64DYTsVN 8qjg== 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=qHvPtwz2Jevc6Ignycv8UHVb4gQ7ZsQb+PUAPtiM0K4=; b=YfimaOZi8D2MthXzYRyWY1mt6GxAY9HCIbn4gpK62WhteZZGe46qPdG0b5lTn2wPMd THRlinFxTyNn6tmifUrtT6/vlEyy/RtLv4hiqnbPHAiwxt2Enkru541lddLZFGEN0J9W XtAFFY3OlTW3em7UAiwTueGoQgGW9xz0Zcdj5Y7J6VG5Un0ZgWzkPyZ91fnC8T70/2gK Tlcyn7YKr675aQFGmbqxzzfikVXIEs8moCLHHUgHNMNd2ra9p59KqqOZ4KdUSAiuQKjt sGJsBwsm9hAaYHRzamYgkUTrJy5M4NhMxKUeLtw65D/QmPKwq6FBeM22g8bq6U3vCk/V pzUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="UjZHWUx/"; 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 u6si10793ejj.742.2021.12.07.17.09.36; Tue, 07 Dec 2021 17:09:36 -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="UjZHWUx/"; 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 2F1CB68AEA9; Wed, 8 Dec 2021 03:07:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f181.google.com (mail-vk1-f181.google.com [209.85.221.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2F8B68ADF6 for ; Wed, 8 Dec 2021 03:07:43 +0200 (EET) Received: by mail-vk1-f181.google.com with SMTP id b192so580490vkf.3 for ; Tue, 07 Dec 2021 17:07:43 -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=ukXKGC6vBV1qdnMXHA5lgbyaRBikqDu6f7SuKT812GM=; b=UjZHWUx/7G9Ba4uX/i+tY+pa/rEh1afDWdKkGcJxOEbkcv2/EJDCijuyTT5nJKe74P nrVbTnc7rGD0ZMksocAg/1UtkJorwoh1nd3b40XZtQJy/hLurmFmF1oy5D8SLNOQuSfy OMdeaSJR5CARTRYKdGhTGuYFhwl1DuZk/+B3CWGRpcj9d7+llLrP7j/Zd4t35oTQrzXD 0qM/9uukvWAX39j/mKglDjbQJBID4jxgpLUjWekgR+XIS0MA+9Ki+ZI42mhSBQ1XW+Oo AKuszYe3dNVFqWCgiCYVR6eOwIu1G4QJsI3WUxALHrVxzkVB0HXNPQc0uOkgqUYy+oLY FKsQ== 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=ukXKGC6vBV1qdnMXHA5lgbyaRBikqDu6f7SuKT812GM=; b=rnjHdFWMwdiEI+esfr2Pe44IxlZ0tr8I2Dl4fJBsePJ7jaWCR7DooMTH/1t1/OjyrP kzaycielG9T/44FB6yArtkPNLu8zZofAzLWq3BM29mI89vdivtfcMrr8eWS25A/a5DK5 PS5LD5pG8Chmf1JF2KtAMpnR4hCBJIohk9tt9RXZgGCclXvgkWsqqO/dbfDNqPvu8UJO ktmiv0NWqJm6qYBvQel8wFF7ZKxtyKY9irsRmPgS+q8bn8oqlfrI8QTamQVhwCxvbsLP npgVsxo7nrCNX+pkaicyZKBJ3c07TWCsp6cIO7410Ud5U9Y47DVpX68bLdGn5pciz1Ld n1Rw== X-Gm-Message-State: AOAM533ZLSeifDGWSrj7FIkWYp3WMyT+NMa0npfzte+BsYi0Qm8BZg0l inI/Px7SHlvhIP/oHJt+HZR+y/+eR9hUBrW5 X-Received: by 2002:a1f:a3ca:: with SMTP id m193mr55982736vke.4.1638925661669; Tue, 07 Dec 2021 17:07:41 -0800 (PST) Received: from localhost.localdomain ([181.170.250.138]) by smtp.gmail.com with ESMTPSA id b8sm949898vsl.19.2021.12.07.17.07.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 17:07:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Dec 2021 22:06:27 -0300 Message-Id: <20211208010649.381-12-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211208010649.381-1-jamrial@gmail.com> References: <20211208010649.381-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 011/279] aa: 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: IiUtdljCDEEx From: Anton Khirnov Signed-off-by: James Almer --- libavformat/aadec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 72f4b6f7cc..fbb9e0114e 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -190,7 +190,8 @@ static int aa_read_header(AVFormatContext *s) } else if (!strcmp(codec_name, "acelp85")) { st->codecpar->codec_id = AV_CODEC_ID_SIPR; st->codecpar->block_align = 19; - st->codecpar->channels = 1; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 1; st->codecpar->sample_rate = 8500; st->codecpar->bit_rate = 8500; sti->need_parsing = AVSTREAM_PARSE_FULL_RAW; @@ -198,7 +199,8 @@ static int aa_read_header(AVFormatContext *s) } else if (!strcmp(codec_name, "acelp16")) { st->codecpar->codec_id = AV_CODEC_ID_SIPR; st->codecpar->block_align = 20; - st->codecpar->channels = 1; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 1; st->codecpar->sample_rate = 16000; st->codecpar->bit_rate = 16000; sti->need_parsing = AVSTREAM_PARSE_FULL_RAW;