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 269A4491B0 for ; Mon, 5 Feb 2024 12:07:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8485068D13E; Mon, 5 Feb 2024 14:07:23 +0200 (EET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2095.outbound.protection.outlook.com [40.92.65.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96A7568CE0F for ; Mon, 5 Feb 2024 14:07:14 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hRuXowReWSJJ+u2M6a/eULjiOX2U6fJqskWtBGrVdWVt+tbRNem4eIFZbPnhFGtSKKxjXGbVpDcdGtPAOn25+HqJej9/49Mc/IKnCrfEe69Pn74muTTGDiiPJkm+R0qWDMXjlCVUWo69julCC3l4wf8kjlzxulCT5zYGTqAKo6M0G/OgUJFJjtRRo3qkaH1SEXiypUw1xm3T6/bbrIR45acipT+reEHB87XbR56jmu5uRVAsNuILFFytdGYi0mLM+ahtp06+qJ8RrgXn2s6//svbP06P9sT9297rX8PEdqNk2YQPeNQ2zPtMOshckqEVZhqEF6QZk2gFeTJq1EEhOQ== 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=FLxcYluYHliS5cttRdB8InEL3GSh6jOswV7BV+FYldY=; b=X/jrrO2E1xFSzmhZP1S6F/RTcus7ta7oZ8Cbx/rZgGVFEn5DofGo1PMqN2gxjIsG1d2zFnXmyp0Kr8x3AnWvUrgd6drcsxkxjKaf3ReQ77Qs3geiwOFZzziZFRq/Pfbeqb/52PHjf6WCJE1S4zLS3GcCVcdK+C/Rp2blPLUCdXDUgAIpy5jLW1s4hfw6xqX4kOM7fHbyu1r+Yv75KP2JZ7zHg96nT61Pjav6oyV1wSp1dIv5uDw9+c9s8GlloYUN+Bms5tf6A6+WwZs8y//7sLcTisrHxVqlJz2w4mweyo23BBEc3OsY+7LZNJq6CHHIPL/yUEzuhqGuymyKNDYT5Q== 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=FLxcYluYHliS5cttRdB8InEL3GSh6jOswV7BV+FYldY=; b=k+AV2VgsvDWD0eNh70JmckH+7MYNmsqr7MDbO7NlRXImkdkZ6EyKvqpz0r5lrNLi5kIpnYKEk9qD1QBJlSpD/VlfdAKsIy7IHP2hlEi3pS5gue93WtEoxdbXrjjcT9r9Gk5KZjcu/nfV9GDp3qKyKb2JEID+jbsi+XQq0lUwoq2wxAzmZUByuoXVPijBKfocFYeai7Bo77Ti2Vn76O14jJnvs4KMYJtHr1VFvLnPeXXmRoRVMICD18pZfrpzLyqfnI9zKHCKc8YmB3gZnhSThWuj7QoxomF34CGmJrltLfvaKCSXn27MISOk6iAnKOJx4wYYxiVyB9EF9qcmkIi6zA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0387.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 11:52:15 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7249.032; Mon, 5 Feb 2024 11:52:15 +0000 Message-ID: Date: Mon, 5 Feb 2024 12:54:08 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: FFmpeg development discussions and patches References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [5gcSVofT3CiJEac9vRVHDQv2yR9DmFGwJMCU0Vbmujk=] X-ClientProxiedBy: ZR0P278CA0084.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <8d93f8b6-3ac2-4476-81a1-23976ebb9366@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0387:EE_ X-MS-Office365-Filtering-Correlation-Id: 54097aba-d269-4de9-60ea-08dc2640e5c6 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicByOPSJwOf10mei4LWviw7wIsQT7QV1g57D5kIAhmZww+yS4mHUEBJUIbfkFpDCwPQl1dBcFVtX8kdmN1DDdxsPKM07KHwwW/g6298haFYr351C7fkBphIUzhSpqVA87e+ypSJRLZwSONJQa8nMpwvdH8RrZ7nPplyBN0FJ7Csj0R0/LlCwbz1s08cwUspGnEW8Fvc1N9RvnVTdSuPpePrnKETPLsdClzbUAvED1+C5gdP9FkxCiknWvaCnEG7CYlKwJGv/JbcsKCLM4nYKzM1wG6hDAsELNbB6qFdysGW1q9N1jfoza9nNR/x7HLAQA7jbyfvVZl9vgkJUzEwNaUD6Uy5ZMd7CW4EglTGie4pOLOr4wVmJegPzY7dN6X0lGiK84DrXn/GlxGFntYBECJKUQtzj8eleRFzJOW4WM+hXk+Z6N1eANDbNmDJOz9IhuSZwtQcqvbU5f5YqHvep/dxehqnpv8t0ZFNVrT9OlDIlubmEWBlKqSeWb75epVeKM5QtELI80F8W/+AKraPnzo+0AgHXPODIH4KC1cbQUDxwcdc1sS2v11VgmrcvSLJpmbrc1JJNe/1bsHM5NWpT1MAilNjbkCasLfoex0eVzXC5r9c2mK2hS/MgCeXMG4HA1rVyVV8SL4dnYmGd5GsGCjJgefOJQQXTBRcqA2DGq0Gqg4opjDNgeyE0IDKx+WFZybjXi4tIhCkP2buhgw/ODbZMWa3tAUk3z18UOdDpzn5lAg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5RRWGnki4lDK4opE1P0lgXuMGDU/FfwrdXi0yjZKzLx4dODu/Mt7TgOJOfg0pmt4NliEPOBhtx3ENKzbDoEeayIkGQyBkRUgP1NVEt+k9mtRhTKJmu+9KNq2B6/RNK6bgp1WbQs36pK3uBxCrPJxo0mpHRbxZtFX9xMThsmlUEqAsMF0IB0ZChwiBp1m/oy9QGtNRqq/3Kqf+arcHtb1rvStC+Do4uVY0ITdD/xytlv513a2KXeuJ+pLg3N3ViVl6jAzKDcz+ZtVJzyFBKaeSQmoX+buBCBz8oxRwI1xWkkEdQ6rqLTQWRr61RYp4Sy3ZbsXx2JJXs/MNityFpipe/+S334pLnOSfqk6TrapdNDWNTv3QJK+DtWgObdHPw6EvzhmTHsyXRPVuzfqEnwUIkObpOhEMiTMUeJ94PZjvhQzbVzX7yeoUQ4DPxc1PhyIgcz3COZ64GfC+Qz/RuxLxpomrrwENjQznJr12OA++BMadczJRpMwfbo62MHPnKeFXCT4MKkb9b9BTjsGdBpaRQ+XggdPAs1sjRxOOWq3tdnGoRzyYiSYyL4q1P9RXojT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MytJZXRwUDN0cS9EbUpFTU1FNUNGc0tzeWFpUFJHUmpCNHJHR2pnRVJiMmZi?= =?utf-8?B?bGNvNXlreHlIRTBmR2lmNmNVbEphbDMxa0N6WURCM3ZwM3ZVQ3VMdEkwYy8y?= =?utf-8?B?VFplSE03aWxqandYdXdkQkNxWERFdW9YdlZqd1NZbXduU0FUOGNVZmJ0MytJ?= =?utf-8?B?eWVyVHBaSFhNemZLTkNvd0JHQnJJMmNJZ01wa1VxVmx1ZXA2V3dOeHBkZWM2?= =?utf-8?B?ZXZHTDI0SUVTY3pFaUloNUVUS1pZWk5wTlFQaW1aVTlzSEc1QXU5ajVXdnMr?= =?utf-8?B?WUoweVdoOE5KVUNmQWFxTUhKcHJCaWhVcUw3SnpKWmxLUGNwTWRTaHhYZ2RO?= =?utf-8?B?WnJ4aStvRXcxaFRMK1R0a21RQlI0V2RSZGZxanpieVRZV0FZUnR1NG91Tmti?= =?utf-8?B?OVZjMTBqVStMazBleENTSXczSVl6dUlvUS81Uy9jNGlvU2I2OVE0ZVZMVUQ4?= =?utf-8?B?dUx2NmN5NHZBQUloQzlCRXZzMXBSTFVNMW50YU9DdHVVd2RJVjJhWGd2c3NW?= =?utf-8?B?dTVNL0ZxNWtNR3VKS0w2VnBIUFZpK3RnOVl2SFp4dWNSUkh3eGwzanlBSTVi?= =?utf-8?B?dDJqYWttR2NzZGljdDJ4MkczZFpxT20xVTBMWVNzMnIxOWh6UUFlY3FYSG03?= =?utf-8?B?UmR0ZGpkV1BpbDQ2WHVuSXFNQ2tnQmpRSFN6OG5yRW84aHRWRXNEbGIrdGwr?= =?utf-8?B?cWxJNTVQbHBPcGJJZlhra2JTZ3FYTm9SN1EwazBKTUd6YS9TVmhkYWFOV3R2?= =?utf-8?B?Ym9oQnFmRGRYUHcvSURjUUZBMWZpQ2tYdDJGN2FHaVoycUNWTHdOM1NIVWxr?= =?utf-8?B?OEhiTzVQd1pFZ0gxQnZmSWpVSHg4dHloN3B6SnhyeHRTbW0zajFycnAzT1Jl?= =?utf-8?B?TEJmbGpJd25YRmJrandCZmJYckpFYTV2OTR1M3cvUnhGeU5nOFFYVUlzeDBr?= =?utf-8?B?YmtQRlhPQnRjaTZnZWNlcFBGNzFOQnhOQmNjb1BsQkpjM1lkeG44OTNBWmJZ?= =?utf-8?B?RkgzNVFmVUFXSVJMYVBlb1Yydm9QR3hQcG5pa0FhenJKWkM2cGYvNXpUajJr?= =?utf-8?B?U2J3U3RaVFhPcVVveWVqWEVjakd6bmszRTVBUGhKNmNrTzYwN3lCZjRHa3NX?= =?utf-8?B?bjJBSUhVVmNpUUJBZE83R1JzOGV2YmZUTU9USm1xOUM5OEZQRjlZaGRDVmJu?= =?utf-8?B?VC9ZUnRxL1dVclp4UkVvWEFVMU1jTkxiVzRnV0VJWGQrYVRDMGMwSWhTdTBD?= =?utf-8?B?R0VnUlVXdWhMR09jRFpKVkFzMGdPdkdJTUtCbTVBTGEzdkZUSlpNVW5ORDQ5?= =?utf-8?B?Nm1Fb1NuUW9tVHk3alAvOFFVaXZGWTh2dnRJR1cwQVl1a25CNzNZUFZxeXA3?= =?utf-8?B?Q09wTTNkYWVzZlRlRTV6ak5qT3pvRnpjeVMrRDIxYVpNRTJ5UHJ2Yzg1L2lS?= =?utf-8?B?aEdsWndsdVRYYmx3UXNCR3BMM1RVREZGcEFsVHp1NVJ6Y3QwbUc4ak5DclZR?= =?utf-8?B?ZWJiekJiK0t5Rnlhc09CSS9aQnNobmdwNk5vdVFBRUlZYll2TERHbWIzQjJC?= =?utf-8?B?dFhXbGJZdG9idkhaRXIvY0NRU2tOOVZZWldmczJNQVV0TmVHbUNWd3plcXJv?= =?utf-8?B?RDdjNUdKWU5HS3JGWEM0ZUljMDhaUjJTdzhmL1dQWnEwbFB2SDVsenFGWUpk?= =?utf-8?Q?61evabDFu7z3TdR8ZyQB?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54097aba-d269-4de9-60ea-08dc2640e5c6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 11:52:15.7238 (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: PR3P250MB0387 Subject: Re: [FFmpeg-devel] [PATCH] avdevice/caca: Allow to list multiple dither option types at once 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: Stefano Sabatini: > On date Sunday 2024-02-04 18:36:45 +0100, Andreas Rheinhardt wrote: >> This can be achieved by using AV_OPT_TYPE_FLAGS instead of >> AV_OPT_TYPE_STRING. It also avoids strcmp() when accessing >> the option. >> >> Signed-off-by: Andreas Rheinhardt >> --- >> libavdevice/caca.c | 34 +++++++++++++++++----------------- >> 1 file changed, 17 insertions(+), 17 deletions(-) >> >> diff --git a/libavdevice/caca.c b/libavdevice/caca.c >> index 6af1649137..c0e09cf6f7 100644 >> --- a/libavdevice/caca.c >> +++ b/libavdevice/caca.c >> @@ -24,6 +24,13 @@ >> #include "libavformat/mux.h" >> #include "avdevice.h" >> > >> +enum { >> + SHOW_ALGORITHMS = 1 << 0, >> + SHOW_ANTIALIASES = 1 << 1, >> + SHOW_CHARSETS = 1 << 2, >> + SHOW_COLORS = 1 << 3, >> +}; > > nit: LIST_ for consistency? > Will make the change and apply. >> + >> typedef struct CACAContext { >> AVClass *class; >> AVFormatContext *ctx; >> @@ -38,7 +45,7 @@ typedef struct CACAContext { >> char *charset, *color; >> char *driver; >> >> - char *list_dither; >> + int list_dither; >> int list_drivers; >> } CACAContext; >> >> @@ -99,21 +106,14 @@ static int caca_write_header(AVFormatContext *s) >> return AVERROR_EXIT; >> } >> if (c->list_dither) { >> - if (!strcmp(c->list_dither, "colors")) { >> + if (c->list_dither & SHOW_COLORS) >> list_dither_color(c); >> - } else if (!strcmp(c->list_dither, "charsets")) { >> + if (c->list_dither & SHOW_CHARSETS) >> list_dither_charset(c); >> - } else if (!strcmp(c->list_dither, "algorithms")) { >> + if (c->list_dither & SHOW_ALGORITHMS) >> list_dither_algorithm(c); >> - } else if (!strcmp(c->list_dither, "antialiases")) { >> + if (c->list_dither & SHOW_ANTIALIASES) >> list_dither_antialias(c); >> - } else { >> - av_log(s, AV_LOG_ERROR, >> - "Invalid argument '%s', for 'list_dither' option\n" >> - "Argument must be one of 'algorithms, 'antialiases', 'charsets', 'colors'\n", >> - c->list_dither); >> - return AVERROR(EINVAL); >> - } >> return AVERROR_EXIT; >> } >> >> @@ -205,11 +205,11 @@ static const AVOption options[] = { >> { "charset", "set charset used to render output", OFFSET(charset), AV_OPT_TYPE_STRING, {.str = "default" }, 0, 0, ENC }, >> { "color", "set color used to render output", OFFSET(color), AV_OPT_TYPE_STRING, {.str = "default" }, 0, 0, ENC }, >> { "list_drivers", "list available drivers", OFFSET(list_drivers), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, ENC }, >> - { "list_dither", "list available dither options", OFFSET(list_dither), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, ENC, "list_dither" }, >> - { "algorithms", NULL, 0, AV_OPT_TYPE_CONST, {.str = "algorithms"}, 0, 0, ENC, "list_dither" }, >> - { "antialiases", NULL, 0, AV_OPT_TYPE_CONST, {.str = "antialiases"},0, 0, ENC, "list_dither" }, >> - { "charsets", NULL, 0, AV_OPT_TYPE_CONST, {.str = "charsets"}, 0, 0, ENC, "list_dither" }, >> - { "colors", NULL, 0, AV_OPT_TYPE_CONST, {.str = "colors"}, 0, 0, ENC, "list_dither" }, >> + { "list_dither", "list available dither options", OFFSET(list_dither), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, 0, INT_MAX, ENC, "list_dither" }, >> + { "algorithms", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = SHOW_ALGORITHMS }, 0, 0, ENC, "list_dither" }, >> + { "antialiases", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = SHOW_ANTIALIASES }, 0, 0, ENC, "list_dither" }, >> + { "charsets", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = SHOW_CHARSETS }, 0, 0, ENC, "list_dither" }, >> + { "colors", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = SHOW_COLORS }, 0, 0, ENC, "list_dither" }, >> { NULL }, >> }; > > LGTM otherwise, thanks. _______________________________________________ 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".