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 55F5A44204 for ; Wed, 2 Nov 2022 00:38:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D92B68BE01; Wed, 2 Nov 2022 02:38:46 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2072.outbound.protection.outlook.com [40.92.90.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 138F568BD4B for ; Wed, 2 Nov 2022 02:38:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MgcVtLoXqbMemPbOq0y0TgFk6x57hHO2IXh2XGXGQkXZp3BTxQr9zOm3Jh4lS8WGM1ie6b8evujGBRLC7wrz46jWKjW2AuVOa1s+d8hPhxWMGLIYdiHBXBQ09vU1ufaosk+Y/u0Nth+HYzL/XgcNRcwG5ovtC1Gno30Ip5DnoozpMmkR/j77ukmy4Q4FUJJIE1oNOsF5/PQrxM1ZVUv/7NC2IdcjyQFntE2jj0cjC1Go4Me87wLC16HR8RT6K3ZvaxG43QVAv8JPdcua8ZbFVwTXcHBxIBXoPl7HCRPKuNXaNn5TLbFIL9cxNNDpVWqlD//CtHLRrgPOKlMTo9kgZg== 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=LUtutNqyFFvqiHfgdcojukQt4RpjWbRltuVT/zMZH4Y=; b=OjHd2q3z2b2apoQYeChsrTMZ5teEyg+SSeUfoNK9CIPz293ifBK3vTeO3q9dl2/e0mszT8/LRnAnGtjmFqdYlpNfV50024L8+8/JtYLQJ7JkWMBUzoqjwVyNHS1o0KrzuHlat5rUI+7sZ7lv+R3bbAKrIR1VqOiTVNZj4v3iaDpZtyo/nSMgulE6WyMg51ZnHRF9LwuQ1thTjT5VW9IG9ZttXZrUo2XD5MqfEFxLGiPTg7lxpnOpqj9gAfMgJDNKJlOg/0Z/oSSYg14+MSv4HzM1b0vwXO/yRrOikhsgDyqDLneWHwD6JJ+ARob/fFLnHsH2W/9C7PQ+osEUcTrNRA== 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=LUtutNqyFFvqiHfgdcojukQt4RpjWbRltuVT/zMZH4Y=; b=gWvd8uvWmVeYG4unRfzTNTxq6VjUUQzb/GlSZNJVKFnRhoPbWgLgxiZU2t5TcuUXajqQx9GRKOO5V32jWmC7c0klc0O0kYlSYP5JcvXVErmXiTg1aLjr+hfhwOdHmdhaYgVNPbW8d/ItgPw2bnuLOCbcK5Vaql9I6qx3WAsGiVsGUDRrOXa0aBGNJH7hgbdkCDtiHe+zUpQM2re8BHuHLUdpbqPbjHGzDXMipMlJChwlQoXY1Q0p9cH3bvo6JxG7y0wntF2OpWvwdBn05FzKIit+XaTMXAH1yKUFa5kVARXuCxyyt4JvUBXCMzFM/rYg8oyB2o2yv3MDhdIEWBJR4g== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB4P250MB0733.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:37b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.16; Wed, 2 Nov 2022 00:38:38 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::739a:8740:19c5:925c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::739a:8740:19c5:925c%5]) with mapi id 15.20.5769.019; Wed, 2 Nov 2022 00:38:38 +0000 Message-ID: Date: Wed, 2 Nov 2022 01:38:49 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [hCP4TJ2tcM7ygEg/fbtYTJ9jT1IxGPYISxbLCwqo6zU=] X-ClientProxiedBy: FR3P281CA0076.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1f::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <23ee69cc-75d3-5f29-a28f-cfba3101ffd4@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB4P250MB0733:EE_ X-MS-Office365-Filtering-Correlation-Id: 373c97c9-078e-4b8b-5cc2-08dabc6a94fc X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nI4Oo4Pl/z05P28j1IGnfj4rJEKaWBw4v0HFzgEcVnDPPBA/JFBVqsbj16l9yJoVnG1cF7W4FLDebgxFnSROhPQrzeWjrBQwMGlZedts7W3gVZgjYQN8Edi+PBMXegYz81l8rZN559DrHyQ/YujAYm6uQu/uiGWsupP12cyqDM8srTJ/jL1VTiSy5XlA0G+TxCv89xFVqBggnAT9dvUl6oq7ZFVb+hTBTjJuxcMEfi4GfGeyT+LOss+lZniF/xzosJytOMdaSB00e/rh4BdgJJ+KT7/GQVoYNcJXRTEPQPLx+leBgUtX9t0GbiOeddCE4RHDJBS1xEGm918RX4//99CORmujVphctOo5zEkNhcbbtz32Y3c92thS0AYq7wp6NQQb3W4TH1P2uNDGEhWg9x3dFhO5JV2vEnOwWe1d0w3uK1JP8NHXSMod73TJ4VWgfwSqUheK6UVZ7Ki9cNYd0AivTB+QSSpsHHqxRfnl2RVX3cLDYvLz8BexDhfTbEqur8J7u6HjXdfEh0s3x8ldRJc6Bp8/v0WGw3fVgUMnveq9q0VdLZIgHDWJ+KZYXUYGFioumChfa278iNNKlUY7dT30sdPJMjvjKrRDoe2iH9hmJrRPS1yzyzLhZ3dTsOZzuNAr9AiJ7hZu69l/ErGp8syD0vfA+10tdUPmNvJ5++iDNNeJVvfzDYcXlS4mMnig X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RVcybVc1Z1gvWEpFeE04MHFUdFczTFhyWC9Tbk5hYjNoL3dtY29ldCtmZlBk?= =?utf-8?B?QnBnTWtKRi9GK29hZlR1U2MyM2l3ektVSTE4ZkhmTWRZLzhjV2pVQVFBQzBF?= =?utf-8?B?b0p1RmxvVEdnMVpuZERLNWF1QkduUFNaZlZIenJNUTdxVVc4YkVuSUFUWmVX?= =?utf-8?B?N2s0MERoQ0U5cFlTQ3VsWEpSRGJiODBOZ2VRaXQzTU9JdGkwdGpQYlIvSkVj?= =?utf-8?B?WUIzeGpHU0Z4a2tESmc5K0VKRkNFZXlqUFNpcXJJbVpnRmVrVm5JUm9rdGJI?= =?utf-8?B?SnN2VkNDTWQrbFJjemIvUXVjS1RnYnJydGkrVndVTVFEL245c0d0VVZudkMx?= =?utf-8?B?dDdpeXlRaGdUTU1OcTUvSkhOTklKUXQzb3BpRXgyamVGM0JWTy94ZXM0bGI1?= =?utf-8?B?eTBLdGw1SzF1dWkwcldWNCsyTDRnRnFvY1E3SGRaa2tBV3ZBY1ZLQ2tpbGZ5?= =?utf-8?B?RHJlcFdZNHNaaTNkd0Q4citDUllTa0ZkN2I1SEI5bGoyVVZXUkR1TWtNYnpF?= =?utf-8?B?QnRSYVR1bWpSaWIrNGJFellKNkJYdmlPNVg5a3ZPcThzY0pEVlcrUlhxUm1D?= =?utf-8?B?SkEreTAra29ITENrT2pOL3ZKYmZiZld4TXF2OGNFTE9sV0ZEUDd1WEJBcmhX?= =?utf-8?B?eHBDYjIySU8ySFUzN3lWMlB2Y1p4djJ3MWdNTVJnNmRQNHZpdEpSYmh2MDk3?= =?utf-8?B?UWp3b2tuVEdmRWNBbFZYMlRmS0lEMklLbmc4ZTRsanAvNjB4Rm1DejlnNlVw?= =?utf-8?B?TkMrK29tWTVuK3BBa1E0RFV0WGJUcU5yY0JmWjdLQjZaQXZHbytpbXE3RUJx?= =?utf-8?B?K3dydkVUcEVQMFVRMW8xQWduZm1oQkpKd0xlenk4SG90SURVUzYxUzBXWmhB?= =?utf-8?B?QUkxQmdSbktjdDNlZEE5MmNDSUlRUnpHamlDdm1sRzRJRlRDOGNscHEvM0sz?= =?utf-8?B?YkwzY2YveUhYS0pZbnBNdnllWmplNTBYU0hnYjVEa0lTQWFDV3diZnNOK3lF?= =?utf-8?B?THN5RGR3MFplZ0Z2SURHMjJIRHV2Mk8rMWY2dHU1cEdoYVNOMVdEVG1hLzVN?= =?utf-8?B?UmRQeUxTWWZac1BhVjRXZFB5R0ZOVjA1a1BPSVlTaEZSdTgzcW1mUlRqVEhD?= =?utf-8?B?YnNqYzU5R0lsaDNuZHlYMTNvS01Hd3ViV1NybmFQVjZDSE5OM2RacnR1MUIx?= =?utf-8?B?NEtTSDhTUDIvQk4xam9wai9TcWF0WFp2azdyd2RvZnJjMUpabTh1OEF4b3VO?= =?utf-8?B?OVYrV0NxYTJxa2VFcmFCQnl3eGRQN2MrN3BYbGFLaUhRWlBYRUZreEZDRjNL?= =?utf-8?B?eEZVcFM4TFE3NXFrOWN5alV2K0Fza1ExYzI1SXNyc2NQVGkzRW5kRjFOMGtu?= =?utf-8?B?d3B4VURWQmR3R0ZoNTNCc0VKZzhNdTFSZ01WS21lRTIvYXphOU4vMGxweGpP?= =?utf-8?B?Wi9DdkV6ZXh6cGxJa3lMY2hwK2hhZFFlMXRSOXozc3Y2bjB5VW4vRDJmaEda?= =?utf-8?B?VUtDYlp4Mkg2b1NrL1JUVFJVVVh4MnYrTEkrK2hoTXRKeElkcUhGK2NvblR4?= =?utf-8?B?SEtzQVpoWWMxUnJ0UUlZa08ydVAvTjBmYkY5VmtLNndtMGE1cHhWYlNZamdI?= =?utf-8?B?STM4TlVrNmxoN0hqa29GU082Y3BaelN4SGQrU1U2WW1UaitmUGoxVERPM1JR?= =?utf-8?B?UUlFVzRINXJrR0hBWTRReUtFc0NPQTB0SFo5dlQ4cGdzbXc0WERlU09QR2hT?= =?utf-8?Q?cCiL2GparIBT+6PQzSRliBiIJHpATFrX9zhfV0Z?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 373c97c9-078e-4b8b-5cc2-08dabc6a94fc X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2022 00:38:38.0343 (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: DB4P250MB0733 Subject: Re: [FFmpeg-devel] [PATCH 2/4] all: Replace if (CONFIG_FOO) checks by #if CONFIG_FOO 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: L. E. Segovia: > Continuation of e42aaaf92a4b0c88d60acc12df64c81d0887c26f > > Signed-off-by: L. E. Segovia > --- > fftools/ffprobe.c | 22 ++++++++++++++++++---- > fftools/opt_common.c | 18 +++++++++++++++++- > libavformat/rtmpproto.c | 24 ++++++++++++++++++------ > 3 files changed, 53 insertions(+), 11 deletions(-) > > diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c > index 9b7e82fd8c..c16c68ee92 100644 > --- a/fftools/ffprobe.c > +++ b/fftools/ffprobe.c > @@ -3519,8 +3519,7 @@ static void ffprobe_show_program_version(WriterContext *w) > } > > #define SHOW_LIB_VERSION(libname, LIBNAME) \ > - do { \ > - if (CONFIG_##LIBNAME) { \ > + { \ > unsigned int version = libname##_version(); \ > writer_print_section_header(w, SECTION_ID_LIBRARY_VERSION); \ > print_str("name", "lib" #libname); \ > @@ -3530,20 +3529,35 @@ static void ffprobe_show_program_version(WriterContext *w) > print_int("version", version); \ > print_str("ident", LIB##LIBNAME##_IDENT); \ > writer_print_section_footer(w); \ > - } \ > - } while (0) > + } > > static void ffprobe_show_library_versions(WriterContext *w) > { > writer_print_section_header(w, SECTION_ID_LIBRARY_VERSIONS); > +#if CONFIG_AVUTIL > SHOW_LIB_VERSION(avutil, AVUTIL); > +#endif > +#if CONFIG_AVCODEC > SHOW_LIB_VERSION(avcodec, AVCODEC); > +#endif > +#if CONFIG_AVFORMAT > SHOW_LIB_VERSION(avformat, AVFORMAT); > +#endif > +#if CONFIG_AVDEVICE > SHOW_LIB_VERSION(avdevice, AVDEVICE); > +#endif > +#if CONFIG_AVFILTER > SHOW_LIB_VERSION(avfilter, AVFILTER); > +#endif > +#if CONFIG_SWSCALE > SHOW_LIB_VERSION(swscale, SWSCALE); > +#endif > +#if CONFIG_SWRESAMPLE > SHOW_LIB_VERSION(swresample, SWRESAMPLE); > +#endif > +#if CONFIG_POSTPROC > SHOW_LIB_VERSION(postproc, POSTPROC); > +#endif 1. Several of these checks are unnecessary, as ffprobe has hard dependencies on avcodec and avformat (and therefore also on avutil). 2. Anyway, a better approach would be to modify the macro along the lines of PCM_DECODER in libavcodec/pcm.c, so that SHOW_LIB_VERSION(postproc, POSTPROC) expands to SHOW_LIB_VERSION_1(postproc, POSTPROC) if CONFIG_POSTPROC is 1 and SHOW_LIB_VERSION_0(postproc, POSTPROC) if CONFIG_POSTPROC is 0 (you may presume CONFIG_POSTPROC to be defined and to be either 0 or 1). SHOW_LIB_VERSION_1 would expand to what the current SHOW_LIB_VERSION expands to (minus the "if (CONFIG_ ##LIBNAME)" check) and SHOW_LIB_VERSION_0 would expand to nothing/a null statement or so. The same approach could be used below. > writer_print_section_footer(w); > } > > diff --git a/fftools/opt_common.c b/fftools/opt_common.c > index 8a06df82df..243eb4e3a1 100644 > --- a/fftools/opt_common.c > +++ b/fftools/opt_common.c > @@ -154,7 +154,7 @@ static int warned_cfg = 0; > #define SHOW_COPYRIGHT 8 > > #define PRINT_LIB_INFO(libname, LIBNAME, flags, level) \ > - if (CONFIG_##LIBNAME) { \ > + { \ > const char *indent = flags & INDENT? " " : ""; \ > if (flags & SHOW_VERSION) { \ > unsigned int version = libname##_version(); \ > @@ -184,14 +184,30 @@ static int warned_cfg = 0; > > static void print_all_libs_info(int flags, int level) > { > +#if CONFIG_AVUTIL > PRINT_LIB_INFO(avutil, AVUTIL, flags, level); > +#endif > +#if CONFIG_AVCODEC > PRINT_LIB_INFO(avcodec, AVCODEC, flags, level); > +#endif > +#if CONFIG_AVFORMAT > PRINT_LIB_INFO(avformat, AVFORMAT, flags, level); > +#endif > +#if CONFIG_AVDEVICE > PRINT_LIB_INFO(avdevice, AVDEVICE, flags, level); > +#endif > +#if CONFIG_AVFILTER > PRINT_LIB_INFO(avfilter, AVFILTER, flags, level); > +#endif > +#if CONFIG_SWSCALE > PRINT_LIB_INFO(swscale, SWSCALE, flags, level); > +#endif > +#if CONFIG_SWRESAMPLE > PRINT_LIB_INFO(swresample, SWRESAMPLE, flags, level); > +#endif > +#if CONFIG_POSTPROC > PRINT_LIB_INFO(postproc, POSTPROC, flags, level); > +#endif > } > > static void print_program_info(int flags, int level) > diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c > index f0ef223f05..6d84fcf34f 100644 > --- a/libavformat/rtmpproto.c > +++ b/libavformat/rtmpproto.c > @@ -1222,7 +1222,8 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt) > for (i = 9; i <= RTMP_HANDSHAKE_PACKET_SIZE; i++) > tosend[i] = av_lfg_get(&rnd) >> 24; > > - if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) { > +#if CONFIG_FFRTMPCRYPT_PROTOCOL > + if (rt->encrypted) { > /* When the client wants to use RTMPE, we have to change the command > * byte to 0x06 which means to use encrypted data and we have to set > * the flash version to at least 9.0.115.0. */ > @@ -1237,6 +1238,7 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt) > if ((ret = ff_rtmpe_gen_pub_key(rt->stream, tosend + 1)) < 0) > return ret; > } > +#endif > > client_pos = rtmp_handshake_imprint_with_digest(tosend + 1, rt->encrypted); > if (client_pos < 0) > @@ -1300,7 +1302,8 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt) > if (ret < 0) > return ret; > > - if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) { > +#if CONFIG_FFRTMPCRYPT_PROTOCOL > + if (rt->encrypted) { > /* Compute the shared secret key sent by the server and initialize > * the RC4 encryption. */ > if ((ret = ff_rtmpe_compute_secret_key(rt->stream, serverdata + 1, > @@ -1310,6 +1313,7 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt) > /* Encrypt the signature received by the server. */ > ff_rtmpe_encrypt_sig(rt->stream, signature, digest, serverdata[0]); > } > +#endif > > if (memcmp(signature, clientdata + RTMP_HANDSHAKE_PACKET_SIZE - 32, 32)) { > av_log(s, AV_LOG_ERROR, "Signature mismatch\n"); > @@ -1330,25 +1334,30 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt) > if (ret < 0) > return ret; > > - if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) { > +#if CONFIG_FFRTMPCRYPT_PROTOCOL > + if (rt->encrypted) { > /* Encrypt the signature to be send to the server. */ > ff_rtmpe_encrypt_sig(rt->stream, tosend + > RTMP_HANDSHAKE_PACKET_SIZE - 32, digest, > serverdata[0]); > } > +#endif > > // write reply back to the server > if ((ret = ffurl_write(rt->stream, tosend, > RTMP_HANDSHAKE_PACKET_SIZE)) < 0) > return ret; > > - if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) { > +#if CONFIG_FFRTMPCRYPT_PROTOCOL > + if (rt->encrypted) { > /* Set RC4 keys for encryption and update the keystreams. */ > if ((ret = ff_rtmpe_update_keystream(rt->stream)) < 0) > return ret; > } > +#endif > } else { > - if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) { > +#if CONFIG_FFRTMPCRYPT_PROTOCOL > + if (rt->encrypted) { > /* Compute the shared secret key sent by the server and initialize > * the RC4 encryption. */ > if ((ret = ff_rtmpe_compute_secret_key(rt->stream, serverdata + 1, > @@ -1361,16 +1370,19 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt) > serverdata[0]); > } > } > +#endif > > if ((ret = ffurl_write(rt->stream, serverdata + 1, > RTMP_HANDSHAKE_PACKET_SIZE)) < 0) > return ret; > > - if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) { > +#if CONFIG_FFRTMPCRYPT_PROTOCOL > + if (rt->encrypted) { > /* Set RC4 keys for encryption and update the keystreams. */ > if ((ret = ff_rtmpe_update_keystream(rt->stream)) < 0) > return ret; > } > +#endif > } > > return 0; _______________________________________________ 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".