From patchwork Thu Nov 3 15:30:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "L. E. Segovia" X-Patchwork-Id: 39147 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp614571pzb; Thu, 3 Nov 2022 08:31:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7OiGVL8Ui4AK9fwByEOh+lYDG9uz2OPbs3E0ajMuGECzoq0ZaWBclrLyJ4SfXSgS8jiN48 X-Received: by 2002:a17:906:2c1b:b0:7ad:cf0d:d29a with SMTP id e27-20020a1709062c1b00b007adcf0dd29amr22733584ejh.309.1667489464967; Thu, 03 Nov 2022 08:31:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667489464; cv=none; d=google.com; s=arc-20160816; b=dLYJG9LXIJaTrnnE7C19kQp0/KbsuM0VT+1MCRdo/rc0CjROO/kXWLkI0TWq/gdJrw aqnM4vhG4kEcM7NTVRDL6TAQGPui59uFJ3sgYLXQOQpTLUEWi65b9LU6yeaMdMwEjvfI Kf1tjrxkIgwk/zzin58Wx2ITnBbchXOKc8yuIPsBHNJCDd43AJHcSIEpkluey6S1NL6Q tKHjdMjaRJCpyVHdmYD4wwDDgVwcCm6Agb5NMq6fblvwuxqSwA+UlFNLub9o+YPqtEzt yjiqgM5hWYYr/xw7XxOhhs5IzSgtcIkRuWA7/brnNBAcXPFN9vFA9SpVxwaCbNGTC4us 5gyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=3Zxhda9Bjx0zr+xrcp7Fbh0RG7urdtigApuU8lYDIyU=; b=AO1QZ4pOvGNlDevyNblrJI5Nws/ki4HIVHq+fRHu7Cq9b35/nKnL2IPqoexWinHYzc /cuSo2zUfb3+NNu61SHlMH4aIZ06bOK/YgkNLhCVSsZMjb1HGM68g/naU6Wqq0BVzZk+ Q590OmrUxVmVsonz+TbHrbm+BAQIPmz7r95zm/ELz5me8rd8k8uUbne+MWz8UZfa1H3+ wfaM4iTeJDzXVmiIFZBXUm9stPiYTThPKCbV/6hw/wl6sYUtkHooyuqQrcfxD0yWKXkE ZK6A2fHUAbYFh2MxYEEn6tG+xzaMuslzqTtAF9xg79K9i2PTCfqxI7usFHtRUeTAomb8 TYTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@amyspark.me header.s=gm1 header.b=P2fY7YrL; 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 qa34-20020a17090786a200b0077f4fcfe49csi1697847ejc.905.2022.11.03.08.31.04; Thu, 03 Nov 2022 08:31:04 -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=P2fY7YrL; 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 6A75B68BB4C; Thu, 3 Nov 2022 17:30:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E13A468BFA2 for ; Thu, 3 Nov 2022 17:30:37 +0200 (EET) Received: (Authenticated sender: amy@amyspark.me) by mail.gandi.net (Postfix) with ESMTPSA id 2972624000E; Thu, 3 Nov 2022 15:30:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amyspark.me; s=gm1; t=1667489437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2ZRNsjuZ4t0RtNhLOzxFJeVRIYfLlyY1jaJan2nH8nQ=; b=P2fY7YrL2Pe5usEX1AA6vlXQWj+BkILParuNWYblPxvFG9/sBBDAZRB5W44Pc7Rhj5Nt3v +ZeLBHR68L4j562klKKqPbvNS9/kRd4s9X6PA3pYGVpOic/cY1Mj2LrxsFyNvQzYrVdjwH l5EtvZhOU0JsCkPbRbRqgZnjj5afIjphKXQ2JitDoTUHTtBwlvT6sSU7aRjg0IxCmIKkjH hDx4zPeGVtQTP287I2jYGQ3QELkQHaZBMGU6Y81RrdBFcv58ZQ4zM5ibL36JGBhmABcFDz KCOkrgunB1hKjHenQQm36MljRcY0mOV79UNMAEhaT508PQPljZYv0aQiouvOoA== From: "L. E. Segovia" To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Nov 2022 15:30:12 +0000 Message-Id: <20221103153014.66226-4-amy@amyspark.me> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/5] 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 Cc: Nirbheek Chauhan , Halla Rempt , =?utf-8?q?Tim-Philipp_M=C3=BCller?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Xfgmcaot9yuu 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 9b7e82fd8c..b878e258ca 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3518,9 +3518,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); \ @@ -3530,8 +3530,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 8a06df82df..f901dba806 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;