summaryrefslogtreecommitdiffstats
path: root/ext/wavpack/gstwavpackenc.h
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2007-03-30 04:50:11 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2007-03-30 04:50:11 +0000
commit14c0bebf4b587eb747649987eb09aeab3e31dbe8 (patch)
treec8fe4ecce8fe614311480da285ad86d1690f4d23 /ext/wavpack/gstwavpackenc.h
parent365437cbc0a210a71756528331c5b3b6fd667813 (diff)
downloadgst-plugins-bad-14c0bebf4b587eb747649987eb09aeab3e31dbe8.tar.gz
gst-plugins-bad-14c0bebf4b587eb747649987eb09aeab3e31dbe8.tar.bz2
gst-plugins-bad-14c0bebf4b587eb747649987eb09aeab3e31dbe8.zip
ext/wavpack/: Don't play audioconvert. As wavpack wants/outputs all samples with width==32 and depth=[1,32] accept th...
Original commit message from CVS: * ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_reset), (gst_wavpack_dec_init), (gst_wavpack_dec_sink_set_caps), (gst_wavpack_dec_clip_outgoing_buffer), (gst_wavpack_dec_post_tags), (gst_wavpack_dec_chain): * ext/wavpack/gstwavpackdec.h: * ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_reset), (gst_wavpack_enc_sink_set_caps), (gst_wavpack_enc_set_wp_config), (gst_wavpack_enc_chain): * ext/wavpack/gstwavpackenc.h: * ext/wavpack/gstwavpackparse.c: Don't play audioconvert. As wavpack wants/outputs all samples with width==32 and depth=[1,32] accept this and let audioconvert convert to accepted formats instead of doing it in the element for n*8 depths. This also adds support for non-n*8 depths and prevents some useless memory allocations. Fixes #421598 Also add a workaround for bug #421542 in wavpackenc for now... * tests/check/elements/wavpackdec.c: (GST_START_TEST): * tests/check/elements/wavpackenc.c: (GST_START_TEST): * tests/check/elements/wavpackparse.c: (GST_START_TEST): Consider the change above in the unit tests and test if the correct caps are accepted and set. Also check for GST_BUFFER_OFFSET_END in the wavpackparse unit test. * ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_init), (gst_wavpack_dec_sink_set_caps): Set caps on the src pad as soon as possible. * ext/wavpack/gstwavpackdec.h: * ext/wavpack/gstwavpackcommon.h: * ext/wavpack/gstwavpackenc.h: * ext/wavpack/gstwavpackparse.h: Fix indention. gst-indent is now called by cicl.
Diffstat (limited to 'ext/wavpack/gstwavpackenc.h')
-rw-r--r--ext/wavpack/gstwavpackenc.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/wavpack/gstwavpackenc.h b/ext/wavpack/gstwavpackenc.h
index 35d796f8..617a2f64 100644
--- a/ext/wavpack/gstwavpackenc.h
+++ b/ext/wavpack/gstwavpackenc.h
@@ -28,7 +28,6 @@
#include "md5.h"
G_BEGIN_DECLS
-
#define GST_TYPE_WAVPACK_ENC \
(gst_wavpack_enc_get_type())
#define GST_WAVPACK_ENC(obj) \
@@ -39,7 +38,6 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_WAVPACK_ENC))
#define GST_IS_WAVPACK_ENC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_WAVPACK_ENC))
-
typedef struct _GstWavpackEnc GstWavpackEnc;
typedef struct _GstWavpackEncClass GstWavpackEncClass;
@@ -54,7 +52,7 @@ struct _GstWavpackEnc
{
GstElement element;
- /*< private >*/
+ /*< private > */
GstPad *sinkpad, *srcpad;
GstPad *wvcsrcpad;
@@ -66,7 +64,7 @@ struct _GstWavpackEnc
gint samplerate;
gint channels;
- gint width;
+ gint depth;
GstWavpackEncWriteID wv_id;
GstWavpackEncWriteID wvc_id;
@@ -93,5 +91,4 @@ GType gst_wavpack_enc_get_type (void);
gboolean gst_wavpack_enc_plugin_init (GstPlugin * plugin);
G_END_DECLS
-
#endif /* __GST_WAVPACK_ENC_H__ */