FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

audiomixer: Switch to GST_AUDIO_NE()

Browse Source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8984>
This commit is contained in:
Doug Nazar 2025-05-14 14:38:41 -04:00
parent af2b6b4c38
commit bf05a050e9
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
subprojects/gst-plugins-base/gst/audiomixer/gstaudiointerleave.c
View File

@ -104,16 +104,6 @@ enum
/* elementfactory information */ /* elementfactory information */
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
#define CAPS \
GST_AUDIO_CAPS_MAKE ("{ S32LE, U32LE, S16LE, U16LE, S8, U8, F32LE, F64LE }") \
", layout = (string) { interleaved, non-interleaved }"
#else
#define CAPS \
GST_AUDIO_CAPS_MAKE ("{ S32BE, U32BE, S16BE, U16BE, S8, U8, F32BE, F64BE }") \
", layout = (string) { interleaved, non-interleaved }"
#endif
static GstStaticPadTemplate gst_audio_interleave_sink_template = static GstStaticPadTemplate gst_audio_interleave_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink_%u", GST_STATIC_PAD_TEMPLATE ("sink_%u",
GST_PAD_SINK, GST_PAD_SINK,

10
subprojects/gst-plugins-base/gst/audiomixer/gstaudiomixer.c
View File

@ -169,15 +169,11 @@ enum
/* These are the formats we can mix natively */ /* These are the formats we can mix natively */
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
#define CAPS \ #define CAPS \
GST_AUDIO_CAPS_MAKE ("{ S32LE, U32LE, S16LE, U16LE, S8, U8, F32LE, F64LE }") \ GST_AUDIO_CAPS_MAKE ("{ " GST_AUDIO_NE (S32) ", " GST_AUDIO_NE (U32) ", " \
GST_AUDIO_NE (S16) ", " GST_AUDIO_NE (U16) ", S8, U8, " \
GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (F64) " }") \
", layout = interleaved" ", layout = interleaved"
#else
#define CAPS \
GST_AUDIO_CAPS_MAKE ("{ S32BE, U32BE, S16BE, U16BE, S8, U8, F32BE, F64BE }") \
", layout = interleaved"
#endif
static GstStaticPadTemplate gst_audiomixer_src_template = static GstStaticPadTemplate gst_audiomixer_src_template =
GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_PAD_TEMPLATE ("src",