From patchwork Thu Jan 13 02:05:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33499 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp42078iog; Wed, 12 Jan 2022 18:42:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJzHA8MQ/X3GN8fsnjgPHnRZGDnpBle7gTde1OVyBOjUs0tvzETs2BuYiM2VyW0pNKD0qAS0 X-Received: by 2002:a17:907:6291:: with SMTP id nd17mr2016051ejc.194.1642041764577; Wed, 12 Jan 2022 18:42:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041764; cv=none; d=google.com; s=arc-20160816; b=wICSJ/sc8TnmkaMvvy7xRSyC/nEGQ+/cY7gMjrmfA4UN7WXI4ytPL9uhrEa6YsnzFj yKjwd7Wk4tdlebV1DIsMUbQuOXSbecq70MS7gGgaxd4ClOziu43+bpDFFHg1ERIznKbl eKxxFMTI0rlPIS0JOKyeRgTnPaXRr8bVGkfXOZVw6zp1gKTktkGz1gjA8C4kpHbYBtUf 3xZPgatRHmw99Vm7MCxOr2GGQmZSp1stvxZUrYcvV9MiV32wm5rdOMqay6p/oLcuO3bd IvBnKhn3GRPT7xdZi5cCgtsFxg233NDbsmo206LtCy13TwCGsYbzLAb2M+4Ka7itsXqD rTBg== 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=qsryVBa1stzsuDA54goQrw21GmooQx0WZ5TW1hWQhsk=; b=efLtVH+TjZB2kookrLhJ01lJbdRUOrLqxlF5vuFM2oiDFrFdMjS/Cvhy6l8CbFkTs+ Lu8bpC+v7wck2H+gs/7T9QpqI1TclkcbgybjoGxit4TkMPN8HctDfOqvBQLRm+/Zxygs 0XzwGRcVBhK/R/Y4qtoPrJFsM6SYGGw8VD9QzbFJxNm7B/SbRtMMsRl3cih9ZAPAVD5j +Y/B4gMFqu1FwQZLS3bLonCUZQtxG9JTnqSm2E49wf3/c7dGLLwN3ArmD7TpwHZAgVnh QKACbjj0eFYC3tF3sugia2vF7Qd4t0Bo1ohW5ezDnv3VOTYhB3/1gccReiqMUpiDMIfK AYcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=FcEOE42u; 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 kl17si867989ejc.30.2022.01.12.18.42.44; Wed, 12 Jan 2022 18:42:44 -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=FcEOE42u; 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 85AF668B8E0; Thu, 13 Jan 2022 04:06:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9260C68B8CF for ; Thu, 13 Jan 2022 04:05:57 +0200 (EET) Received: by mail-qt1-f182.google.com with SMTP id f17so5354430qtf.8 for ; Wed, 12 Jan 2022 18:05:57 -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=BtcNx4mYMP/L+oMGer4m98z4vqDjXikV0ZGrPcC4gdk=; b=FcEOE42uhrq/hClJvFgqiuYHkrPjI0S7CwJ+imEOE2f/K32hQAUSGLfkE4loQ4iXf8 09iC0TfVSTw7qQphd6JipdeRi9WPNNqp1GF3BQPdgfhmZX5dJg4iLB4sQC78BZUfUX4w 06o5Ahgcboizi2qOUSnxEeUZRZerEAeoQsXGtA89ucjnIoibVUYW6f9MZeBUibG3KKhC T5xhYxrtZv7o8bH0fIFyULq22U2c5rb1aVSIjj1ECWdTj/oPWW8XdIIqR0uOoV0VTBTy hwWvnjsQUb5YsNNKCkwIrsQPFbXAcgZf0Y8G87+JtzkX4W7sA9iL5rGZO3UjhrBvyP+o rhJQ== 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=BtcNx4mYMP/L+oMGer4m98z4vqDjXikV0ZGrPcC4gdk=; b=JC4iE26tlG9nlJpIIYRK2grFDdYoPWb8PKPy91M1lcHDP0xSJxQEElleWNryzc22qi a60Et5JL059H01yT+da5TjreHhEc/eE9o+Zn5flT/QymRsTe4tXoRbQuz+PicldRjr2d am4UKyjfukFYgqssq/bO5B8/DW5LM9ladGUJo083lBkPEbQ3g0m15duu+kh/i3rV/o4i Nv55gqh0JO1E3zbgWiB7JrYSYK5ENxt7owUEP7yCFoyu4N2xGwDjmqwwY3RtuTWx+bpg hOk/MaaUZuQlGaO72ZuRQmBcdPZFQ22TjKvyjp9dyrFF+Pa1mtxLMpR2WV1ZGk+27Kjg ZbZg== X-Gm-Message-State: AOAM531qycUZwI/bMA9UvoIejo5YI8co89hV2yKUIvH98ZVH4vkE8MUs 3Is4YSE3JkcnFwUwytvVC5tOMf+iMyo= X-Received: by 2002:a05:622a:308:: with SMTP id q8mr1988488qtw.463.1642039555929; Wed, 12 Jan 2022 18:05:55 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id k9sm1264556qko.29.2022.01.12.18.05.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:05:55 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:05:09 -0300 Message-Id: <20220113020518.730-21-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 230/281] libshine: 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: 7WkaS/8ugqBV From: Anton Khirnov Signed-off-by: James Almer --- libavcodec/libshine.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/libshine.c b/libavcodec/libshine.c index fbc84846ae..ee8a63d66b 100644 --- a/libavcodec/libshine.c +++ b/libavcodec/libshine.c @@ -44,7 +44,7 @@ static av_cold int libshine_encode_init(AVCodecContext *avctx) { SHINEContext *s = avctx->priv_data; - if (avctx->channels <= 0 || avctx->channels > 2){ + if (avctx->ch_layout.nb_channels <= 0 || avctx->ch_layout.nb_channels > 2){ av_log(avctx, AV_LOG_ERROR, "only mono or stereo is supported\n"); return AVERROR(EINVAL); } @@ -52,9 +52,9 @@ static av_cold int libshine_encode_init(AVCodecContext *avctx) shine_set_config_mpeg_defaults(&s->config.mpeg); if (avctx->bit_rate) s->config.mpeg.bitr = avctx->bit_rate / 1000; - s->config.mpeg.mode = avctx->channels == 2 ? STEREO : MONO; + s->config.mpeg.mode = avctx->ch_layout.nb_channels == 2 ? STEREO : MONO; s->config.wave.samplerate = avctx->sample_rate; - s->config.wave.channels = avctx->channels == 2 ? PCM_STEREO : PCM_MONO; + s->config.wave.channels = avctx->ch_layout.nb_channels == 2 ? PCM_STEREO : PCM_MONO; if (shine_check_config(s->config.wave.samplerate, s->config.mpeg.bitr) < 0) { av_log(avctx, AV_LOG_ERROR, "invalid configuration\n"); return AVERROR(EINVAL);