From b6bc76642a3a7fbea56fc4724cbb866362e4e2ae Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 15 Sep 2005 13:52:27 +0000 Subject: [PATCH] gst/audioconvert/gstaudioconvert.c: And enable 24 bits mode as well.. Original commit message from CVS: * gst/audioconvert/gstaudioconvert.c: And enable 24 bits mode as well.. --- ChangeLog | 5 +++++ gst/audioconvert/gstaudioconvert.c | 19 ++++++------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f66d9e9ca..5674088137 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-09-15 Wim Taymans + + * gst/audioconvert/gstaudioconvert.c: + And enable 24 bits mode as well.. + 2005-09-15 Wim Taymans * gst-libs/gst/rtp/Makefile.am: diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c index 10544a38e6..b2b9a4530a 100644 --- a/gst/audioconvert/gstaudioconvert.c +++ b/gst/audioconvert/gstaudioconvert.c @@ -45,10 +45,6 @@ GST_DEBUG_CATEGORY (audio_convert_debug); -/* int to float conversion: int2float(i) = 1 / (2^31-1) * i */ -#define INT2FLOAT(i) (4.6566128752457969e-10 * ((gfloat)i)) - - /*** DEFINITIONS **************************************************************/ static GstElementDetails audio_convert_details = { @@ -111,6 +107,12 @@ GST_STATIC_CAPS ( \ "width = (int) 32, " \ "depth = (int) [ 1, 32 ], " \ "signed = (boolean) { true, false }; " \ + "audio/x-raw-int, " \ + "rate = (int) [ 1, MAX ], " \ + "channels = (int) [ 1, 8 ], " \ + "endianness = (int) { LITTLE_ENDIAN, BIG_ENDIAN }, " \ + "width = (int) 24, " \ + "depth = (int) [ 1, 24 ], " "signed = (boolean) { true, false }; " \ "audio/x-raw-int, " \ "rate = (int) [ 1, MAX ], " \ "channels = (int) [ 1, 8 ], " \ @@ -127,15 +129,6 @@ GST_STATIC_CAPS ( \ "signed = (boolean) { true, false } " \ ) -/* FIXME: put back 24 bit audio */ -#if 0 -"audio/x-raw-int, " - "rate = (int) [ 1, MAX ], " - "channels = (int) [ 1, 8 ], " - "endianness = (int) { LITTLE_ENDIAN, BIG_ENDIAN }, " - "width = (int) 24, " - "depth = (int) [ 1, 24 ], " "signed = (boolean) { true, false }; " -#endif static GstAudioChannelPosition *supported_positions; static GstStaticCaps gst_audio_convert_static_caps = STATIC_CAPS;