From patchwork Wed Feb 24 11:53:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25956 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D24E344B5C7 for ; Wed, 24 Feb 2021 13:54:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B5CAA68A0F0; Wed, 24 Feb 2021 13:54:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CBC0968A3B7 for ; Wed, 24 Feb 2021 13:54:22 +0200 (EET) Received: by mail-wr1-f43.google.com with SMTP id v15so1618353wrx.4 for ; Wed, 24 Feb 2021 03:54:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IEN4T1ew7fvfz4FBlyywD1TtnXmZVskuRpkDQeEQnMg=; b=dwfOD6AdlJcruW/DQmf0hlezqHp2s1zHdnWxv4uYEke9mqYwkG6CV0UOtBjYcBYcVn KGlXxCIG2CPTmAkkC+ImhF4XqDfK8+99BDd+uEbMuSwwQy5lgTKi5GYj9WZQPtDAzxNC JAaSY2nm29LQM0VGNP14+54vg57PV876SOYfzmwc+PNX4EwrNKQIFtNJH+tLu5xd9HyN nPzY8dQDoXE2YxiKrIIGGm8zEkaWsC39HgCoH9sPyGDyEF+iC+SeRc4ie3Hlahl91cQU cJrFE77swSWASzhiZAVTgoLjye1H/JP0VQhnSfbZbjVj0+ltDd89sQ3KcHLz9THDINPB a5Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IEN4T1ew7fvfz4FBlyywD1TtnXmZVskuRpkDQeEQnMg=; b=ORlDGySdNYMmpWLLHyWF/feyGbxRdaFFw0ikW89HMHEnv67PM7p9naajKxfk+rnbYK 4RJ75vchieQiNtMlrx3T4QJ8KakQWE/G65T8k7U1KJImIBUJuU1Zg4mVy5q3aehmyYs4 r/ND2Cjcf738sxrMyzoj+0wuPQjkEpoOxgb8hTPQCH1rw1/2NuLAXkuXLOWK04s/b2D0 XOvKZtV6Y/DQpo2Docf2FE1ZNe5/JdVlg1vgrpm/Y0W2gB8yDZsTwnjz9PVxGousfA+Q ETxYcKPhIYyFD4wQH6AQCilMzZh97hGgT+1PiDYKwXekyFJSVsVLCcbhdR6k3Ie8LVvN uJzA== X-Gm-Message-State: AOAM530MUtyCXX4BvC6pZltVa4ADKv5xrgbLtyXVAFgBnqp72szL5kae lLMuNWfvsp9zPkWQqx2VREmhFt9BryI= X-Google-Smtp-Source: ABdhPJypc/Hc8ZGEc9o85xN7dSVgTE4aguJ8yK9fPgbuLVP002hFsyKBpi1j/YGBZREVKLMa6fmzkg== X-Received: by 2002:a5d:4ec6:: with SMTP id s6mr14420807wrv.416.1614167661893; Wed, 24 Feb 2021 03:54:21 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id k15sm3911776wrn.0.2021.02.24.03.54.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:54:21 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Feb 2021 12:53:31 +0100 Message-Id: <20210224115341.794293-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210224115341.794293-1-andreas.rheinhardt@gmail.com> References: <20210224115341.794293-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/15] avformat/pcm(dec|enc): Don't include disabled (de)muxers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also make the macro used for the demuxers spec-compliant. The earlier macro was not, because the ... argument of a variadic macro must not be left out. GCC and Clang warn about this when using -pedantic. Signed-off-by: Andreas Rheinhardt --- libavformat/pcmdec.c | 102 ++++++++++++++++--------------------------- libavformat/pcmenc.c | 95 +++++++++++++--------------------------- 2 files changed, 68 insertions(+), 129 deletions(-) diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c index 9895af03a4..e65b535665 100644 --- a/libavformat/pcmdec.c +++ b/libavformat/pcmdec.c @@ -104,7 +104,8 @@ static const AVOption pcm_options[] = { { NULL }, }; -#define PCMDEF(name_, long_name_, ext, codec, ...) \ +#define PCMDEF_0(name_, long_name_, ext, codec, ...) +#define PCMDEF_1(name_, long_name_, ext, codec, ...) \ static const AVClass name_ ## _demuxer_class = { \ .class_name = #name_ " demuxer", \ .item_name = av_default_item_name, \ @@ -124,70 +125,40 @@ AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \ .priv_class = &name_ ## _demuxer_class, \ __VA_ARGS__ \ }; - -PCMDEF(f64be, "PCM 64-bit floating-point big-endian", - NULL, AV_CODEC_ID_PCM_F64BE) - -PCMDEF(f64le, "PCM 64-bit floating-point little-endian", - NULL, AV_CODEC_ID_PCM_F64LE) - -PCMDEF(f32be, "PCM 32-bit floating-point big-endian", - NULL, AV_CODEC_ID_PCM_F32BE) - -PCMDEF(f32le, "PCM 32-bit floating-point little-endian", - NULL, AV_CODEC_ID_PCM_F32LE) - -PCMDEF(s32be, "PCM signed 32-bit big-endian", - NULL, AV_CODEC_ID_PCM_S32BE) - -PCMDEF(s32le, "PCM signed 32-bit little-endian", - NULL, AV_CODEC_ID_PCM_S32LE) - -PCMDEF(s24be, "PCM signed 24-bit big-endian", - NULL, AV_CODEC_ID_PCM_S24BE) - -PCMDEF(s24le, "PCM signed 24-bit little-endian", - NULL, AV_CODEC_ID_PCM_S24LE) - -PCMDEF(s16be, "PCM signed 16-bit big-endian", - AV_NE("sw", NULL), AV_CODEC_ID_PCM_S16BE, .mime_type = "audio/L16") - -PCMDEF(s16le, "PCM signed 16-bit little-endian", - AV_NE(NULL, "sw"), AV_CODEC_ID_PCM_S16LE) - -PCMDEF(s8, "PCM signed 8-bit", - "sb", AV_CODEC_ID_PCM_S8) - -PCMDEF(u32be, "PCM unsigned 32-bit big-endian", - NULL, AV_CODEC_ID_PCM_U32BE) - -PCMDEF(u32le, "PCM unsigned 32-bit little-endian", - NULL, AV_CODEC_ID_PCM_U32LE) - -PCMDEF(u24be, "PCM unsigned 24-bit big-endian", - NULL, AV_CODEC_ID_PCM_U24BE) - -PCMDEF(u24le, "PCM unsigned 24-bit little-endian", - NULL, AV_CODEC_ID_PCM_U24LE) - -PCMDEF(u16be, "PCM unsigned 16-bit big-endian", - AV_NE("uw", NULL), AV_CODEC_ID_PCM_U16BE) - -PCMDEF(u16le, "PCM unsigned 16-bit little-endian", - AV_NE(NULL, "uw"), AV_CODEC_ID_PCM_U16LE) - -PCMDEF(u8, "PCM unsigned 8-bit", - "ub", AV_CODEC_ID_PCM_U8) - -PCMDEF(alaw, "PCM A-law", - "al", AV_CODEC_ID_PCM_ALAW) - -PCMDEF(mulaw, "PCM mu-law", - "ul", AV_CODEC_ID_PCM_MULAW) - -PCMDEF(vidc, "PCM Archimedes VIDC", - NULL, AV_CODEC_ID_PCM_VIDC) - +#define PCMDEF_2(name, long_name, ext, codec, enabled, ...) \ + PCMDEF_ ## enabled(name, long_name, ext, codec, __VA_ARGS__) +#define PCMDEF_3(name, long_name, ext, codec, config, ...) \ + PCMDEF_2(name, long_name, ext, codec, config, __VA_ARGS__) +#define PCMDEF_EXT(name, long_name, ext, uppercase, ...) \ + PCMDEF_3(name, long_name, ext, AV_CODEC_ID_PCM_ ## uppercase, \ + CONFIG_PCM_ ## uppercase ## _DEMUXER, __VA_ARGS__) +#define PCMDEF(name, long_name, ext, uppercase) \ + PCMDEF_EXT(name, long_name, ext, uppercase, ) + +PCMDEF(f64be, "PCM 64-bit floating-point big-endian", NULL, F64BE) +PCMDEF(f64le, "PCM 64-bit floating-point little-endian", NULL, F64LE) +PCMDEF(f32be, "PCM 32-bit floating-point big-endian", NULL, F32BE) +PCMDEF(f32le, "PCM 32-bit floating-point little-endian", NULL, F32LE) +PCMDEF(s32be, "PCM signed 32-bit big-endian", NULL, S32BE) +PCMDEF(s32le, "PCM signed 32-bit little-endian", NULL, S32LE) +PCMDEF(s24be, "PCM signed 24-bit big-endian", NULL, S24BE) +PCMDEF(s24le, "PCM signed 24-bit little-endian", NULL, S24LE) +PCMDEF_EXT(s16be, "PCM signed 16-bit big-endian", + AV_NE("sw", NULL), S16BE, .mime_type = "audio/L16") +PCMDEF(s16le, "PCM signed 16-bit little-endian", AV_NE(NULL, "sw"), S16LE) +PCMDEF(s8, "PCM signed 8-bit", "sb", S8) +PCMDEF(u32be, "PCM unsigned 32-bit big-endian", NULL, U32BE) +PCMDEF(u32le, "PCM unsigned 32-bit little-endian", NULL, U32LE) +PCMDEF(u24be, "PCM unsigned 24-bit big-endian", NULL, U24BE) +PCMDEF(u24le, "PCM unsigned 24-bit little-endian", NULL, U24LE) +PCMDEF(u16be, "PCM unsigned 16-bit big-endian", AV_NE("uw", NULL), U16BE) +PCMDEF(u16le, "PCM unsigned 16-bit little-endian", AV_NE(NULL, "uw"), U16LE) +PCMDEF(u8, "PCM unsigned 8-bit", "ub", U8) +PCMDEF(alaw, "PCM A-law", "al", ALAW) +PCMDEF(mulaw, "PCM mu-law", "ul", MULAW) +PCMDEF(vidc, "PCM Archimedes VIDC", NULL, VIDC) + +#if CONFIG_SLN_DEMUXER static const AVOption sln_options[] = { { "sample_rate", "", offsetof(PCMAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 8000}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, { "channels", "", offsetof(PCMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, @@ -213,3 +184,4 @@ AVInputFormat ff_sln_demuxer = { .raw_codec_id = AV_CODEC_ID_PCM_S16LE, .priv_class = &sln_demuxer_class, }; +#endif diff --git a/libavformat/pcmenc.c b/libavformat/pcmenc.c index 1760b3bef7..050b9c4aa0 100644 --- a/libavformat/pcmenc.c +++ b/libavformat/pcmenc.c @@ -22,7 +22,8 @@ #include "avformat.h" #include "rawenc.h" -#define PCMDEF(name_, long_name_, ext, codec) \ +#define PCMDEF_0(name_, long_name_, ext, codec) +#define PCMDEF_1(name_, long_name_, ext, codec) \ AVOutputFormat ff_pcm_ ## name_ ## _muxer = { \ .name = #name_, \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ @@ -32,66 +33,32 @@ AVOutputFormat ff_pcm_ ## name_ ## _muxer = { \ .write_packet = ff_raw_write_packet, \ .flags = AVFMT_NOTIMESTAMPS, \ }; - -PCMDEF(f64be, "PCM 64-bit floating-point big-endian", - NULL, AV_CODEC_ID_PCM_F64BE) - -PCMDEF(f64le, "PCM 64-bit floating-point little-endian", - NULL, AV_CODEC_ID_PCM_F64LE) - -PCMDEF(f32be, "PCM 32-bit floating-point big-endian", - NULL, AV_CODEC_ID_PCM_F32BE) - -PCMDEF(f32le, "PCM 32-bit floating-point little-endian", - NULL, AV_CODEC_ID_PCM_F32LE) - -PCMDEF(s32be, "PCM signed 32-bit big-endian", - NULL, AV_CODEC_ID_PCM_S32BE) - -PCMDEF(s32le, "PCM signed 32-bit little-endian", - NULL, AV_CODEC_ID_PCM_S32LE) - -PCMDEF(s24be, "PCM signed 24-bit big-endian", - NULL, AV_CODEC_ID_PCM_S24BE) - -PCMDEF(s24le, "PCM signed 24-bit little-endian", - NULL, AV_CODEC_ID_PCM_S24LE) - -PCMDEF(s16be, "PCM signed 16-bit big-endian", - AV_NE("sw", NULL), AV_CODEC_ID_PCM_S16BE) - -PCMDEF(s16le, "PCM signed 16-bit little-endian", - AV_NE(NULL, "sw"), AV_CODEC_ID_PCM_S16LE) - -PCMDEF(s8, "PCM signed 8-bit", - "sb", AV_CODEC_ID_PCM_S8) - -PCMDEF(u32be, "PCM unsigned 32-bit big-endian", - NULL, AV_CODEC_ID_PCM_U32BE) - -PCMDEF(u32le, "PCM unsigned 32-bit little-endian", - NULL, AV_CODEC_ID_PCM_U32LE) - -PCMDEF(u24be, "PCM unsigned 24-bit big-endian", - NULL, AV_CODEC_ID_PCM_U24BE) - -PCMDEF(u24le, "PCM unsigned 24-bit little-endian", - NULL, AV_CODEC_ID_PCM_U24LE) - -PCMDEF(u16be, "PCM unsigned 16-bit big-endian", - AV_NE("uw", NULL), AV_CODEC_ID_PCM_U16BE) - -PCMDEF(u16le, "PCM unsigned 16-bit little-endian", - AV_NE(NULL, "uw"), AV_CODEC_ID_PCM_U16LE) - -PCMDEF(u8, "PCM unsigned 8-bit", - "ub", AV_CODEC_ID_PCM_U8) - -PCMDEF(alaw, "PCM A-law", - "al", AV_CODEC_ID_PCM_ALAW) - -PCMDEF(mulaw, "PCM mu-law", - "ul", AV_CODEC_ID_PCM_MULAW) - -PCMDEF(vidc, "PCM Archimedes VIDC", - NULL, AV_CODEC_ID_PCM_VIDC) +#define PCMDEF_2(name, long_name, ext, codec, enabled) \ + PCMDEF_ ## enabled(name, long_name, ext, codec) +#define PCMDEF_3(name, long_name, ext, codec, config) \ + PCMDEF_2(name, long_name, ext, codec, config) +#define PCMDEF(name, long_name, ext, uppercase) \ + PCMDEF_3(name, long_name, ext, AV_CODEC_ID_PCM_ ## uppercase, \ + CONFIG_PCM_ ## uppercase ## _MUXER) + +PCMDEF(f64be, "PCM 64-bit floating-point big-endian", NULL, F64BE) +PCMDEF(f64le, "PCM 64-bit floating-point little-endian", NULL, F64LE) +PCMDEF(f32be, "PCM 32-bit floating-point big-endian", NULL, F32BE) +PCMDEF(f32le, "PCM 32-bit floating-point little-endian", NULL, F32LE) +PCMDEF(s32be, "PCM signed 32-bit big-endian", NULL, S32BE) +PCMDEF(s32le, "PCM signed 32-bit little-endian", NULL, S32LE) +PCMDEF(s24be, "PCM signed 24-bit big-endian", NULL, S24BE) +PCMDEF(s24le, "PCM signed 24-bit little-endian", NULL, S24LE) +PCMDEF(s16be, "PCM signed 16-bit big-endian", AV_NE("sw", NULL), S16BE) +PCMDEF(s16le, "PCM signed 16-bit little-endian", AV_NE(NULL, "sw"), S16LE) +PCMDEF(s8, "PCM signed 8-bit", "sb", S8) +PCMDEF(u32be, "PCM unsigned 32-bit big-endian", NULL, U32BE) +PCMDEF(u32le, "PCM unsigned 32-bit little-endian", NULL, U32LE) +PCMDEF(u24be, "PCM unsigned 24-bit big-endian", NULL, U24BE) +PCMDEF(u24le, "PCM unsigned 24-bit little-endian", NULL, U24LE) +PCMDEF(u16be, "PCM unsigned 16-bit big-endian", AV_NE("uw", NULL), U16BE) +PCMDEF(u16le, "PCM unsigned 16-bit little-endian", AV_NE(NULL, "uw"), U16LE) +PCMDEF(u8, "PCM unsigned 8-bit", "ub", U8) +PCMDEF(alaw, "PCM A-law", "al", ALAW) +PCMDEF(mulaw, "PCM mu-law", "ul", MULAW) +PCMDEF(vidc, "PCM Archimedes VIDC", NULL, VIDC)