From patchwork Thu Dec 2 20:24:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31892 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp565894iog; Thu, 2 Dec 2021 12:25:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJy4KMteNjHTQn2vOmpvRl7qc8isVmiHFwxjhiHXpsgybuJB5eoD6aDn/98K74aj9N/vqJyb X-Received: by 2002:a17:906:974a:: with SMTP id o10mr17821434ejy.226.1638476736550; Thu, 02 Dec 2021 12:25:36 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r24si1070545edo.230.2021.12.02.12.25.35; Thu, 02 Dec 2021 12:25:36 -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=@outlook.com header.s=selector1 header.b=Nbx9LzMu; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 31D6568AD8B; Thu, 2 Dec 2021 22:25:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (unknown [40.92.67.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F63F68AC6A for ; Thu, 2 Dec 2021 22:25:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EsFtQnGUsFoVWe4H9D/4eZmK+uJ4FnuVHl1NTtFjF9UZsFBRbzLB4wUhCcR4xt9NloVcqYh8XzK18xFUALsN6VAhDHqVjloHZ3fvQwjRyyASmiWg2Dau91MnsuwoUsu30YZYyCNaDBvHX92DEZYWyW5CEOQP9dhEZ/hVg10lPW/TRMIUtbmyEzRQxgA4WKjJiPl2BnL8ytmz7FWMLGMRCB4PFV+28Hlesayn+YBgwWKw382GlgPi4lC48nS2e8GFLyjqcco4LI8EO1NL8TN7uOHaN9zibX1XqbPb617IYgRSuPVWotIevESNr4Ne+eby5sh5HRbRLUvzV2XJplFFnw== 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=RwmjFw4aoFI91bQZoMCIRlSqUOzxhNvtxXLywIbhsIM=; b=L4r5gJhvHZFatnzk8etNp/p2ERx3Uln+ESSnrd7XY7ywIlcLhgra0JbZVeG0yP2VvD34zd/lwII5YCH2v8H7BxWWMUdlDvSKLFYx9mXvK1sl6yOjffWda3WYxJy/HcMq5NpmA3WXhmQItOg56TbniaHvsknOvWMO7Tx8JZcC4ce1O3lfSHf2fGyVzdrJ529HF25ftVu+V/VJ1SpayKqgudCUROwfZqLgvfLxJazotXa+ab//vpr6IjnKJUV0iJzS5S6AkB3cQ8ySjZD+w+yIfCX+HKTjydwqGxJaHq9PiuAKJwA9Zv/Ta1GvJQPkNm4o6UpWFTNIpasTKSvO+v4XHQ== 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=RwmjFw4aoFI91bQZoMCIRlSqUOzxhNvtxXLywIbhsIM=; b=Nbx9LzMu0Eo+O/Ko2IgrKhZF0klLFECsT6KWGLqeTT4DW/V6nKeVAzGeR+tKxaH9tYw0pEZ3fyfej2xLdJudlOj0zUsoE5Alv6X+D9eBlCkXGG8j6FLlAMaJtkL9uaMRdI9Gb/agyg807a6uavWKi2/tIWrryOV7F6ENxlPYYZRKP+rHGxO7KVPubsYkpH31eG2M3wJSc2QoATjToWPbGZGfRHKy/+gN7h8o6off4aLv0SwSa6UL8uVOYTB/vc9tFflSkWRMKzq5xmorjmKaowdgf5VtZYTyHiU4q4ojlXTK4Nwo6xv13ZQ5YgRCkuxkln0A9GCZr9h49UaKWPrlcw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4101.eurprd03.prod.outlook.com (2603:10a6:20b:21::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Thu, 2 Dec 2021 20:25:16 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.016; Thu, 2 Dec 2021 20:25:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Dec 2021 21:24:36 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [btBZPr69+t0zgNuTRIq/zwK92Hhwsjtm] X-ClientProxiedBy: AM7PR03CA0025.eurprd03.prod.outlook.com (2603:10a6:20b:130::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211202202438.1114860-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM7PR03CA0025.eurprd03.prod.outlook.com (2603:10a6:20b:130::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 2 Dec 2021 20:25:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4ee32b0-e3aa-491d-7a42-08d9b5d1da33 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTPBnr/PBTQGLNrfAOwIli/BqMe1JoCYMm8XSop4tLdPAeXAjwf/lct4sXEM345HWoNCHJS4yF2SlbfkN3g2aJegBRk3506BBo3sxK18FGKsBQ+7vZtF7iXgSZPGHXrEPbmyIhMI7WS5RBUKiYQFtJJh4mJ8UdIkvSQ7cI20OJfcwYJuo6sZrrxhO+xWzE7iEx3owtMLpYgvMlPIvFg8/gpK6QQsFgFtqZZ5mbJ8oUHeqFaQtqThKwVqaYDnTUBSdRjuGkxix532AT0XiaBKgZHFnjgeNMYyfMuNy5XxL7Hvy5DM1ruj9BIgAoD0Uy0En1t+LwhIJIGcjUk1ZEAf+EPDz7HK6nXYA94pQH1uvLH4cM1osfb/Wh+ugh6y5rW1ivBvQfeRgkEjT8CI8zn0gzKhzIMLugFFXYauqFO0+yev5/pt2Hz2R3HNYsrwGjJeHcd62JIO39URSJGWoqFmBNjeBMV5vDbamwi09hAsOC3yEjSn+SkwKRUksfocvLxgWWB2+NsQzTf6pZ9v+A6cMD5/GwWhFHF6utlBoFjrYX6fK1xjiJpHiaRYlD8ykp4ZBoLs99MAFzh/5oFeBMTpj2JVAcXsIBfRxz6WItBL4lQm95X8Ve036AoqYuDRvFsIxMxkwsR2T+3E1vnFtKD8CbezlH6Oe6uncd0tW+3K+sJd8UX8WEFWwOBERYTvRQGGWn7jRxwhMldOV5epSWZEaBeNkuXowgQ9Db/4jUTznbE1qdtHnAFJgWrLyCPW3lknmY= X-MS-TrafficTypeDiagnostic: AM6PR03MB4101: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sZmHEpuflxcculz0VBZ9XMeaFYlXx10fSrMqr1GfdTa5iCHPrnVdRhBO8kURI4nLm5JAB/1OBgj/onT3HyHaBZ6i4D2JJs07qmUEDgG4ElNQBsK7iCuqk9DgUabZogeh0ATiArDhY40CQCcuO7Og68MZTuhRqFo6qT46nr82UZ12bf852Q3B8xJfay2tZUJRFRSVNpTrMJs54PyRO97XHHnuxCcxfitQkaTpC5qdbxFRLq6FjXFF3jXTRdXvFpk44dAiO73V+KNbT5J6huEnNy1OkbrcGbjgNRatf4H3hbYlwEaLdTQv0bkdPjYSG0F/Up9RNnnq26NIwBc1MVA5BuS6549O5LSOX6QD0xrbwOghPixnnMBk+tIfKg+9YcAcgPEzQNB+83umTg5on+YPkQmyYrYDe/vjpNanR9Rf7p3mOW8iNDDNXTH/Bht0mQS/KXOOGTqyTzASuStR5HV5QWIe6RovyHoJ7joEuZYGM4ASKVq4rJW5274RAR6HJF4kUeOuN+A0VTU9v+q5N/j9HXPY3BKH4DyInTb2uxn3G0MN9WMziDiQoksODKPbRCaYkhz90dORCB8BkwJz7gN1yg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: I6NnWi1XSymE3huYOEnbqfq2GrHcJLBmydvxuzOebiaSakz6VdBYvdwl5KHAO0f4q0qhurjUYW7XA7km6hInr+hQR+iZzHVDR/8stWdsCY41Le4QJ4cGIFkec9e9uQgK7D8Dq5WIshHpRJUCnVliNpE2eWbU6XB3JsQ9A3hIMBaB3wwAvArezj+ueb0+bIn20ldTiArcAamUaLEQlFaL4Sh2C4YnP+9kYRBz33/UQ7GjJtdUxiwP4ULbJwB0qcmhGOkALywRTGoujg5e5K9WObgtWiD+7MJkrFosp9amFwUnGtOYvwp+CVssW6BkdHVsSKu5RgbtS0Vnp1STj7gTi+IBS/Bn5Z3cJLP6IZPR6ea0wS1nzPZTShQnwZVlYc6HBaf3xVNYtNTVRCoZb4Tz1rrjspaVufH/r8147T8ZfdTTBGgwbKqAesahIkn7MJqZeGDUVd+PrgBE9nMKJ4V3+CKwgi/JaKTT3uHcr9YknukwMEDBaS5/cvOUUjM03Ispj4ebQdmeXxVGEhp3FBzHDb7z6Q7C/PA6c9lcU3AKqnzM4bFwsDvbPXr77f2VuRnL7TqUjlFIzyM4DEsa+futQE+wisoCsIkp+1WaJHqwtoeI7wzwzqPtNNqWiVx4T6aE+hH0k15aSccXyy3B1HpUwA4qVevQ2NeUKnBZ0O83jzKkHkQFEotH9fy/xXc6WVZZIA7pvL9LPCaq4mIbtBfiEwUuh3QjfMa3z0PyBel4sNhoN4ybWLLNkPyorEpmYo/BMblyi1B3uZMbUaYJuyZs6tcixup4U7Mf6UNADXDlXuj20CJ3se3XbIHYgFsmBPSUBY4egIcKE1x+YuiF4Bnl0MIaqSJGaAISBzspBCwbL1eVuGqpE9Y1T7SuDywAwp8HePqTvSNTCUHP7Lp9yGjmRx4BByvuBEW60+VvK+HUP7T6WhjExT8n4dSRIecXpFGdGZxaTft9geV4bh7xd5mtPw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4ee32b0-e3aa-491d-7a42-08d9b5d1da33 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2021 20:25:16.7765 (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: AM6PR03MB4101 Subject: [FFmpeg-devel] [PATCH 6/8] avdevice/lavfi: Simplify setting sample_fmts 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PBj25CuU5u4z The length of this list is a compile-time constant, so there is no need to calculate it again at runtime. (This also avoids an implicit requirement of -1 == AV_SAMPLE_FMT_NONE.) Signed-off-by: Andreas Rheinhardt --- libavdevice/lavfi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index b208b1a928..d63a6f66b3 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -271,14 +271,15 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) } else if (type == AVMEDIA_TYPE_AUDIO) { static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_U8, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, - AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_DBL, -1 + AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_DBL, }; ret = avfilter_graph_create_filter(&sink, abuffersink, inout->name, NULL, NULL, lavfi->graph); if (ret >= 0) - ret = av_opt_set_int_list(sink, "sample_fmts", sample_fmts, AV_SAMPLE_FMT_NONE, AV_OPT_SEARCH_CHILDREN); + ret = av_opt_set_bin(sink, "sample_fmts", (const uint8_t*)sample_fmts, + sizeof(sample_fmts), AV_OPT_SEARCH_CHILDREN); if (ret < 0) goto end; ret = av_opt_set_int(sink, "all_channel_counts", 1,