From patchwork Sat Jul 29 19:07:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "L. E. Segovia" X-Patchwork-Id: 43026 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7927:b0:130:ccc6:6c4b with SMTP id b39csp1486466pzg; Sat, 29 Jul 2023 12:07:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlEj41T/pj1rn+WHwzVAcIyST/YV0Ih5UM/GudlKfhNxBHSVSqqIBuRkePDqaQGTyUOQ4WuL X-Received: by 2002:a05:6402:350:b0:51d:9e0c:1396 with SMTP id r16-20020a056402035000b0051d9e0c1396mr5067821edw.35.1690657658636; Sat, 29 Jul 2023 12:07:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690657658; cv=none; d=google.com; s=arc-20160816; b=t5O+OjwHGiN2lxCr0k3DO6sq3+oBne/TyLxCbpWCljo70+9Hc+Q3sSqeoGknDwp37m 1baltqPKgCi4pkmpgaG00mpVSCHyzSPsljyojF32LMjZSY61W16C88FnSS00f8vSPORS oa1V5tmTlPIbEHx6m0Bmy8jlX805TSr7JrVYYsom2u1m+03y8HNxO7opi1M8dax0TI5W Mf6qeo6jD6Bpw4kVgn9V/hIcYVSDrBs4U+GykAHJLoX5m129uR2CSqLoPIZ5wH0wCKpd txWiGDrmJp5UpUeoiSOPeH32kXty56n/dVsGKn4wYIzTFteC06CQ27wnSHaqBOBTvPd5 nadw== 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:in-reply-to:content-language:references:to:from :user-agent:mime-version:date:message-id:dkim-signature:delivered-to; bh=5QLyZr76VeHn7g179grLD6gJZ1BkR0RQ4pVZQTObi5E=; fh=ESc3qdU44dcJCICb6LyFA8dwP9m5t2kvrhWue0vN394=; b=W8I8nmLs4nrGTgztZEsc3ieOcKe8+hBDj6CgtHOp6RhtaNfvgRZb2r+dSyZQQtPtsp FuJsii80H2HFS7PRY87iHAAMCIvIPWr3+sjwyw9/JS+fDfbFG27yjbIc9TNFM7roNKPw lGIfCJrcW+hJJK7aKaYeiUB5k0AUZFLsKqfvwvuP2+a3bVs7rFY3zgkmzLGB1UPiTcqr 2THY8FpZ8YdUJvkQjBg6fyCBm77sJhIfdMLig5zf7u/t4nSPBtwX66oICDvU0+3K/CV7 yQqluLa5jYLi/TWbfM53FMiEMLgtapDzAogd5++WTaJw6EC7DQDaKLK5CcLbCPio/UWa sSJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@amyspark.me header.s=gm1 header.b=PGhJ+695; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amyspark.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o14-20020a056402038e00b00522b7cbf6f5si1162029edv.7.2023.07.29.12.07.38; Sat, 29 Jul 2023 12:07:38 -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=@amyspark.me header.s=gm1 header.b=PGhJ+695; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amyspark.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A800E68C8D5; Sat, 29 Jul 2023 22:07:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05FBF68C77D for ; Sat, 29 Jul 2023 22:07:27 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 97BC7C0005; Sat, 29 Jul 2023 19:07:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amyspark.me; s=gm1; t=1690657647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=itUytsnNQZKccnr6XP7d3aQNgVQKTEq9SY23mpTWsaw=; b=PGhJ+695xVC99koWuosdAtUYZGxZMWjk9jtjsbHy4g/km2mloIYYyFeaOHHFhqMvzj3Q9U doO6MMVr3XqFNHge15FVue70DpTsSfkSiIuvLQp7ktJ5kD4Z1tiBSBmNrNfISpOvGw+szm ETK1gSBEVwGTCi20EjMylkgArQs77YKrV2DuocsByJPqj3qzbonL8P2QQEo082D39aQ9cK gBpK09pPz3drdEF0rBy+UW3ZR4yA1hW07mE0c2QXzvXwdFYSYxlLN6019JLTUb+dN8Kz5T F4YWuFzpShd+/bF4caLmPhTdu302+IX1fuMnP9gju9ik8PiQ3mfr5MCZ/OEm4w== Message-ID: <6c380246-00a8-4c32-a0d0-e3a31a0acf1f@amyspark.me> Date: Sat, 29 Jul 2023 16:07:25 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: "L. E. Segovia" To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US In-Reply-To: X-GND-Sasl: amy@amyspark.me Subject: [FFmpeg-devel] [PATCH v5 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KKfulBTXqF32 Continuation of e42aaaf92a4b0c88d60acc12df64c81d0887c26f Signed-off-by: L. E. Segovia --- fftools/ffprobe.c | 16 +++++++++++----- fftools/opt_common.c | 12 ++++++++++-- libavformat/rtmpproto.c | 24 ++++++++++++++++++------ 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index a39185f6fe..c3e90a9409 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3572,9 +3572,9 @@ static void ffprobe_show_program_version(WriterContext *w) av_bprint_finalize(&pbuf, NULL); } -#define SHOW_LIB_VERSION(libname, LIBNAME) \ - do { \ - if (CONFIG_##LIBNAME) { \ +#define SHOW_LIB_VERSION_0(libname, LIBNAME) +#define SHOW_LIB_VERSION_1(libname, LIBNAME) \ + { \ unsigned int version = libname##_version(); \ writer_print_section_header(w, SECTION_ID_LIBRARY_VERSION); \ print_str("name", "lib" #libname); \ @@ -3584,8 +3584,14 @@ 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) + } + +#define SHOW_LIB_VERSION_2(cfg, libname, LIBNAME) \ + SHOW_LIB_VERSION_ ## cfg(libname, LIBNAME) +#define SHOW_LIB_VERSION_3(cfg, libname, LIBNAME) \ + SHOW_LIB_VERSION_2(cfg, libname, LIBNAME) +#define SHOW_LIB_VERSION(libname, LIBNAME) \ + SHOW_LIB_VERSION_3(CONFIG_ ## LIBNAME, libname, LIBNAME) static void ffprobe_show_library_versions(WriterContext *w) { diff --git a/fftools/opt_common.c b/fftools/opt_common.c index 7c996f140d..5729d656e9 100644 --- a/fftools/opt_common.c +++ b/fftools/opt_common.c @@ -153,8 +153,9 @@ static int warned_cfg = 0; #define SHOW_CONFIG 4 #define SHOW_COPYRIGHT 8 -#define PRINT_LIB_INFO(libname, LIBNAME, flags, level) \ - if (CONFIG_##LIBNAME) { \ +#define PRINT_LIB_INFO_0(libname, LIBNAME, flags, level) +#define PRINT_LIB_INFO_1(libname, LIBNAME, flags, level) \ + { \ const char *indent = flags & INDENT? " " : ""; \ if (flags & SHOW_VERSION) { \ unsigned int version = libname##_version(); \ @@ -182,6 +183,13 @@ static int warned_cfg = 0; } \ } \ +#define PRINT_LIB_INFO_2(cfg, libname, LIBNAME, flags, level) \ + PRINT_LIB_INFO_ ## cfg(libname, LIBNAME, flags, level) +#define PRINT_LIB_INFO_3(cfg, libname, LIBNAME, flags, level) \ + PRINT_LIB_INFO_2(cfg, libname, LIBNAME, flags, level) +#define PRINT_LIB_INFO(libname, LIBNAME, flags, level) \ + PRINT_LIB_INFO_3(CONFIG_ ## LIBNAME, libname, LIBNAME, flags, level) + static void print_all_libs_info(int flags, int level) { PRINT_LIB_INFO(avutil, AVUTIL, flags, 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;