diff options
author | Sebastian Dröge <slomo@circular-chaos.org> | 2007-03-30 04:50:11 +0000 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2007-03-30 04:50:11 +0000 |
commit | 14c0bebf4b587eb747649987eb09aeab3e31dbe8 (patch) | |
tree | c8fe4ecce8fe614311480da285ad86d1690f4d23 /ext/wavpack/gstwavpackdec.h | |
parent | 365437cbc0a210a71756528331c5b3b6fd667813 (diff) | |
download | gst-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/gstwavpackdec.h')
-rw-r--r-- | ext/wavpack/gstwavpackdec.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/ext/wavpack/gstwavpackdec.h b/ext/wavpack/gstwavpackdec.h index dcae0a87..68380ca5 100644 --- a/ext/wavpack/gstwavpackdec.h +++ b/ext/wavpack/gstwavpackdec.h @@ -30,7 +30,6 @@ #include "gstwavpackstreamreader.h" G_BEGIN_DECLS - #define GST_TYPE_WAVPACK_DEC \ (gst_wavpack_dec_get_type()) #define GST_WAVPACK_DEC(obj) \ @@ -48,23 +47,22 @@ struct _GstWavpackDec { GstElement element; - /*< private >*/ - GstPad *sinkpad; - GstPad *srcpad; + /*< private > */ + GstPad *sinkpad; + GstPad *srcpad; - WavpackContext *context; + WavpackContext *context; WavpackStreamReader *stream_reader; - read_id wv_id; + read_id wv_id; - GstSegment segment; /* used for clipping, TIME format */ + GstSegment segment; /* used for clipping, TIME format */ - guint sample_rate; - guint width; - guint depth; - guint channels; + gint sample_rate; + gint depth; + gint channels; - gint error_count; + gint error_count; }; struct _GstWavpackDecClass |