From patchwork Thu Jan 13 02:07:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33528 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp46429iog; Wed, 12 Jan 2022 18:51:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJzYavoWVSgAfYW/IYMtvWOAu1TXwcW8QsKxG0gxOB/oZBdt6kq83irBOYBi79qpjKiM9cKY X-Received: by 2002:a50:e79b:: with SMTP id b27mr2394225edn.336.1642042272838; Wed, 12 Jan 2022 18:51:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642042272; cv=none; d=google.com; s=arc-20160816; b=0blEg/VinAWmfRi1imv7Qn05Kqa0JQHptvQR4wBsNMkpQOlL2N4+s3pcO7lEpfrvP+ F/yTpJXeYZU3uDWFDV2SaicQMKlp4081u6qkXBmpkw9hvX1mZQifrJVvtNf1XFqZqEy9 VAGN5lF/uQ/319x6TNdowR5H8SI9K2Evpzscadxbmyjig7CITOiN9zQSRIvdfz3dXq+t RrwOAKw7nynQ55abM7174Tk4rc96jD1m7Tl+sF8XxTZL/7O8zsB1Zb3PcYpLuCO08DPQ 70saurPki8LFr+6kGE4bmW2GEc4z1/CHks/aLQd6qax65ESnVtsc1pHbtethVqo7Iu2S hyIA== 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=FuZFzpZ+38x2nELLlIyH4jB3gNTQrjVjdVp10GcLv4o=; b=UmUcpVNFKA0uN85zzFEWMfsRO1LpjGrqZ0R6SnSpyudCKLYz6rHz4mVtLyQ6J7uTzK JDHStXXY50uMdpNVhukVMr6u3nDeRcqaRuVpAeddmn28h0lWUvpwoVj8Hj5++f42oANW VP+agnLjiKvAyHVQhDCZ7nv0KtcpNEb7XtbTC0QYziQQOeCOuLAPyMGI7tZxxojK3Grv HE0bCD3HyEc+IsrbhpSK0+UpvpDBuBokvx+amlRkRdJ0acUkmlrom0LlhTq3moqOfJsm jFjkqRmgaHMQ5+HUzpL615Eu+RHfEb9phjLUFzKF/ATT/PnQaRExsESmcSDx+EqY2jh7 xy6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=WyUwaE+c; 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 l13si814406eda.153.2022.01.12.18.51.12; Wed, 12 Jan 2022 18:51:12 -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=WyUwaE+c; 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 D297C68BA5A; Thu, 13 Jan 2022 04:08:07 +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 F1E8B68BA3A for ; Thu, 13 Jan 2022 04:08:04 +0200 (EET) Received: by mail-qt1-f182.google.com with SMTP id b14so2447085qtb.12 for ; Wed, 12 Jan 2022 18:08:04 -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=9LZfA+u5/p+T6BEVAbw2TfiQrp3VswisD7c/RutLAjs=; b=WyUwaE+cyPCyvEY/Fy+gK6nHfg/JtUkT9cUk3ahMzcD4aNEC4U2wNadER+NAC6yUaG r1uo6hX0LbWKOBY+Xg3C/ktI2q20lg+2X1AeaAVw7+YyodgrZmO1iNLnFoXW97m4oFCH 3O8np/MjE+lY5GlJ/qlvFDjzlinZNtfbU4U3gTn30Vxd8M6puZ/fYZEyo4VrD6YMMHK/ wWe5H0fz0JmTX/zZ+WyzsOpzEUFMv+J+30+D7JLlgOcNCNhbxoRq6smB1R9z622+RXCe nySzxlelWOsDcwtaZ/bOqG2g8synTnUb3QkPGJF+GOkEcjZcZTEYItYyFod0m36W5fJN eYsA== 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=9LZfA+u5/p+T6BEVAbw2TfiQrp3VswisD7c/RutLAjs=; b=LOQyRToqlMINka55iOb7yhx/QzTxx5jbG4wRAUfe39mvHtlqYC+Ne4uvlXEN91OGnM Ey5emAbsII0wGO/i/H2YkoWABmNKoNlcBIBUoG5ZgGn77iLApCbtIU01DqNE6pchpPHG Rm+92gVV1ff9rMBc449dxYU73cYi7Owa0PT7yRHEGiCBsqCnENqXYVambmtC8OTWcFkX Nj7PrcDgScPUaeezadyD9TiK9d0WNF7pqOug+a0lj8QkvWdcba3NYS7nSZltVESZ1VV2 AXgROCofSwo9e/qtU8IInVstPz1d1211YVA9SN6KTPbI/noNIMwA9dXcwCKG5JbYl6gx R+Qg== X-Gm-Message-State: AOAM533asX17g3GT8KNnzwh4mif5ScyrWUOdqfHjnUf/60IB3gihPD4n fUlyUUnmWfO2aE3Ncm92368RpQYNzTA= X-Received: by 2002:ac8:5ad0:: with SMTP id d16mr1972184qtd.557.1642039683433; Wed, 12 Jan 2022 18:08:03 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a16sm1085946qta.13.2022.01.12.18.08.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:08:03 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:07:12 -0300 Message-Id: <20220113020713.801-29-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 268/281] vorbis: 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: z+7ShbMGu4fI From: Anton Khirnov Signed-off-by: James Almer --- libavcodec/vorbisdec.c | 27 +++++++++++++++++---------- libavcodec/vorbisenc.c | 7 ++++--- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 6e07bc5a8a..d961dc37b9 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1077,12 +1077,14 @@ static av_cold int vorbis_decode_init(AVCodecContext *avctx) return ret; } - if (vc->audio_channels > 8) - avctx->channel_layout = 0; - else - avctx->channel_layout = ff_vorbis_channel_layouts[vc->audio_channels - 1]; + av_channel_layout_uninit(&avctx->ch_layout); + if (vc->audio_channels > 8) { + avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + avctx->ch_layout.nb_channels = vc->audio_channels; + } else { + av_channel_layout_copy(&avctx->ch_layout, &ff_vorbis_ch_layouts[vc->audio_channels - 1]); + } - avctx->channels = vc->audio_channels; avctx->sample_rate = vc->audio_samplerate; return 0; @@ -1788,12 +1790,14 @@ static int vorbis_decode_frame(AVCodecContext *avctx, void *data, return ret; } - if (vc->audio_channels > 8) - avctx->channel_layout = 0; - else - avctx->channel_layout = ff_vorbis_channel_layouts[vc->audio_channels - 1]; + av_channel_layout_uninit(&avctx->ch_layout); + if (vc->audio_channels > 8) { + avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + avctx->ch_layout.nb_channels = vc->audio_channels; + } else { + av_channel_layout_copy(&avctx->ch_layout, &ff_vorbis_ch_layouts[vc->audio_channels - 1]); + } - avctx->channels = vc->audio_channels; avctx->sample_rate = vc->audio_samplerate; return buf_size; } @@ -1892,7 +1896,10 @@ const AVCodec ff_vorbis_decoder = { .flush = vorbis_decode_flush, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, +#if FF_API_OLD_CHANNEL_LAYOUT .channel_layouts = ff_vorbis_channel_layouts, +#endif + .ch_layouts = ff_vorbis_ch_layouts, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 858c6ac6dd..30b75ab3f6 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -276,7 +276,7 @@ static int create_vorbis_context(vorbis_enc_context *venc, const uint8_t *clens, *quant; int i, book, ret; - venc->channels = avctx->channels; + venc->channels = avctx->ch_layout.nb_channels; venc->sample_rate = avctx->sample_rate; venc->log2_blocksize[0] = venc->log2_blocksize[1] = 11; @@ -1038,7 +1038,8 @@ static AVFrame *spawn_empty_frame(AVCodecContext *avctx, int channels) f->format = avctx->sample_fmt; f->nb_samples = avctx->frame_size; - f->channel_layout = avctx->channel_layout; + f->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + f->ch_layout.nb_channels = channels; if (av_frame_get_buffer(f, 4)) { av_frame_free(&f); @@ -1267,7 +1268,7 @@ static av_cold int vorbis_encode_init(AVCodecContext *avctx) vorbis_enc_context *venc = avctx->priv_data; int ret; - if (avctx->channels != 2) { + if (avctx->ch_layout.nb_channels != 2) { av_log(avctx, AV_LOG_ERROR, "Current FFmpeg Vorbis encoder only supports 2 channels.\n"); return -1; }