From patchwork Thu Jan 13 02:06:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33508 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp43634iog; Wed, 12 Jan 2022 18:45:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJxwmZxGGFZU4fsGCj7+8Y27YnML7NOzc8q9/j6QQkmeqnR1n7eqhcJMnqZL+YVap1Zq0hbc X-Received: by 2002:a17:906:4088:: with SMTP id u8mr2034922ejj.717.1642041945113; Wed, 12 Jan 2022 18:45:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041945; cv=none; d=google.com; s=arc-20160816; b=0Tnl+ukOyqimIyhph2RtGkoq8qFNLtgyyke0vdMZIcPijhZYSBC6ogiyOqRwopcJgY W9c4jVfEdrhmv8EjFqDpY3vZDqFFkx2NUMaUMiAFizlS2e6kuUSSdnngjcct7Nv1H9WL ct7uQTvXbSEgIxyLtfuCgXHifdAHy12SCR8EZXKI3xF9GtSZ10w37M3DIrLnTThsPULg 2FyN+xuASmCRu+50RuWNVSETdv4NudGuAPjz0Cpu1xibgHN+fLLurNgijUJPKFw4tome UTFtTMxlbw2LCnzvCNL04NyPA8YxaJ60zsJZcsEsw+oin5/llh6sl2gIy+gP30Nr4vTf e+MQ== 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=PT6OpiU9+WEQmF6mQHYUcS1ZKOdO0js7p6sdpl9TQcA=; b=LqVYENBa92vxqfBsLRutyZC9RDxHERialtWV1q9ZBX08BJbA1HzJbl8Y3Tm72xLsl4 l2OTcJhGehTpbwWwVZ155yFVfUFpugMfctokFGsTubaK/SKs0ozPs38uUeM9i9iBE5Bi j8UPXcDMqNx7cvbv9/pCt0okKfJsHawwgWZoqHblHFHbVwGl+PkJC3Pfu0IEtYumGbLi 3V1BtAyw7Z8zFifhgYhF/gvhdlLkh6ovawg7E38Ehj9bz+ack28lnIWd9f7YPwxSX7Eo R7WXkSN3RYdT7QnTtnJuhtSkD2pMUX8fxIiyUjIwXe2yTUvCTt1z+cjDjLjqfcaw4ihH xZJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=VoyqoHFy; 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 c2si773933edy.234.2022.01.12.18.45.44; Wed, 12 Jan 2022 18:45:45 -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=VoyqoHFy; 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 1727B68B985; Thu, 13 Jan 2022 04:07:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E13D468B96D for ; Thu, 13 Jan 2022 04:07:30 +0200 (EET) Received: by mail-qt1-f175.google.com with SMTP id l17so5357853qtk.7 for ; Wed, 12 Jan 2022 18:07:30 -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=7e6YJKGpVtSInNILRUl/NqhyNuOp6SEPS9o1KSqnL/0=; b=VoyqoHFy2FdlMDZQKWgNwiCsd2K0RHc5VeA4QylfjNIOql79Rx5BwZb5ruKg4eWBwv wsBUPp8FUJeBDJ97FEacoO0PxHq/WO7NM173M3mKDZOi5S6ypv1Ph3DNNbuELIfxMynA mgWNi/N5WItvnpcWSeJothV7gYaSm1SYPszN+mXcgj4sAwRx3niQdLaZ/weHet7geL77 fY1P0KjOs6fdnQA9lT/vuefZtS9OL/zNP8O1U0dWhoKKMunM3xqWjUGv29sZaEVFRVg3 FLh2+7MqfWqWM52FeAdtGFhXpV2ZF5GgqG6J89mi4Pj/JJV15/3XRO6mQLq7uua3Hv5p KJkg== 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=7e6YJKGpVtSInNILRUl/NqhyNuOp6SEPS9o1KSqnL/0=; b=dOtMf2acKiN9brKFi6OjH74zJ98HvDNHEmQmO/TCdfewy2TlIB0ABYNMZnqjClk3e7 frmvHvrlDAwhJjRex/dEX6XfajoXN8s2d/S9pPsp+hYmNLj0uyyCvS4XMVJh/UTTU5DZ bRB4xl/g1HGASApautfj3RickVRLoTS402a086FyweiDAR0p+YpaxgmUprVUHFA3tebp 2etI2s4g2wWw5xwlm/xOkTKM8pFvuU5YspV+RwbNkG0k+RbnMP4P7C0YS+DznubnH6sX FsA4d1Y78m3eK/3RrHKwHP4OW0uMC6nU85h8fVlRdX3qgp6MFdJ4g9FVChx7TLanlwOQ TmFg== X-Gm-Message-State: AOAM530jzt23Gvh0AdI8P45CkOCjCXjPWZtfYT/x8GnEF1nReMkhJ/lb pseChtlfpxaNkFB+3XgN49Tn1N83mHY= X-Received: by 2002:ac8:5ad0:: with SMTP id d16mr1970774qtd.557.1642039649486; Wed, 12 Jan 2022 18:07:29 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a16sm1085946qta.13.2022.01.12.18.07.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:07:29 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:06:46 -0300 Message-Id: <20220113020713.801-3-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 242/281] nellymoser: 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: 8bpboDqS2wHL From: Anton Khirnov Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavcodec/nellymoserdec.c | 4 ++-- libavcodec/nellymoserenc.c | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index ccfe881790..6870ffea0e 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -129,8 +129,8 @@ static av_cold int decode_init(AVCodecContext * avctx) { s->scale_bias = 1.0/(32768*8); avctx->sample_fmt = AV_SAMPLE_FMT_FLT; - 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; /* Generate overlap window */ ff_init_ff_sine_windows(7); diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index 41d9117065..abf7d82160 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -171,11 +171,6 @@ static av_cold int encode_init(AVCodecContext *avctx) NellyMoserEncodeContext *s = avctx->priv_data; int ret; - if (avctx->channels != 1) { - av_log(avctx, AV_LOG_ERROR, "Nellymoser supports only 1 channel\n"); - return AVERROR(EINVAL); - } - if (avctx->sample_rate != 8000 && avctx->sample_rate != 16000 && avctx->sample_rate != 11025 && avctx->sample_rate != 22050 && avctx->sample_rate != 44100 && @@ -431,5 +426,6 @@ const AVCodec ff_nellymoser_encoder = { .close = encode_end, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, + .ch_layouts = (const AVChannelLayout[]){ AV_CHANNEL_LAYOUT_MONO, { 0 } }, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };