From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id BE90542056 for ; Mon, 21 Feb 2022 14:22:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE69868A3F4; Mon, 21 Feb 2022 16:22:21 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E4A46803F6 for ; Mon, 21 Feb 2022 16:22:16 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 71994240179 for ; Mon, 21 Feb 2022 15:22:15 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id cPRwzDFce_lp for ; Mon, 21 Feb 2022 15:22:14 +0100 (CET) Received: from lain.red.khirnov.net (lain.red.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.red.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 4291D240175 for ; Mon, 21 Feb 2022 15:22:14 +0100 (CET) Received: by lain.red.khirnov.net (Postfix, from userid 1000) id 516161601AD; Mon, 21 Feb 2022 15:22:14 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20220113020242.661-16-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> <20220113020242.661-16-jamrial@gmail.com> Mail-Followup-To: FFmpeg development discussions and patches Date: Mon, 21 Feb 2022 15:22:14 +0100 Message-ID: <164545333430.19727.1321914560829983903@lain.red.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 195/281] audiotoolbox: 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Quoting James Almer (2022-01-13 03:02:28) > From: Anton Khirnov > > Signed-off-by: James Almer > --- > libavcodec/audiotoolboxdec.c | 27 +++++----- > libavcodec/audiotoolboxenc.c | 95 ++++++++++++++++-------------------- > 2 files changed, 57 insertions(+), 65 deletions(-) > > diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c > index 9939fef218..8edf9bd463 100644 > --- a/libavcodec/audiotoolboxdec.c > +++ b/libavcodec/audiotoolboxdec.c > @@ -166,8 +166,8 @@ static int ffat_update_ctx(AVCodecContext *avctx) > &size, &format)) { > if (format.mSampleRate) > avctx->sample_rate = format.mSampleRate; > - avctx->channels = format.mChannelsPerFrame; > - avctx->channel_layout = av_get_default_channel_layout(avctx->channels); > + av_channel_layout_uninit(&avctx->ch_layout); > + av_get_default_channel_layout(&avctx->ch_layout, format.mChannelsPerFrame); Looks wrong > @@ -364,11 +365,11 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx, > #endif > } else { > in_format.mSampleRate = avctx->sample_rate ? avctx->sample_rate : 44100; > - in_format.mChannelsPerFrame = avctx->channels ? avctx->channels : 1; > + in_format.mChannelsPerFrame = avctx->ch_layout.nb_channels ? avctx->ch_layout.nb_channels : 1; > } > > avctx->sample_rate = out_format.mSampleRate = in_format.mSampleRate; > - avctx->channels = out_format.mChannelsPerFrame = in_format.mChannelsPerFrame; > + avctx->ch_layout.nb_channels = out_format.mChannelsPerFrame = in_format.mChannelsPerFrame; Should probably uninit+set order. > diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c > index 9245aa9dc4..aeda1c36fd 100644 > --- a/libavcodec/audiotoolboxenc.c > +++ b/libavcodec/audiotoolboxenc.c > @@ -278,10 +272,7 @@ static av_cold int ffat_init_encoder(AVCodecContext *avctx) > return AVERROR_UNKNOWN; > } > > - if (!avctx->channel_layout) > - avctx->channel_layout = av_get_default_channel_layout(avctx->channels); I suspect this will break unspec channel layouts that previously worked. -- Anton Khirnov _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".