From patchwork Thu Aug 17 14:27:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43241 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c9d:b0:130:ccc6:6c4b with SMTP id fq29csp2006889pzb; Thu, 17 Aug 2023 07:27:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFd3D8BTm4dZg/aUHJJdlUexO3buSM/RM0GFSniavYbdZiKYlN/HIvV1pdUmSzQQuyfwsQ6 X-Received: by 2002:ac2:4204:0:b0:4fe:3e89:fcb2 with SMTP id y4-20020ac24204000000b004fe3e89fcb2mr3666330lfh.34.1692282447742; Thu, 17 Aug 2023 07:27:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692282447; cv=none; d=google.com; s=arc-20160816; b=dY20BTt2j/vVlKFT8RgjY9CkgX6FP+8MW+fwSmxxuZateln4huPsd5Kf3PlzLAsOhg IPEnf22iLZCXb91fxN3GEZRXzlGGIuiwu/a5na2rUjurLy72pdQrSfSgmvmjohGsmJhU jsNWuV17647ycPJL59C0VRzxQpIx1/OOoFVA32tu3F5O1QIDRlxoKssQK4OFCSw04z9a L71ztLH5KWN8pdbiWzyEi/lFX+QlO3QZCc97ZeJgFOTLwfNipV2re7TvYL4nX3SX+PTy SS+WAbduzfTy3dIHwJ9TDkz6yIC3yaLZvWGypNJJfOcUBqirBiFDZSJaOLqeYKloNkdd WSEQ== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=ByVQAvlqhkOaI+auY7ZHdXiiZ5XrALsNbuzzB1fBd8s=; fh=fgsEC5uuZOuzV7r9mTXgvURIGbxpRO08JRnNlycBIXw=; b=PElzbz4O71rqz3vnWEXlFH+WvAsXD7fP8YtcQ+x025/9Ywjq4d6o8+4Yvnvg4EUdZt VlMRwejNL0fQB9njNbnXRGPuWhc/XpmG92U3tOSPNiZ3x4OrLTSABREfL4hP+EKfbnD7 TX7BBL89Px0qTeSuRYoVVHOcwaWb6PZeCb5+7s1P7WwWondz9Nlh1JCzJtDta4LpA8Fe gpdherLL81VrjF4Terd/lvcYJOk7PZbipz8C7K9bLHkarJX5CtaLFOlFPwD13BvNudKk spmPjzmMyBNhnLogu7uQOodpA62f9BP0BqrikuJj77OHjTB9qmLKoiYjOQUP10klF7Vz fh5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=mZsPS9cI; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id rk28-20020a170907215c00b0099c971ba282si12175788ejb.99.2023.08.17.07.27.27; Thu, 17 Aug 2023 07:27:27 -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=@foxmail.com header.s=s201512 header.b=mZsPS9cI; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 517D168C777; Thu, 17 Aug 2023 17:27:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-64.mail.qq.com (out162-62-57-64.mail.qq.com [162.62.57.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6DB468C5CB for ; Thu, 17 Aug 2023 17:27:14 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1692282425; bh=2Yh9nKy0uBAb4nHbJiaak47hHi4EdUV78jj/k6zYXhY=; h=From:To:Cc:Subject:Date; b=mZsPS9cIcdn9ijnb0ofb45/HaydXhSE6PGfE8y0Oix0ME8DejgXH/1MOXEQzZm55b ipY8HUfW4GFCWrAuNjUiGorkv2RZmFsv3Ns7QnMWmxK1ciiZL4AsTEO1HNmeETEHyC xJOASUlW/1mRDvCFrH1ei9Le1pTslRSIm0qKXGFg= Received: from zhilizhao-PC5.tencent.com ([113.108.77.60]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id 6C435C46; Thu, 17 Aug 2023 22:27:04 +0800 X-QQ-mid: xmsmtpt1692282424tlrzvb6rs Message-ID: X-QQ-XMAILINFO: M5Jk7qYLFVj1j87u5ohFA788bFlJ9rK1/VwiXWqBf1lzG0qsW9GmuJZRKndmpp n/uI2QTp/urECaQg5qgpZOQ2f/PhLsjc7GnHxxBVRold5VnzCTV3Y7v0CW9QmBOpsMXM84Abw62S qU4QTsYbbjMLfIWssy18wfQxSGCQmGx68cohxTaJnCfGK2onDYo1vyEEPiWEwuIcvoRoPYtfyahR cGmJPkD30UI9gZh+2j8K1NzNI7f1CES36tz0IC+Cay09IYl8Zd0hwAvYTRZBQSMKeObGmqetb5QC IkzMvcVMEqhMbxcn6TZ8zF/Pk4rN6c9f0HXSe94EBwcsarilb/9ZxrZCH5BKxZMVnyaNRwmPdRMJ ipO00kTLSCs3JwiLsM10cAeA+JWzHRtB8ltaoejgv32qCuvaxVLWEOfqu5RyBygLzGrZBFV6uPgz l9VvzON51yEImTRUt8uq2USt6Nq7gB0OK/naWhe+AAEcOO26tIParFKDHhngB/jgWtmEMsa4RjRn k4wIHeR5e0UucLKTTChx/T1FGi/wK6JtSGCmTPT97tITxEfMEggtikvC5hE0UKayuilhJzmk38vh F7tylm1wp5nO/prufEdXSCSC6jShfnJFQcpDjBborGjXrXUX8ht2QBz4BnxJQsKR/b3ef0AfnKOp MvktMOg6XgUyJGIBFYIQdNiRnvUz6JCIgNGDeUcYKk66feeig2po1kP5L3LVr5XoB/cuzJqoX3lJ d/ZJ5P6UggZkch19MhMuBsZttHpvmADzidXGX1mIfHUeEGFrzreRLF3N2VkEwmDuS98WSWTz6zJJ n9CCN2iF6Oevlu3Zrj+6QFStfFFlu+ZPa5aPc/WpWuU9ABrG+lx/m2Ppdf6P/9HyKqA7zoRS12a6 xQLD0LcnoXaKWx+8qlR5lEzPWA77eJ8WOYBFPjxqmMbgq6E1Rx+DP7LSUu2NBNckK4hDm6+Z2sIe L1ZBgw2nWn6INEoh+YcGmeM9ywN0An9M06F1jflzQ5K7Oc+tYf0Q== X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Aug 2023 22:27:03 +0800 X-OQ-MSGID: <20230817142703.18448-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avutil/channel_layout: make pre-defined channel layouts C++ friendly 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: AT81cA6lrSEV From: Zhao Zhili C++ doesn't support designated initializers until C++20. We have a bunch of pre-defined channel layouts, the gains to make them usable in C++ exceed the losses. Bump minor version so C++ project can check before use these defines. Also initialize .opaque field explicitly to reduce warning in C++. --- v2: 1. Keep field names in comments. 2. Bump minor version. 3. Add comments so it won't be reverted by accident. libavutil/channel_layout.h | 5 +++-- libavutil/version.h | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h index f345415c55..f019b3d7ad 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -358,8 +358,9 @@ typedef struct AVChannelLayout { void *opaque; } AVChannelLayout; +/* Don't use designated initializers since C++ doesn't support it until C++20. */ #define AV_CHANNEL_LAYOUT_MASK(nb, m) \ - { .order = AV_CHANNEL_ORDER_NATIVE, .nb_channels = (nb), .u = { .mask = (m) }} + { /* .order */ AV_CHANNEL_ORDER_NATIVE, /* .nb_channels */ (nb), /* .u.mask */ { m }, /* .opaque */ NULL } /** * @name Common pre-defined channel layouts @@ -397,7 +398,7 @@ typedef struct AVChannelLayout { #define AV_CHANNEL_LAYOUT_STEREO_DOWNMIX AV_CHANNEL_LAYOUT_MASK(2, AV_CH_LAYOUT_STEREO_DOWNMIX) #define AV_CHANNEL_LAYOUT_22POINT2 AV_CHANNEL_LAYOUT_MASK(24, AV_CH_LAYOUT_22POINT2) #define AV_CHANNEL_LAYOUT_AMBISONIC_FIRST_ORDER \ - { .order = AV_CHANNEL_ORDER_AMBISONIC, .nb_channels = 4, .u = { .mask = 0 }} + { /* .order */ AV_CHANNEL_ORDER_AMBISONIC, /* .nb_channels */ 4, /* .u.mask */ { 0 }, NULL } /** @} */ struct AVBPrint; diff --git a/libavutil/version.h b/libavutil/version.h index 5a4d4d3d73..bc43baca9f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,8 +79,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 58 -#define LIBAVUTIL_VERSION_MINOR 16 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 17 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \