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 89A7444049 for ; Fri, 23 Sep 2022 19:56:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B69368BC23; Fri, 23 Sep 2022 22:55:58 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2106.outbound.protection.outlook.com [40.92.91.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4145968B889 for ; Fri, 23 Sep 2022 22:55:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mOkmgL/Os9clfRK1gExJ0NhN8S0aQKA3jVMaXsEDcfl++MaaQTL9Z64lkgyWnwRCOrUCjVzc4BZEcOTvQgAsuLm4gqcZeILUV4vuHNTLTISgmC7XOzqW9lVJ/Ot263Kbwrga1vqdDT9ELK5JWKLW3BjQ/93tcAZmS6619aJEVaLHbXDcXwtIOhKptPic711GHxWxkQmepRla8w4VoaM98yxR2wpDCi1v8SZ3kw0ly49Y5/xFmE56EbSLTlmkHoBVT6nR5YWnCaCbpECRZlIyznX+0HFQkxaX9+Wa54lMPyt7tMFZcLiB+sfU70WhBW2POfTH3esdGcHluebGB84QxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HcCwjvJlpXBEw7NmL8UaInT6AD3DxBzDtEn74+WO9c8=; b=T4SaxbVZOknM1P+wmWBAc8NwG7k4G+sXI/GyjFeciJPMNhLwaCqI4eZGeTBWoXltOaxY3C1z6QowD+VhifcrarSdGfvSaF1zgxFgf7u9+EUu23H8miM+6ym+ruQVtGH6nO1VglcXjNRD6PUS6Xa0K6wv0HTKpcq1Md/Ne/EK6RBBUPcAVavc2z4vXmko+JXigML8T2z7u/+hbc6CeJWlsoGyZrG0oE7xebit3qzoyYSyd+/E5HmeoCIZW8FzwHeC9xCdP2wWhmFZtniZYgC5yhhopFWx8Gv1CNqmgEJyTwlhp2I0K5K0zi26WYYiTrJQAyOQA/UI9AzD6j3FUK7jdA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HcCwjvJlpXBEw7NmL8UaInT6AD3DxBzDtEn74+WO9c8=; b=It9VfxEVWNVe8W5INTvfMcHUFsxFrTCmD0L7c7cgYzaWl7/Qv296sX9BQBbezzDDcgTu11/QD3/OXihU8VZ+KMm5YksuoYEqhLRyEUD0VnawgVSvY8GE64Fvw5dSYnfT8+A4JozlkUpoI7eGoMRlGSTts1saUt3TDimhme8nFbvcmFDsfaeeAOFIqhi81aNghM+bTbsdVE5PX+XN+qKqrHRwKt+PO6bFa36KHLSMEnEJylH6qIyR8ckYdNTLVBHd7Bs3tVGRPMQgGfGlf/6qPcWXVFLGmNEIc7QPsb03MQUvSp80XQydLTsVkpjeurd4wGehUwF+DcAwye8nTjt65w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by GV2P250MB0826.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:af::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.18; Fri, 23 Sep 2022 19:55:44 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::2218:36be:48cd:57ca]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::2218:36be:48cd:57ca%5]) with mapi id 15.20.5654.020; Fri, 23 Sep 2022 19:55:44 +0000 Message-ID: Date: Fri, 23 Sep 2022 21:55:48 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220923195144.9615-1-jamrial@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20220923195144.9615-1-jamrial@gmail.com> X-TMN: [KRz2J2V48KWjg+2AKSNR+WwSXbPL7ISry93ithSQ5HQ=] X-ClientProxiedBy: ZR0P278CA0095.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|GV2P250MB0826:EE_ X-MS-Office365-Filtering-Correlation-Id: 53a1e22e-69d2-461e-fb2d-08da9d9d99a4 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A+VHk8c7lBIVthzCI9HIikZ6+rX+TxvWlsNIIVp0tuubvMkq9ITHeySDf2kEc+IcEknD2t83jP9ohOATx0gGpiqKuFVYyEBKFX3qYcvvbQfvj8VETk7dV2shYXXl+8UodfowqcFfAdRq4JXImc/RUYQdU/zdqQ9n3cMxRgXtt1PhqlWQTpBcqcKEIwF+dxw/QQPvLRoVwxnj13/wWkmV7aGUAXzCWOYF4Ku/PC6Tb9aCyQSWgFTdUVEjCKhq++kuhzTzYoB7gQo9xsv/aWKy9k9L6jONN53H+LUMiIYxoNYFraMCk6AeypBlr+WbML7W2ggqfwxce0esJlRPOh4qFWtMGsLEsehi66SP1DkETrLBhU9MvdxnwtfsjfY1xgvfYhsKqYDVUWA3zW6pblMEVU6Bxja7NcftvHF1OMwZS22pT8hdQdbWBrngnmgy3HdGDirBm4Dg1wN4lPo2fJX6ZR2nMvP5Gu/D3yYz5whC1cCZRLmowOWMxLfB2atNaLK7GXzKF0EXPsxCTQj7GNqnlTtYFlNn/Th4V4ms+j+UAxGjdg7Jq7zPPFQmhE6xIot3eCyKiFH2v5NFkFhFIxPl3OSj/BT4PIoXH8B7h2UL2BrTl7S/ibnW0mqjbFsBbNZjsnNDSajJd+Um5Sf+kGRafLY+OACvoGvsWfpuIYWvY4NcmtgCBfTT5g08QO9JUghS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aFc0TFM1VHhpOG1QTUR0c1NCYmZMK3FHZHkxdDIzbTNhWThwUzQxWnhxcFdy?= =?utf-8?B?U281N2duQm42cHpiYzFkMXRNWFhCOXlTZ0QrU0VkdmZCM0VhZFFodjFnR01K?= =?utf-8?B?aVFxeitXdCszSGEwWHdyYW10cDlFc2VxTVhMdktpVm9ocE1VWE83VHAxQzJx?= =?utf-8?B?UklwbGFpOGFWK01MZitiWFlwSTQ4VldxK0xSbkIxT0dnckY2c1FaT2pzbXZU?= =?utf-8?B?WXFhUFJld0d5dEFXblhYZG9WVFlqUENjQzNWbkhyUzNYK3FiWExVNkV0Y2w5?= =?utf-8?B?cGFqNXNvR1R4eFpiRzhyK0JjQ2VWNXBRNkZSNHkzbDJ2VVJVbW1QRElWYUho?= =?utf-8?B?VzVlWkdvbUhzWGZBK29XWGNreGlqNFIvRDY1QUVZSU45dlUrTkZTb09tdXUv?= =?utf-8?B?MS9uT1pzcUZmWGxkNDdhTUdnaEV6TjZQQ0dMbDRGdHJKaVJMaTJOc2ZROFBx?= =?utf-8?B?U1ZSRkRHaVlWeGY3QnQvMXNjUTM2T0dBNlZFczN4ZUhPd3hGbkxaWHRRRGc0?= =?utf-8?B?NFBudUJGYjIzZFhvbnpjazdaTDUvbGQ2cnpWbVpGVjFBd3hxcnNYQlhWOXFG?= =?utf-8?B?ZFJUUmhqdit2anlXSkI2aXMvZFFyWjZRMktCVWYvZ0FNcVdzdXR4emRxemI1?= =?utf-8?B?dWQraTAvdHVPUTZqejh0eWdpRDBDVTYzQkpWYWtiK21HemttUlFrMzk4M0pU?= =?utf-8?B?cVQwN0g5RHFlYzREeDBDOWp5NStZYzlwNFVYckdUVTdOMnUva1BmdkthbVNW?= =?utf-8?B?RGVsSkpwa0psMGE5QUozOFBkZWRaVS9pZUw4K1R5Q2JnOHMyYnVoTzgyeVYy?= =?utf-8?B?Rys5Tlh0aWUvUWY5M05nZXppMDQ4ZlJGa1lCVzF6b1YyNmEySTVGTzJibUpm?= =?utf-8?B?aU9RY3p6UmRnZlhjcUFJN1BENGhTODA0NjN2OGQzRzhWb0tFdnNzd1hML3hz?= =?utf-8?B?ZEdaTzBaNFdJaUx3RktiOUZmaEVtMmFSaFJMUEJjRmFHY0xnME1LQUhaNHhj?= =?utf-8?B?QVBQd3FWMXlRSG10VDBybjNPa21ISk82OGRUV3N2R0lSNTc0dlVtK1h0NUZx?= =?utf-8?B?aVZ0RndydlkzVE8yenhKY2xjSEFmbTFscWI4RVRjU1Btbks2VlE1ZFBWMktL?= =?utf-8?B?WmlvcGNNN2xXekhpUDlEemZzZWRCc0hDRk0wTmtQeEduQlpOVnNyMVhPMmsy?= =?utf-8?B?a2ZCczMzN3Rvby9lQk1Md0pENnlSZjV1UlAzWVBuYkcyMlk0QUtSc3lnakZN?= =?utf-8?B?NlBqRm10RE5hSFhiR0lKaWNOQjB3dHYrcHJucmpLU2U5b2I0empXRGJaUVYz?= =?utf-8?B?RFk3ZlhaUWdsMVpmaDIvVk9GM0ZMMTBrZ3RMQVdSUlZNZ1BaazczUEV5d0Fk?= =?utf-8?B?ZGlCSENPOTA5WHdKWUhFcjI1MkFzdUQzcXZvNWhXVm90ZmlqQ0kxME40NjAx?= =?utf-8?B?YXdWbG9lOXJTaE93ajFJbS91YXBjWTZ0UzVTZjllWmI1c1B3akNWR2E5L3Y3?= =?utf-8?B?NEhxd04vRmhXYVp6NzBraVcxY0I4WHJpTHJkT05ETVRkYU9tMmxrSlJ2MG5O?= =?utf-8?B?YzExL3k0aDNxaEh4dUtpTWoxV21pNE9rek50T2ZKS3ZQT0V6NEFtQzUzclhD?= =?utf-8?B?cFFPSzR3ejBzdjFzWlU5Q1hJNURpUzdaZlJyMC9sR05pK2l3dkYzQ3UvVUhr?= =?utf-8?B?UWppUDRsZzJrakVWYTNHcFJ4NWZVSUZZK3N3WnVEL1ovTEZuYXlmNVZJN1Nz?= =?utf-8?Q?zjjbfP6xC1JRWyRzDFAGgzS5AjNTRWjY0uYtpha?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53a1e22e-69d2-461e-fb2d-08da9d9d99a4 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2022 19:55:44.1529 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2P250MB0826 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-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: 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. > + > 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".