From patchwork Thu Jan 13 02:05:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33494 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp41663iog; Wed, 12 Jan 2022 18:41:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJwnUqObZpF5k23ycUyaG4fBxWfEhszgT1Tjyas9PJuabsXFwqBcsN0S901KfhwOO8kWK/am X-Received: by 2002:a17:907:1689:: with SMTP id hc9mr1971250ejc.228.1642041708099; Wed, 12 Jan 2022 18:41:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041708; cv=none; d=google.com; s=arc-20160816; b=ikKMTQjeFMdx6cPttm0wb5gXqIR7Ryx39sEhVl3Gxa8sEPN1JcWSA4YT0b1gB0HWPo WCyFsXFp2yXLwm7ulY83vN7H9ar/9ASxsZ9un8ydkRtQUFZx505DT9oW1MtoTC6aBqIH NhznWms4sW42zAFINsAGwGmaIzmZuKoqVfnoNPFbhdgh1GDzm5ys2qYCMIqMi2R3+unt ShV8Fym8MhsOAxWGTIvS3thDKmNojCMAa2VbvU6mZX5Hr1cJ/lOwTfGzmcI1ouX5XmO+ t7mYj3N5JBPwZ08obux98px+lUcrwn2MpBZkSCUvz8vs+0Uex7WFqetV4w+9oFCaYJ+u U13g== 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=fHq6fHV5OdDqRYfxcQDNpe7fNgaFZiS8V2cXTPMGNAQ=; b=hvirFQT4kZQxgwk543urfpcgdDrUQyweNb36F19r2KszQvbeFg1qNBh+ypSUxIoTeb 4vrOP0ZJyUJi873Fabci4qtCmGbb3Na//a9VdWTUM3k3Cqu4ihU7hIxdQMJFsu3NkBNN lx0DwFVRBJ8MhMGTyVcj/ORyOG2rPpYDk6ws53Xvn0L6aHOpp65yxwjJpnMirYrB7VPV GcQ+NIZL+SMXs7zBOgUi6KGObUHDBrMx4noDSqMPkZaCpPiySfTQoomJAP1/gYsRV/98 wyU9dBKMHVF5pZsT+twM5Td2Aldr7gwPSGpy6fT9wCLjDqaduAc3PGPJqUYOekdcmS/H aRDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Mc6w+LEp; 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 hg5si910864ejc.551.2022.01.12.18.41.47; Wed, 12 Jan 2022 18:41:48 -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=Mc6w+LEp; 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 A395668B8A5; Thu, 13 Jan 2022 04:05:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3613A68B86A for ; Thu, 13 Jan 2022 04:05:51 +0200 (EET) Received: by mail-qv1-f42.google.com with SMTP id kl12so5111736qvb.5 for ; Wed, 12 Jan 2022 18:05:51 -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=kUZbvZx+oxRQ6kNlCmgu986Rx9I+vsAgvq9BjQkH2rg=; b=Mc6w+LEpBa943J4hjGnnRnW7X+rR1pBRdgcYsrCJjtW0wAZs/jUt1ThZ0OLH9cihbU jc/bqQkIoVljzvIrl5PvkkmleJbdyo3q/p8NXqm4F5X6N/WswVDlWWc1nosSkaq0dL02 kSaIPh0LfIlv29sX/W2SLIxZWnGVSFtSE57Ib3yufRvqgkXr5w1sAWtNLql52F3OTcEi b19pJ5hqcOzwagqn22rRu0CLKfiLpw/imSTLHjbmpp//sISveK8uCqqBZ8Cio3+k2mxS F9N4dyccf3DxqGiE2dMWg7wq91VBcXHCPsW8eBRNc0X/02oYGjrJaX0ja1eqLCqaNO4z gSwg== 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=kUZbvZx+oxRQ6kNlCmgu986Rx9I+vsAgvq9BjQkH2rg=; b=m0s1EYGwiV6TOV2X6+/308acq+cZX+B2oX5xuHlZW+lOQ96V1iPfmApXI+i3IBIQbF Cm7TvNS/1wsCZ1bl9AdUzh/aQQTtbCpAzc+yfpWwA4YgxV2Y21947HII/feEi53FecaB uGQ1g88VFYsJwps5O6uJWz/9M46qnt6xhFpxs/cPoBoax4JlJCYoXlYEBRMr1JBKOGKe B9EnvBQCRnAwookkO+Kp7mxgyjj9WoG0h3+D3q9AkIBOk6AGNB9kEeSZ5HYCs2C0k3fg qmN39Mle7gZhJCTRDjkoWpkJKEtshwFFVuh8GuTyyzlSm+17w4YP1voo9StjIdnPOTxx KF3w== X-Gm-Message-State: AOAM531xpEdRqNhPPZJqPTRtQLab/v7rJDckwL2CWIPY0VLl1Xln+0Ip PVAydiVGTBbA/mE/297y83dI54F4sRs= X-Received: by 2002:a05:6214:5092:: with SMTP id kk18mr2163840qvb.43.1642039549806; Wed, 12 Jan 2022 18:05:49 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id k9sm1264556qko.29.2022.01.12.18.05.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:05:49 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:05:04 -0300 Message-Id: <20220113020518.730-16-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 225/281] libilbc: 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: h8r2AXhAnKR8 From: Anton Khirnov Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavcodec/libilbc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c index 04192e3045..cfffe7d520 100644 --- a/libavcodec/libilbc.c +++ b/libavcodec/libilbc.c @@ -78,8 +78,8 @@ static av_cold int ilbc_decode_init(AVCodecContext *avctx) WebRtcIlbcfix_InitDecode(&s->decoder, mode, s->enhance); - 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_rate = 8000; avctx->sample_fmt = AV_SAMPLE_FMT_S16; @@ -161,7 +161,7 @@ static av_cold int ilbc_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (avctx->channels != 1) { + if (avctx->ch_layout.nb_channels != 1) { av_log(avctx, AV_LOG_ERROR, "Only mono supported\n"); return AVERROR(EINVAL); }