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 07263447A0 for ; Fri, 23 Sep 2022 20:02:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF81568BC19; Fri, 23 Sep 2022 23:02:08 +0300 (EEST) Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFA6B68B745 for ; Fri, 23 Sep 2022 23:02:02 +0300 (EEST) Received: by mail-ot1-f48.google.com with SMTP id cm7-20020a056830650700b006587fe87d1aso694199otb.10 for ; Fri, 23 Sep 2022 13:02:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date; bh=JPJBbRF/ThZ4WHvxXXjyKyLJa1aEOChH3XcltGg0Sq4=; b=eqxk54a867MRrUhWFY7nFv/b9HOQr1BIAOm7KbfByA6MK3L+vOnl/1B+6cSZUmYgmc wlgS8ts/Nyj2Hc7DhTDlh3G7eurXMuFAHYuEdgv4LJzcpZy4OJxctRy8IxwPzwmDsKdv oYyozdjiOJJEdFi4XMDoZMIzGN53cgdNG2OoeCZBlHLhDOoM6IOogdffHc5+NKWPzVT0 PZDF/eQ6fMedE91yQmkJGWCUkaxhaHsndLDR0jOXQjTmf6xmZbq56mOaRBl/oDcJmQWP NkpZEEcusUMIxpH3wG6NFnZOVumeFy0ilXJTD1+xOXneJPbuUbRVlJ2mBORBdDgz3eIJ 7cZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date; bh=JPJBbRF/ThZ4WHvxXXjyKyLJa1aEOChH3XcltGg0Sq4=; b=PBcHL63ZlOB4CcROJmXCr15yD0M/6MmDJXvir4h59bDoK0kmdvLneTZPnrCRLneQ1A 4GkE1O4FLYms2plTMg+LCt8JnKhv41NdxoX30ultO2N+2cTRkC/McnQ0xxZ0FuvwKHqm a0m3hVIj5J/TzFmcmp55cWMJgWeu/pHSPN1t/j0G25gexransaEvusAaSEaQL+ZZxbZj 76mbR26n4PlVFEs0ShRp5Ysbps0DjzM4c0ETGl0VJdMZSPy62WXsKeA5oBIRBSVvfbzD xO1yQO5l9DnAniAWPppCDfVH5KGdLlGjakRzq+037DUfitP5WEGfhURJAV93Vauy7bUR 0ItA== X-Gm-Message-State: ACrzQf0C2g1TJxw68dnBLXqFP1+sqCCWXnNh1AAm4Gx8iaXYdIopQ4oR SyC5Z23WlW0bs0YguBpefVp8kA6SovQ= X-Google-Smtp-Source: AMsMyM4293ZD0PGZeyVPUox68sfgjmc6E/7tIw+kpP6ChKC1MKj4gB/4fYHn1iHgHMUGlTHJs+4GKA== X-Received: by 2002:a9d:2a81:0:b0:637:1c16:53e with SMTP id e1-20020a9d2a81000000b006371c16053emr4714136otb.181.1663963320901; Fri, 23 Sep 2022 13:02:00 -0700 (PDT) Received: from [192.168.0.13] ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id e1-20020a4ab141000000b0041ba304546csm3670358ooo.1.2022.09.23.13.01.59 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 23 Sep 2022 13:02:00 -0700 (PDT) Message-ID: <930a3b8b-eb72-3de3-8c35-5f051096e7ad@gmail.com> Date: Fri, 23 Sep 2022 17:02:00 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220923195144.9615-1-jamrial@gmail.com> From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH] avcodec/opusdec: stop setting deprecated swr options 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 9/23/2022 4:55 PM, Andreas Rheinhardt wrote: > James Almer: >> Signed-off-by: James Almer >> --- >> libavcodec/opusdec.c | 11 +++++++---- >> 1 file changed, 7 insertions(+), 4 deletions(-) >> >> diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c >> index c04aa598b8..8b10bd1a25 100644 >> --- a/libavcodec/opusdec.c >> +++ b/libavcodec/opusdec.c >> @@ -640,7 +640,7 @@ static av_cold int opus_decode_init(AVCodecContext *avctx) >> >> for (i = 0; i < c->nb_streams; i++) { >> OpusStreamContext *s = &c->streams[i]; >> - uint64_t layout; >> + AVChannelLayout layout; >> >> s->output_channels = (i < c->nb_stereo_streams) ? 2 : 1; >> >> @@ -658,14 +658,17 @@ static av_cold int opus_decode_init(AVCodecContext *avctx) >> if (!s->swr) >> return AVERROR(ENOMEM); >> >> - layout = (s->output_channels == 1) ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO; >> + layout = (s->output_channels == 1) ? (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO : >> + (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; >> av_opt_set_int(s->swr, "in_sample_fmt", avctx->sample_fmt, 0); >> av_opt_set_int(s->swr, "out_sample_fmt", avctx->sample_fmt, 0); >> - av_opt_set_int(s->swr, "in_channel_layout", layout, 0); >> - av_opt_set_int(s->swr, "out_channel_layout", layout, 0); >> + av_opt_set_chlayout(s->swr, "in_chlayout", &layout, 0); >> + av_opt_set_chlayout(s->swr, "out_chlayout", &layout, 0); >> av_opt_set_int(s->swr, "out_sample_rate", avctx->sample_rate, 0); >> av_opt_set_int(s->swr, "filter_size", 16, 0); >> >> + av_channel_layout_uninit(&layout); > > Unnecessary. You are not even using any of the av_channel_layout* > function to init layout. I know it's unnecessary, but it's to promote the good habit of uninitializing layouts when you're done with them. > >> + >> ret = ff_silk_init(avctx, &s->silk, s->output_channels); >> if (ret < 0) >> return ret; > > _______________________________________________ > 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". _______________________________________________ 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".