From 0723928e8bcd49ceaa41145756922f00991c7c88 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Mon, 27 Feb 2012 23:46:08 +0100 Subject: [PATCH] wavpackdec: determine depth from bytes per sample ... rather than from bits per sample, since spec states values are already left justified w.r.t. bits per sample but not w.r.t. bytes per sample (and so the latter determines the normalization, or indicated depth). --- ext/wavpack/gstwavpackdec.c | 4 ++-- ext/wavpack/gstwavpackenc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/wavpack/gstwavpackdec.c b/ext/wavpack/gstwavpackdec.c index 133b51b60a..365544b179 100644 --- a/ext/wavpack/gstwavpackdec.c +++ b/ext/wavpack/gstwavpackdec.c @@ -322,7 +322,7 @@ gst_wavpack_dec_handle_frame (GstAudioDecoder * bdec, GstBuffer * buf) format_changed = (dec->sample_rate != WavpackGetSampleRate (dec->context)) || (dec->channels != WavpackGetNumChannels (dec->context)) || - (dec->depth != WavpackGetBitsPerSample (dec->context)) || + (dec->depth != WavpackGetBytesPerSample (dec->context) * 8) || #ifdef WAVPACK_OLD_API (dec->channel_mask != dec->context->config.channel_mask); #else @@ -334,7 +334,7 @@ gst_wavpack_dec_handle_frame (GstAudioDecoder * bdec, GstBuffer * buf) dec->sample_rate = WavpackGetSampleRate (dec->context); dec->channels = WavpackGetNumChannels (dec->context); - dec->depth = WavpackGetBitsPerSample (dec->context); + dec->depth = WavpackGetBytesPerSample (dec->context) * 8; #ifdef WAVPACK_OLD_API channel_mask = dec->context->config.channel_mask; diff --git a/ext/wavpack/gstwavpackenc.c b/ext/wavpack/gstwavpackenc.c index e2e19d4d38..8595798f47 100644 --- a/ext/wavpack/gstwavpackenc.c +++ b/ext/wavpack/gstwavpackenc.c @@ -103,7 +103,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-wavpack, " "width = (int) [ 1, 32 ], " - "channels = (int) [ 1, 2 ], " + "channels = (int) [ 1, 8 ], " "rate = (int) [ 6000, 192000 ], " "framed = (boolean) TRUE") );