From patchwork Thu Jan 13 02:05:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33497 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp41892iog; Wed, 12 Jan 2022 18:42:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJw+v4j0IeAqdgtz2NCyjyDZSC27PORrJburpkrawUAcuGk8puh3VqoGAaWx2Dh3R2wpTPeH X-Received: by 2002:a17:906:c047:: with SMTP id bm7mr2028450ejb.334.1642041742090; Wed, 12 Jan 2022 18:42:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041742; cv=none; d=google.com; s=arc-20160816; b=Nkxtlpr3UaDlL0iiaQJKc+F+PUnnx23uosFcoA382wOOAYEtZ0Mv3PlgxNCzpt45JV 0xfxKAy2Xi+XqwHiu1zu3lzGRNqKegW6D7Gg9SJnvQA7mf9oMZsjKzkipamb4yNgGAMa ehqbCL8wXZkdqacs0ofJlCCIcpOZAE+/oePPSOJrHlz9yf+o7k8arxr3ZN6qxFC5ciOl LEglHoAT7LGqswgoOZ8SxNX/wj9n74JSGQCMQaj37i67O7l+oH8dqQGUitfLONs9JQ1b h2C3ASli0JFUC5MiqZstcpNK5szUciQ+VSbe6TkYz34WBHi4JHnYFDELW0vw27qGWMIz K5lg== 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=uiQWciwXs1zeq7YPMsvTGf+LwEhSaezDSUDJL3v0TXU=; b=lw0lSGiIMeggtk1anVgArC1ZQ98mfSvmUCCqDN50JGL6kEW1NJXnC9sZ63gDar8plN Dzeue2tKktbC2eAEYxuW/rHO3vziXeBrvnA+bZ2dtRZ39TuvhepTE4URtFvyjhBIJ/mJ tmvbasolxbJFPXJluHZsJg/8+2qSTsrSXOJOcSnV74z4f7xfdkUplY6HbiaFTjV93Y4v 9LwMMd4n1PFrQzGC+fmRZgfny2TvLHIqISZabJefv97+UEn3bw2bN86JamrVD/Vk2S8t Px58+fH2+8DKXVLwObFdsLcYAEa6IU8y1GCYm7AiPGOX/P3l1cP0qWcOwq8UiD4sgmCI 1GqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=R+hjSa7k; 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 w8si942154edc.183.2022.01.12.18.42.21; Wed, 12 Jan 2022 18:42:22 -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=R+hjSa7k; 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 BEE5A68B8D4; Thu, 13 Jan 2022 04:05:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E50EF68B8BA for ; Thu, 13 Jan 2022 04:05:54 +0200 (EET) Received: by mail-qk1-f178.google.com with SMTP id t24so5555742qkg.11 for ; Wed, 12 Jan 2022 18:05:54 -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=tpx9MYpjauTTJxy/T47pujg2BCKkaI2dmbox0ipsaLE=; b=R+hjSa7kJb6GZ6JMAmKPNAwR3lftexSt1a4rSPVd9TT+LxH1TjN0lhcJIn+cSIN/ib MxCIV74zBxojrFkjiSFAYobJbO5ORVZJd2HcwVrX1HzpOCXNqNRAEw7Qr7xcWHX89dZK zZgrngMKMTdLmPs0bebeajJCEszaYyBIPCYRYqSPdRo24uJzp+Elz4GJstSkImtuWWFy Iy5A/A+MMWAoQQp5N8DyKMHEHTX1jefB/ESbXI4jawLjPfr/GHm8+XVtro/yEnAjLnyE dmwk7sFndYjqJ1y+JDjaAGNnNnGMzQp5QfiwDnFWzK/AKBSwP+yca7iD5+VYYuyDBGJU 4eIg== 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=tpx9MYpjauTTJxy/T47pujg2BCKkaI2dmbox0ipsaLE=; b=iN+Cu0D80HniAogOzgLoYfEHpJkFZZjQDtpe+sM+VkhWquKl9nEKOTYaZsQDdDYmCP V6UMNO3ggNB1qR/bq8rvjO/eo9J71TY6NDmduiFzsu10OdCuKECYKEu088YsAxczF29g UwoWvD0Z6RaL/xuRq6kRTJGN0zp4IDEcKZa83ZYIvP3oRXFGOKO7eIqubrqDiqvtsEi6 ep/nmAVnaQjTv4CIH5GecZd31n7nkRcAG82L2l/wBhF7BnIqlfbA5cMj7dJoVxOLg+Z+ aBi1DNB2GrWpk6IjogbNvgrYBaNCSTHiGS3IW+7/gLGD7tM2SSbrvSCVM3xYTS7PDJcM i9oA== X-Gm-Message-State: AOAM532oTrgzH59DczbbtlGpGPjJVNu74rWDth30P1Y7C8f6VkVfbuCw hxUyfm/h46eY2kkmOoepcmR7YRiBuo4= X-Received: by 2002:a37:688d:: with SMTP id d135mr597660qkc.346.1642039553478; Wed, 12 Jan 2022 18:05:53 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id k9sm1264556qko.29.2022.01.12.18.05.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:05:53 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:05:07 -0300 Message-Id: <20220113020518.730-19-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 228/281] libopencore-amr: 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: FHuBAIg64ei4 From: Anton Khirnov Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavcodec/libopencore-amr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index 2df1c5090f..aa5f0e774e 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -38,13 +38,13 @@ static int amr_decode_fix_avctx(AVCodecContext *avctx) if (!avctx->sample_rate) avctx->sample_rate = 8000 * is_amr_wb; - if (avctx->channels > 1) { + if (avctx->ch_layout.nb_channels > 1) { avpriv_report_missing_feature(avctx, "multi-channel AMR"); return AVERROR_PATCHWELCOME; } - avctx->channels = 1; - avctx->channel_layout = AV_CH_LAYOUT_MONO; + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; avctx->sample_fmt = AV_SAMPLE_FMT_S16; return 0; } @@ -201,7 +201,7 @@ static av_cold int amr_nb_encode_init(AVCodecContext *avctx) return AVERROR(ENOSYS); } - if (avctx->channels != 1) { + if (avctx->ch_layout.nb_channels != 1) { av_log(avctx, AV_LOG_ERROR, "Only mono supported\n"); return AVERROR(ENOSYS); }