From patchwork Thu Jan 13 02:05:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33496 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp41827iog; Wed, 12 Jan 2022 18:42:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJwhj+42OSrs72EqHpXS9pXXYkAb4mpolLU1E/WUIcPmh1iOQTA7n/EUzD3jXcbzlkrtdT4j X-Received: by 2002:a17:906:1da9:: with SMTP id u9mr1994331ejh.756.1642041731210; Wed, 12 Jan 2022 18:42:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041731; cv=none; d=google.com; s=arc-20160816; b=y2pwojhOXG3rmfMS11Py3RQgAbfY6AfWjeQnhWdDpR+5kTLWP86lrl1MpJUuQIXG3d jEP1ulpTFspk+TJZ9pCjaPLfsTd61+4aAf3XJNbzdBZOmeKJCRtj39rMx6bNRE08UYUw Z+B0vn8nqyUy24KUMbvL/gROZ7zdc69qTHieYcUXotA5xYppj+LWdYEdkteFQdEiaKaE tl15u9qpt32WTxfSCngppZuhp92oadqC2OaqnOAaabD41opozSXhEGbE3X8qA3r70msz uzon4y6z6bu2al1/jF6OsCLozBXj0tud3ZV6zDAvRHrL3Sjuie6FgBd4JuDKaWMSE7rO peKQ== 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=svx1DyibBNFJrzUD8l3/SYgsfu93atpcISeH45YibPI=; b=H/qQ6w6ZeGKcDbBA/pgK7901qogCW4jK+Pv/coFr0HYt3+eU/RoLIYpjl9yCs3nkFk 6NzFheIAp41gUzbtKdHZ3dyP8f4jukJpkbaGh+j99CNH5/Nk+dYrmyTowJWg33CJcudj LIQk7EnGzqU53umFgpicIIGBUo7T4w4Az2gABR/qNlza9uzb7xcA/2sBJYTLyV1leyfA YXQYJVXaslvTdwVbN3hrvJYwEUmsyZwoIt77OfCYAl1aoePUwHbINIe+hHA26NpLd62p J+robtZ3mfffXuLQ89knPw7J3bG82R3AxKM1UOUskGZFPptRyPQdg6iddh0ZeIaiSy92 MxDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="njJX1/46"; 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 w23si767215ejn.673.2022.01.12.18.42.10; Wed, 12 Jan 2022 18:42:11 -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="njJX1/46"; 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 9A7A068B8C8; Thu, 13 Jan 2022 04:05:56 +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 D2AEE68B89E for ; Thu, 13 Jan 2022 04:05:53 +0200 (EET) Received: by mail-qk1-f174.google.com with SMTP id m2so5575036qkd.8 for ; Wed, 12 Jan 2022 18:05:53 -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=aiQraiLwdnFWM1WhHVBzQBOZaw+4mmChSfOHM9HfXME=; b=njJX1/46s9T3Lb6Mv+iyhmOZJsSZ0uqJJriOJbA1Kniha27DUZThEhBU3qW90Ntw44 2riIBaWbH9v9+DG9ARhE1LG6XHZ5C0scGXuTBZY0qGllApJRd7MoAy9zfAltzaYsKoCD MGO0LyPKNnkNXYwhaqcin/XMbY3pQPi+ywHiRfCNwUta9EUmm9ItAG2x3GhNSNao+9vE VknQDeSVyRhv5iitRDH6u7e5sbrWgcJFWFXxMvngWqHtaWpIM+TKpdFNcWbvQ/uemaah uQx3SzrhaJ2w6R/eRrfwXZF/nX03GV+0okbFusj7kBPp3585RumxHU8e6ZOAmPdZsyIn qmpA== 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=aiQraiLwdnFWM1WhHVBzQBOZaw+4mmChSfOHM9HfXME=; b=fO7HUEaQP6uzZucwBKj1pzJHqLMjproOcCtVKxiL+UsTy6+G8pYp/j1fRuuQJjoW8i /qsMEW9Nr5u73aVfUMfu9AG99SggfsbAujOwBk7BA1UIi6Ce3wHlTqZt9hfEwUnIL7H5 rZ60vN6tN0DwE+lV3K+yQs70ZoNIY8st02PpSO8LF0CelijP9KcRAkPyraMombLKYGK6 S20behWhOLJU2MEN+zMpPSplUdUg3QgoQJEKHcwDt99NIT5b9u9ewa08+vVdanSFsd/2 DeFjFRHL1nGKO6v45eVPFbs5LO32ZKY9Hpo+Pz5+vAceJ74Ql5Na2n+4TvC1rgz6/Tr9 /Jig== X-Gm-Message-State: AOAM533Ub6TmWs0SXAjxCgtwRyKoiSHtW7k+r76RpkZQz4jDcCOWWmDa fz/OV1VSLLjlOJf8u49Lcnms54K9alc= X-Received: by 2002:a05:620a:d48:: with SMTP id o8mr1809851qkl.88.1642039552255; Wed, 12 Jan 2022 18:05:52 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id k9sm1264556qko.29.2022.01.12.18.05.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:05:51 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:05:06 -0300 Message-Id: <20220113020518.730-18-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 227/281] libmp3lame: 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: Zxok7rMEawbg From: Anton Khirnov Signed-off-by: James Almer --- libavcodec/libmp3lame.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 5675864bb2..36ae57eb83 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -101,8 +101,9 @@ static av_cold int mp3lame_encode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); - lame_set_num_channels(s->gfp, avctx->channels); - lame_set_mode(s->gfp, avctx->channels > 1 ? s->joint_stereo ? JOINT_STEREO : STEREO : MONO); + lame_set_num_channels(s->gfp, avctx->ch_layout.nb_channels); + lame_set_mode(s->gfp, avctx->ch_layout.nb_channels > 1 ? + s->joint_stereo ? JOINT_STEREO : STEREO : MONO); /* sample rate */ lame_set_in_samplerate (s->gfp, avctx->sample_rate); @@ -151,7 +152,7 @@ static av_cold int mp3lame_encode_init(AVCodecContext *avctx) /* allocate float sample buffers */ if (avctx->sample_fmt == AV_SAMPLE_FMT_FLTP) { int ch; - for (ch = 0; ch < avctx->channels; ch++) { + for (ch = 0; ch < avctx->ch_layout.nb_channels; ch++) { s->samples_flt[ch] = av_malloc_array(avctx->frame_size, sizeof(*s->samples_flt[ch])); if (!s->samples_flt[ch]) { @@ -208,7 +209,7 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, av_log(avctx, AV_LOG_ERROR, "inadequate AVFrame plane padding\n"); return AVERROR(EINVAL); } - for (ch = 0; ch < avctx->channels; ch++) { + for (ch = 0; ch < avctx->ch_layout.nb_channels; ch++) { s->fdsp->vector_fmul_scalar(s->samples_flt[ch], (const float *)frame->data[ch], 32768.0f,