From patchwork Thu Jan 13 02:06:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33514 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp44363iog; Wed, 12 Jan 2022 18:47:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwKFUxbb4ykBK/Pz4G7aSSet8mesQ5MbP+GZfx/E7f8DRw2uHf3/rgLK94MN4M3A0XDPp/C X-Received: by 2002:a05:6402:11ca:: with SMTP id j10mr2383516edw.169.1642042024889; Wed, 12 Jan 2022 18:47:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642042024; cv=none; d=google.com; s=arc-20160816; b=I8Aif5thmJu/bKdcLIdbdm8WgebEMeQaIQTI1bBRQL1yRfoYnw78+8/unzHP071b42 ByTfwK1nBB4D+gQ5R7rqQSdVvO7h+CUx9MHIPn0zfnwqTUAUpvUP0G0cmws9jhiR/m9b XBnmE3hYXeOf8wSWnRf4D8orUfbs1RsbgZlpHPEiyCIV0V/vRZR38byaYIu4ZGY9ANPN Al78B5IkwlaMI4h5ZYuP9Ykod1uXFnH5/ynO2eLtvW5enKMxEy1wLCr1itxVcy3gb70w hQ7G1Qf3HAJH3cvqMBpluE01Bjt+vPeMuKIeQP1e+jrKeRrAu6A0NhjJenSUV63hknRE IIpg== 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=p133TBcweeb8fxj9TAo3JjLG4TSB2MCMnhqi9pgQvx8=; b=a6xIZnP6Fhc6K+8UOBfrXcRaBD0VdRJ1qQcHEn4C9OrXyMAHNPiMsSzwNgwozzOzQ1 oyZ34O+ZUZx97TZArwZhirGPs1i96MIyBqoaulHbWwRc7k6n/75d60JWCZDMmoA/Pyng dN5GJZZh+Tgu1EiKFknl2shSA/yZRA/zu7r8hU2RPlHwLWoEfLrz+JsPx983BF4j6GNk tfVVuWdTfsscKP2CEPxlVkGs5udpU2qNTwWE4V54xYQR0wlUkr3+CyjN/YQckihmv0bI MN7nUwZLZSbgafP/KRAuLGeIcxrf1KCBXE1qOj6CcV+AOiQkHQoZQugDx9KFHouDPhGy 1F6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=dvhig7io; 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 b15si995639edz.166.2022.01.12.18.47.04; Wed, 12 Jan 2022 18:47:04 -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=dvhig7io; 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 6837C68B1B2; Thu, 13 Jan 2022 04:07:44 +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 4993768B962 for ; Thu, 13 Jan 2022 04:07:42 +0200 (EET) Received: by mail-qk1-f174.google.com with SMTP id h16so5626450qkp.3 for ; Wed, 12 Jan 2022 18:07:42 -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=3yhdH0ukmu7s/Io6AH9+wi/piYcl9TQK0PiDbxPK+m4=; b=dvhig7iolmep+K2jp4uKWHITGVt8Fr9nrAfTo4INBG72L605CIz3wenH4I6elZnnWZ cPTTNAopqkT9MN50HuNh456ia+YAcevR1CYg4tamAOCuF3UjoRf2YN+3EERbJXS8V7LN PMJlzLDZt3S4HvaWReSuoj8pzkCyVxfezb9/O4hVB4UDa0s3VLvclajC9hHfR9WQ1xjF E/H8WKzzIlDg+Tb3sMT6Iwrwbew7c6GfVR6ZrSNxwOA2TWaPrpUr9BSSwiiwvnfqle58 zlXqETduru0jJamnuFYKlrgWN+SzyD/ubv6a0yz9inEYpbkZZAgkS62WVFH5iA7Zgcgz Ag6g== 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=3yhdH0ukmu7s/Io6AH9+wi/piYcl9TQK0PiDbxPK+m4=; b=CnUe5mY16TGgajifLRp4/uspMYqJptiUuwZxyY6qvy+maD2fSHd9Z4ui0cRGEqqvWs rwTAWGHiSt4aqbHqEoKpQhaYVvrgKLX2cp0eJiWr6j5JEs+Mu0w7ADDlHwwrKi8TY5vD vpCOgppd0N345Nhv0DZEyDiWNGTTIJVLfQxDMsvVdSzhleyYEEMbde/0ugkUy8a5jGcr q1qg7OojE7vYkrC5miE7miMy8m4byB31baxLNFTbk4cceRD2+r/JNMHED06ExYLkfZWn wcJwyih8TZCOW6buX3PDqhtJiGSgB+dDaGwokKt8DAWzZXYwADN6ATrQpUzBdSf0cYot Z00g== X-Gm-Message-State: AOAM532LArHcStqtG7c7lP9TwD/YlyRlI+upuFPAe2AO2Eknj/Eto7qt cuzU9fUiUeoUz07LHw2RR/bb/cARS/0= X-Received: by 2002:a05:620a:25c8:: with SMTP id y8mr1906987qko.455.1642039660839; Wed, 12 Jan 2022 18:07:40 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a16sm1085946qta.13.2022.01.12.18.07.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:07:39 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:06:54 -0300 Message-Id: <20220113020713.801-11-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 250/281] ra144: 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: mJ+uSoY7rTw5 From: Anton Khirnov Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavcodec/ra144dec.c | 4 ++-- libavcodec/ra144enc.c | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c index b6272b343b..86d0d6e889 100644 --- a/libavcodec/ra144dec.c +++ b/libavcodec/ra144dec.c @@ -39,8 +39,8 @@ static av_cold int ra144_decode_init(AVCodecContext * avctx) ractx->lpc_coef[0] = ractx->lpc_tables[0]; ractx->lpc_coef[1] = ractx->lpc_tables[1]; - 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; diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 7a96354633..19d46ffe0c 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -51,11 +51,6 @@ static av_cold int ra144_encode_init(AVCodecContext * avctx) RA144Context *ractx; int ret; - if (avctx->channels != 1) { - av_log(avctx, AV_LOG_ERROR, "invalid number of channels: %d\n", - avctx->channels); - return -1; - } avctx->frame_size = NBLOCKS * BLOCKSIZE; avctx->initial_padding = avctx->frame_size; avctx->bit_rate = 8000; @@ -554,6 +549,9 @@ const AVCodec ff_ra_144_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .supported_samplerates = (const int[]){ 8000, 0 }, +#if FF_API_OLD_CHANNEL_LAYOUT .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 }, +#endif + .ch_layouts = (const AVChannelLayout[]){ AV_CHANNEL_LAYOUT_MONO, { 0 } }, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, };