From patchwork Thu Jan 13 02:02:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33461 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp37699iog; Wed, 12 Jan 2022 18:34:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJyeroh0fXSSU2T+O24W5ZBVyRCL//myZlMS5DSIckb62YZCFSWdbqlQPdpDjZqP8WR42GOw X-Received: by 2002:a05:6402:c92:: with SMTP id cm18mr2310845edb.295.1642041248303; Wed, 12 Jan 2022 18:34:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041248; cv=none; d=google.com; s=arc-20160816; b=mULZYOwzCu/LkoOHPXNgKy7Pu4DN3lCGSzWcTqkqEDbRzND9V610BRQkt7YIH3dNd5 9HENwvTLNQvxbK08onk9an6WJE3tBqW36ypPFM1nw/RkEetS/tH6v+4SN2qChqCgFkr+ 6ntrRjJuhDydJ8iAZ8n2U3iRJrfSiYrdJohF1U4dsKwmIHTpkqABt/0IX7IX/BztdiPA VAADxKJbewZecIF704I60PoxfxkVCa/tEmOp7g22ihXQ5E/ZmiuF+ltDZVbX++wuSkLr EAGFWKN8ZbPuQ7ODzJsE1v1OkrOTqAetfiYDqRFyDm2d2Pl8z2LrWJuchuL4FRpT8mI7 MZiQ== 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=P0gKwR/ZYgv8eESATC1ZbbuFNPReOZb+7TZ3eD8tifo=; b=rEgQ2BUauJu6FPKgN6RdeqW3uUFDTWxw/S0U6pOB9s0ytkNkVyz7VToTbP+bIwcvAV bkdiddxRtx/9mnPKXOz/yL5owRdFA64XRZz3S2rQdCKw52GBZnKzRiep0ueIvE7GgXIA /bC8Ht2LWCCLdeWXcOk+5j9Aiwv0sT4Uf875KoILnULCoKTQ0S5q4KCPayzz7gC0Q0ZB Cvo+vBlEyFXtKUIo8RMsRQYdCTFKNqPr/aZnycCdqXu2qafW7DYMm8cFLrWSKBKQztHg lIcpLZnqrSkJpPyYb3eUI9VgvV4OeRd0Z6bRxzJQlnR3dcL9cyz9Bko9NlGH2iJeLIHA 5Wrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="kh2HbMT/"; 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 m8si947904edc.341.2022.01.12.18.34.08; Wed, 12 Jan 2022 18:34:08 -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="kh2HbMT/"; 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 E772C68B5D6; Thu, 13 Jan 2022 04:03:13 +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 8F42E68B5C2 for ; Thu, 13 Jan 2022 04:03:09 +0200 (EET) Received: by mail-qt1-f182.google.com with SMTP id q14so5324384qtx.10 for ; Wed, 12 Jan 2022 18:03:09 -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=GNzcpnIr+jPphs4Aup0ZJ9GI2KuQPWMhSBYMOgU3ZJ8=; b=kh2HbMT/xThH5A2B+QcPxtXRAzQjWhuBDcWvyleE1e/K5Mb2+8fH1aZ4rjWMBQcWOa RJapJAbII3TGF9tUMu5st4knExW3d7EhO2B1CaBCpPsJH+I7sv4dktAcml05Cnez3ejc DONPgTe5E07RtiYm2wYf0dzX+behxsZ+gwdK4L262SenIpku92r6d8718y1H9W/3nvMt ypM8okM87KalM+beRYq9ahP87GiLwIjYZoIcdTEZKX0J6KnrrEJ5xcX97uE/jeUGLi5/ wlxJjYIECuKDB4DNIh/p6NNAeXLwZjtzQtE5Q2iG9tutQVMxh6nNTZAQ4REXGkQ5LB2d BV7w== 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=GNzcpnIr+jPphs4Aup0ZJ9GI2KuQPWMhSBYMOgU3ZJ8=; b=EE8Qw50mwNlqYwgmwqx826VQPC6CtIumOwdyJcjOPr0sa+MmnHRFXADazH+3mz7TxG H/wM3aCdJ5/HH5dLdM3Va0SGHtUpw1xK11gU3917f4aM0Dl9W3TS6sPpiTNZcDCr6KMS 4d1p0vn9YFnZo0gpRHE6neyWQyS/grdijjQEgpH1PlxmBY66kM1BLIpmoHQMF3FHqysx mGveixkHiSSkH9RNOfgxP+Rzxj9epd2ZIiCRNYfCyZhnb3u8LIuwrxHMaudSbS3GrwQF Z7wBwNVzZ+dKucvj9KxF8UgcbdhYTDa8XWy1gP1DIQIx+LlsAnMM/4GHV1ikuY2ZmqdW VNFg== X-Gm-Message-State: AOAM531nrEy8ipVxGzNuhgwD0cRQgR9h9den9mWc4ifSVy9QY8HZAIa0 qewiMqyAuLLc4WBWFh1B/nmq381hXxU= X-Received: by 2002:a05:622a:1206:: with SMTP id y6mr2067279qtx.356.1642039388188; Wed, 12 Jan 2022 18:03:08 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id v1sm1045961qtc.95.2022.01.12.18.03.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:03:07 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:02:22 -0300 Message-Id: <20220113020242.661-10-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 189/281] aptx: 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: vKIP8NGFzE1E From: Anton Khirnov Signed-off-by: James Almer --- libavcodec/aptx.c | 2 +- libavcodec/aptxdec.c | 8 +++++++- libavcodec/aptxenc.c | 6 ++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libavcodec/aptx.c b/libavcodec/aptx.c index 3aeee1907c..d8e0c207cf 100644 --- a/libavcodec/aptx.c +++ b/libavcodec/aptx.c @@ -509,7 +509,7 @@ av_cold int ff_aptx_init(AVCodecContext *avctx) AptXContext *s = avctx->priv_data; int chan, subband; - if (avctx->channels != 2) + if (avctx->ch_layout.nb_channels != 2) return AVERROR_INVALIDDATA; s->hd = avctx->codec->id == AV_CODEC_ID_APTX_HD; diff --git a/libavcodec/aptxdec.c b/libavcodec/aptxdec.c index bdcc076c41..1d862e8e6b 100644 --- a/libavcodec/aptxdec.c +++ b/libavcodec/aptxdec.c @@ -146,7 +146,7 @@ static int aptx_decode_frame(AVCodecContext *avctx, void *data, } /* get output buffer */ - frame->channels = NB_CHANNELS; + frame->ch_layout.nb_channels = NB_CHANNELS; frame->format = AV_SAMPLE_FMT_S32P; frame->nb_samples = 4 * avpkt->size / s->block_size; if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) @@ -181,7 +181,10 @@ const AVCodec ff_aptx_decoder = { .decode = aptx_decode_frame, .capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, +#if FF_API_OLD_CHANNEL_LAYOUT .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_STEREO, 0}, +#endif + .ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_STEREO, { 0 } }, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE }, }; @@ -198,7 +201,10 @@ const AVCodec ff_aptx_hd_decoder = { .decode = aptx_decode_frame, .capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, +#if FF_API_OLD_CHANNEL_LAYOUT .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_STEREO, 0}, +#endif + .ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_STEREO, { 0 } }, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/aptxenc.c b/libavcodec/aptxenc.c index 5ea6053c26..1230ee306d 100644 --- a/libavcodec/aptxenc.c +++ b/libavcodec/aptxenc.c @@ -253,7 +253,10 @@ const AVCodec ff_aptx_encoder = { .encode2 = aptx_encode_frame, .close = aptx_close, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, +#if FF_API_OLD_CHANNEL_LAYOUT .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_STEREO, 0}, +#endif + .ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_STEREO, { 0 } }, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE }, .supported_samplerates = (const int[]) {8000, 16000, 24000, 32000, 44100, 48000, 0}, @@ -272,7 +275,10 @@ const AVCodec ff_aptx_hd_encoder = { .encode2 = aptx_encode_frame, .close = aptx_close, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, +#if FF_API_OLD_CHANNEL_LAYOUT .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_STEREO, 0}, +#endif + .ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_STEREO, { 0 } }, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE }, .supported_samplerates = (const int[]) {8000, 16000, 24000, 32000, 44100, 48000, 0},