From ebaf87cd17d3b57884e616b01c86bf3d3960dee4 Mon Sep 17 00:00:00 2001
From: Doug Nazar <nazard@nazar.ca>
Date: Wed, 14 May 2025 14:41:10 -0400
Subject: [PATCH] law: Switch to GST_AUDIO_NE()
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8984>
---
subprojects/gst-plugins-good/gst/law/mulaw-decode.c | 8 +-------
subprojects/gst-plugins-good/gst/law/mulaw-encode.c | 8 +-------
subprojects/gst-plugins-good/gst/law/mulaw.c | 6 ------
3 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/subprojects/gst-plugins-good/gst/law/mulaw-decode.c b/subprojects/gst-plugins-good/gst/law/mulaw-decode.c
index 2783376f3f..49d6a72312 100644
--- a/subprojects/gst-plugins-good/gst/law/mulaw-decode.c
+++ b/subprojects/gst-plugins-good/gst/law/mulaw-decode.c
@@ -51,17 +51,11 @@ enum
PROP_0
};
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define INT_FORMAT "S16LE"
-#else
-#define INT_FORMAT "S16BE"
-#endif
-
GstStaticPadTemplate mulaw_dec_src_factory = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw, "
- "format = (string) " INT_FORMAT ", "
+ "format = (string) " GST_AUDIO_NE (S16) ", "
"layout = (string) interleaved, "
"rate = (int) [ 8000, 192000 ], " "channels = (int) [ 1, 2 ]")
);
diff --git a/subprojects/gst-plugins-good/gst/law/mulaw-encode.c b/subprojects/gst-plugins-good/gst/law/mulaw-encode.c
index 8f951d46ff..32ff46c92a 100644
--- a/subprojects/gst-plugins-good/gst/law/mulaw-encode.c
+++ b/subprojects/gst-plugins-good/gst/law/mulaw-encode.c
@@ -35,17 +35,11 @@
extern GstStaticPadTemplate mulaw_enc_src_factory;
extern GstStaticPadTemplate mulaw_enc_sink_factory;
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define INT_FORMAT "S16LE"
-#else
-#define INT_FORMAT "S16BE"
-#endif
-
GstStaticPadTemplate mulaw_enc_sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw, "
- "format = (string) " INT_FORMAT ", "
+ "format = (string) " GST_AUDIO_NE (S16) ", "
"layout = (string) interleaved, "
"rate = (int) [ 8000, 192000 ], " "channels = (int) [ 1, 2 ]")
);
diff --git a/subprojects/gst-plugins-good/gst/law/mulaw.c b/subprojects/gst-plugins-good/gst/law/mulaw.c
index 14bfc28d51..1ca8eac0c0 100644
--- a/subprojects/gst-plugins-good/gst/law/mulaw.c
+++ b/subprojects/gst-plugins-good/gst/law/mulaw.c
@@ -22,12 +22,6 @@
#include "mulaw-encode.h"
#include "mulaw-decode.h"
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define INT_FORMAT "S16LE"
-#else
-#define INT_FORMAT "S16BE"
-#endif
-
static gboolean
plugin_init (GstPlugin * plugin)
{