From c0d31dd555655296261b691b44e9fdcb203bfd38 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 6 Sep 2011 16:46:02 +0200 Subject: [PATCH] rename IS_LE/BE to _IS_LITTLE_ENDIAN/BIG_ENDIAN --- gst-libs/gst/audio/audio.h | 22 +++++++++++----------- gst/audioconvert/audioconvert.c | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h index 35762b3dd6..150c19e497 100644 --- a/gst-libs/gst/audio/audio.h +++ b/gst-libs/gst/audio/audio.h @@ -214,19 +214,19 @@ struct _GstAudioFormatInfo { GstAudioFormatPack pack_func; }; -#define GST_AUDIO_FORMAT_INFO_FORMAT(info) ((info)->format) -#define GST_AUDIO_FORMAT_INFO_NAME(info) ((info)->name) -#define GST_AUDIO_FORMAT_INFO_FLAGS(info) ((info)->flags) +#define GST_AUDIO_FORMAT_INFO_FORMAT(info) ((info)->format) +#define GST_AUDIO_FORMAT_INFO_NAME(info) ((info)->name) +#define GST_AUDIO_FORMAT_INFO_FLAGS(info) ((info)->flags) -#define GST_AUDIO_FORMAT_INFO_IS_INTEGER(info) !!((info)->flags & GST_AUDIO_FORMAT_FLAG_INTEGER) -#define GST_AUDIO_FORMAT_INFO_IS_FLOAT(info) !!((info)->flags & GST_AUDIO_FORMAT_FLAG_FLOAT) -#define GST_AUDIO_FORMAT_INFO_IS_SIGNED(info) !!((info)->flags & GST_AUDIO_FORMAT_FLAG_SIGNED) +#define GST_AUDIO_FORMAT_INFO_IS_INTEGER(info) !!((info)->flags & GST_AUDIO_FORMAT_FLAG_INTEGER) +#define GST_AUDIO_FORMAT_INFO_IS_FLOAT(info) !!((info)->flags & GST_AUDIO_FORMAT_FLAG_FLOAT) +#define GST_AUDIO_FORMAT_INFO_IS_SIGNED(info) !!((info)->flags & GST_AUDIO_FORMAT_FLAG_SIGNED) -#define GST_AUDIO_FORMAT_INFO_ENDIANNESS(info) ((info)->endianness) -#define GST_AUDIO_FORMAT_INFO_IS_LE(info) ((info)->endianness == G_LITTLE_ENDIAN) -#define GST_AUDIO_FORMAT_INFO_IS_BE(info) ((info)->endianness == G_BIG_ENDIAN) -#define GST_AUDIO_FORMAT_INFO_WIDTH(info) ((info)->width) -#define GST_AUDIO_FORMAT_INFO_DEPTH(info) ((info)->depth) +#define GST_AUDIO_FORMAT_INFO_ENDIANNESS(info) ((info)->endianness) +#define GST_AUDIO_FORMAT_INFO_IS_LITTLE_ENDIAN(info) ((info)->endianness == G_LITTLE_ENDIAN) +#define GST_AUDIO_FORMAT_INFO_IS_BIG_ENDIAN(info) ((info)->endianness == G_BIG_ENDIAN) +#define GST_AUDIO_FORMAT_INFO_WIDTH(info) ((info)->width) +#define GST_AUDIO_FORMAT_INFO_DEPTH(info) ((info)->depth) GstAudioFormat gst_audio_format_build_integer (gboolean sign, gint endianness, diff --git a/gst/audioconvert/audioconvert.c b/gst/audioconvert/audioconvert.c index 509a85a66f..c23b35660b 100644 --- a/gst/audioconvert/audioconvert.c +++ b/gst/audioconvert/audioconvert.c @@ -569,14 +569,14 @@ audio_convert_get_func_index (AudioConvertCtx * ctx, if (GST_AUDIO_FORMAT_INFO_IS_INTEGER (fmt)) { index += (GST_AUDIO_FORMAT_INFO_WIDTH (fmt) / 8 - 1) * 4; - index += GST_AUDIO_FORMAT_INFO_IS_LE (fmt) ? 0 : 2; + index += GST_AUDIO_FORMAT_INFO_IS_LITTLE_ENDIAN (fmt) ? 0 : 2; index += GST_AUDIO_FORMAT_INFO_IS_SIGNED (fmt) ? 1 : 0; index += (ctx->ns == NOISE_SHAPING_NONE) ? 0 : 24; } else { /* this is float/double */ index = 16; index += (GST_AUDIO_FORMAT_INFO_WIDTH (fmt) == 32) ? 0 : 2; - index += GST_AUDIO_FORMAT_INFO_IS_LE (fmt) ? 0 : 1; + index += GST_AUDIO_FORMAT_INFO_IS_LITTLE_ENDIAN (fmt) ? 0 : 1; index += (DOUBLE_INTERMEDIATE_FORMAT (ctx)) ? 4 : 0; }