From 7eb75b4f355fe77f68cd1d1ea806e2a18960abde Mon Sep 17 00:00:00 2001 From: Youness Alaoui Date: Sat, 12 Apr 2008 23:44:18 +0000 Subject: [PATCH] [MOVED FROM GST-P-FARSIGHT] Fix byte ordering issues with dtmfsrc and rtpdtmfdepay.. use of G_STRINGIFY to avoid error on MSVC 20080412234418-4f0f6-4828d1613dfcd564afd236dfc8fb57a299092f83.gz --- gst/dtmf/gstdtmfsrc.c | 6 +----- gst/dtmf/gstrtpdtmfdepay.c | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gst/dtmf/gstdtmfsrc.c b/gst/dtmf/gstdtmfsrc.c index 71e5dbb..38470a0 100644 --- a/gst/dtmf/gstdtmfsrc.c +++ b/gst/dtmf/gstdtmfsrc.c @@ -225,11 +225,7 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_CAPS ("audio/x-raw-int, " "width = (int) 16, " "depth = (int) 16, " -#if G_BYTE_ORDER == G_LITTLE_ENDIAN - "endianness = (int) 1234, " -#else - "endianness = (int) 4321, " -#endif + "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", " "signed = (bool) true, " "rate = (int) 8000, " "channels = (int) 1") diff --git a/gst/dtmf/gstrtpdtmfdepay.c b/gst/dtmf/gstrtpdtmfdepay.c index f90978a..d1096c8 100644 --- a/gst/dtmf/gstrtpdtmfdepay.c +++ b/gst/dtmf/gstrtpdtmfdepay.c @@ -125,7 +125,7 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_CAPS ("audio/x-raw-int, " "width = (int) 16, " "depth = (int) 16, " - "endianness = (int) 1234, " + "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", " "signed = (boolean) true, " "rate = (int) [0, MAX], " "channels = (int) 1") @@ -206,7 +206,7 @@ gst_rtp_dtmf_depay_setcaps (GstBaseRTPDepayload * filter, GstCaps * caps) srccaps = gst_caps_new_simple ("audio/x-raw-int", "width", G_TYPE_INT, 16, "depth", G_TYPE_INT, 16, - "endianness", G_TYPE_INT, 1234, + "endianness", G_TYPE_INT, G_BYTE_ORDER, "signed", G_TYPE_BOOLEAN, TRUE, "channels", G_TYPE_INT, 1, "rate", G_TYPE_INT, clock_rate, NULL); -- 2.7.4