From patchwork Fri Sep 23 19:51:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 38197 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp695742pzh; Fri, 23 Sep 2022 12:52:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Mr3cYjIiBneSndxVvguIQEBOpS2KXyvt6GQIKGlbF0q7tswVDyKL1381ito9x7Cs9zS4/ X-Received: by 2002:a05:6402:4505:b0:451:1551:7b14 with SMTP id ez5-20020a056402450500b0045115517b14mr10173184edb.300.1663962746971; Fri, 23 Sep 2022 12:52:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663962746; cv=none; d=google.com; s=arc-20160816; b=s5+gJjAB2Xk88rLzrY4a3rO7FzjZ6cwkejQ6sYWkApQE2xzdW+dKgFXBdNDuj+0qIU Bsc7AazRtbUygVARo+ZIRzgXIJMWxflzuWHI0b+PP5ejhBYKct5ug4FNWRrLi4HPkWAy 9Z5k8VEop0js6GEDRgzNliZhlowLkINsK+/77Yd2PdkXktdkxxiY0UdNhh2u8L1siKwQ Bcb0jgx6ngyS7qadZy4ehAQIYpwrKN4mUx3jW/P5Um248wpPiB0Jjwa0Nq72WMNAhv7g wK1DYcgwAb8GPRqIb0PdPX9utXyc25yE7Naxi2PPYJM5+LEsL8Ah0y6UE9XcYRZClZR7 MjAg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=7Oi+WPGrQ4F/NBj5YBJv3eoN2sWX2VB2e4V9iBCnmIw=; b=yXpMWDKmOggKttxM4CfRz8vFa/8O+NrEEvhOWaimXO64MTrHQJvOUhftEdWtcawdQq JxFiX2/8eNLOIaI5FijF2QGSEPCGvpSU47KQHdplj4j/TuRuPfrDKS+W8V2KWZN0D2nE RPSTd8U+UPjFJ0lbDEsVtwVCQSJ1imO/Fmdj0rjD5VDlOXAaAofJgb6KuA+cSFEqad5X +5MtpGlpAPuIQldAdOQ4Pr7ZwCO2KoOMvN0DX8J0LiJrS7K2WR773rTUpqS0lTPzD32S PP57SLFNqn/wv/tlM6rgIfW5Vs7hlCiqIAM6+mTtVlCtFqOE2fLTqE6l+xJ8MJLZukmY CQ7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TwRhd4V6; 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 hr11-20020a1709073f8b00b00781df60a2c8si2102417ejc.342.2022.09.23.12.52.26; Fri, 23 Sep 2022 12:52:26 -0700 (PDT) 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=TwRhd4V6; 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 1BD7468BC13; Fri, 23 Sep 2022 22:52:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D4EF68B745 for ; Fri, 23 Sep 2022 22:52:16 +0300 (EEST) Received: by mail-oi1-f173.google.com with SMTP id r125so1082093oia.8 for ; Fri, 23 Sep 2022 12:52:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date; bh=vWA2eSePduCV/qEVuBhhvs9OfFK+adzTvaJ6CbMBu/Q=; b=TwRhd4V6taIBBoEZwfdOPbXqTeA1eSdbJeaqvyNzVSDoNCollF+/AO4X7hIyF29e59 5BHvWKhm7oZ0yWZ9s3H5xTAqXj/Uj/HPA9PLiMaD1DNE3l46WvnP/B8nBy7LYEevep3j puZhqFGrEAPXfCIvPjW8Kk10F3x2F5B1I/RmIa28mt4GW74wFW6krbq8mC/EOBlgltLj zpcidpjfCCwzluUhBvrkjweyykQCFQ5553zaphmSW2A/p0F4nxydfFCNx6i9NI8A1YwV UIU8Ajs4Usdo/6AlV/ys36GmSq1bt8dc455JtLDla81VrI4uS7motkviaZQTYTFXR5F4 KxWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=vWA2eSePduCV/qEVuBhhvs9OfFK+adzTvaJ6CbMBu/Q=; b=irs0bKVx5LRWP5juZP5RnmTcwjavptYQoNs2KB7iKA+UD6x189dHCmjb1aVvt1lCkr PcUIud6Onq+k+HjBfij/2y2vGlfD4/uemBcAeflYRfqOf5hqPEQKi6CyBNKCXx5yHKQq WuJzhY8EgIvIvanavHnBy1btVIeztvQDhVGVkEpfXM2KgDe+ggjxpJgmgbulv5/EbKse nn4uY+sNtcwGa0Z7njyN/HEDNi82s48PBt0XnMVxK+5J2TD6KVND83d24pXtnPuyn9t2 auoPnzw2I/BMUz7XE8KKzSNLlQZzC3pHvIMVx6igF8qcIf5Fr1hWnExBaCCpGzBbKt7E xYBQ== X-Gm-Message-State: ACrzQf38DUWYEbP1EHSuXf2RQ7TctjK+zSZJwR3M3QJbmRlywLDmR6uQ ZpUKQfWkc9ejuGL7Bd7I48usutnlp74= X-Received: by 2002:a05:6808:1507:b0:350:7653:2351 with SMTP id u7-20020a056808150700b0035076532351mr5104668oiw.179.1663962734340; Fri, 23 Sep 2022 12:52:14 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id 30-20020a9d02a1000000b0063b24357269sm4468434otl.13.2022.09.23.12.52.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Sep 2022 12:52:13 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Sep 2022 16:51:44 -0300 Message-Id: <20220923195144.9615-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Kgu6p6440wuw 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); + ret = ff_silk_init(avctx, &s->silk, s->output_channels); if (ret < 0) return ret;