mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-02 21:48:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/wavpack/: Don't play audioconvert. As wavpack wants/outputs all samples with width==32 and depth=[1,32] accept th...

Browse source 
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.
This commit is contained in:
Sebastian Dröge 2007-03-30 04:50:11 +00:00
parent 365437cbc0
commit 14c0bebf4b
11 changed files with 173 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ChangeLog
View file

@ -1,3 +1,38 @@
2007-03-30 Sebastian Dröge <slomo@circular-chaos.org>
* 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.
2007-03-28 Edward Hervey <edward@fluendo.com> 2007-03-28 Edward Hervey <edward@fluendo.com>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_prepare_current_sample), * gst/qtdemux/qtdemux.c: (gst_qtdemux_prepare_current_sample),

6
ext/wavpack/gstwavpackcommon.h
View file

@ -28,9 +28,9 @@
typedef struct typedef struct
{ {
guint32 byte_length; guint32 byte_length;
guint8 *data; guint8 *data;
guint8 id; guint8 id;
} GstWavpackMetadata; } GstWavpackMetadata;
#define ID_UNIQUE 0x3f #define ID_UNIQUE 0x3f

106
ext/wavpack/gstwavpackdec.c
View file

@ -61,7 +61,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-wavpack, " GST_STATIC_CAPS ("audio/x-wavpack, "
"width = (int) { 8, 16, 24, 32 }, " "width = (int) [ 1, 32 ], "
"channels = (int) [ 1, 2 ], " "channels = (int) [ 1, 2 ], "
"rate = (int) [ 6000, 192000 ], " "framed = (boolean) true") "rate = (int) [ 6000, 192000 ], " "framed = (boolean) true")
); );
@ -70,19 +70,21 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw-int, " GST_STATIC_CAPS ("audio/x-raw-int, "
"width = (int) { 8, 16, 32 }, " "width = (int) 32, "
"depth = (int) [ 8, 32 ], " "depth = (int) [ 1, 32 ], "
"channels = (int) [ 1, 2 ], " "channels = (int) [ 1, 2 ], "
"rate = (int) [ 6000, 192000 ], " "rate = (int) [ 6000, 192000 ], "
"endianness = (int) BYTE_ORDER, " "signed = (boolean) true") "endianness = (int) BYTE_ORDER, " "signed = (boolean) true")
); );
static GstFlowReturn gst_wavpack_dec_chain (GstPad * pad, GstBuffer * buffer); static GstFlowReturn gst_wavpack_dec_chain (GstPad * pad, GstBuffer * buffer);
static gboolean gst_wavpack_dec_sink_set_caps (GstPad * pad, GstCaps * caps);
static gboolean gst_wavpack_dec_sink_event (GstPad * pad, GstEvent * event); static gboolean gst_wavpack_dec_sink_event (GstPad * pad, GstEvent * event);
static void gst_wavpack_dec_finalize (GObject * object); static void gst_wavpack_dec_finalize (GObject * object);
static GstStateChangeReturn gst_wavpack_dec_change_state (GstElement * element, static GstStateChangeReturn gst_wavpack_dec_change_state (GstElement * element,
GstStateChange transition); GstStateChange transition);
static gboolean gst_wavpack_dec_sink_event (GstPad * pad, GstEvent * event); static gboolean gst_wavpack_dec_sink_event (GstPad * pad, GstEvent * event);
static void gst_wavpack_dec_post_tags (GstWavpackDec * dec);
GST_BOILERPLATE (GstWavpackDec, gst_wavpack_dec, GstElement, GST_TYPE_ELEMENT); GST_BOILERPLATE (GstWavpackDec, gst_wavpack_dec, GstElement, GST_TYPE_ELEMENT);
@ -125,7 +127,6 @@ gst_wavpack_dec_reset (GstWavpackDec * dec)
dec->channels = 0; dec->channels = 0;
dec->sample_rate = 0; dec->sample_rate = 0;
dec->width = 0;
dec->depth = 0; dec->depth = 0;
gst_segment_init (&dec->segment, GST_FORMAT_UNDEFINED); gst_segment_init (&dec->segment, GST_FORMAT_UNDEFINED);
@ -137,6 +138,8 @@ gst_wavpack_dec_init (GstWavpackDec * dec, GstWavpackDecClass * gklass)
dec->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink"); dec->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
gst_pad_set_chain_function (dec->sinkpad, gst_pad_set_chain_function (dec->sinkpad,
GST_DEBUG_FUNCPTR (gst_wavpack_dec_chain)); GST_DEBUG_FUNCPTR (gst_wavpack_dec_chain));
gst_pad_set_setcaps_function (dec->sinkpad,
GST_DEBUG_FUNCPTR (gst_wavpack_dec_sink_set_caps));
gst_pad_set_event_function (dec->sinkpad, gst_pad_set_event_function (dec->sinkpad,
GST_DEBUG_FUNCPTR (gst_wavpack_dec_sink_event)); GST_DEBUG_FUNCPTR (gst_wavpack_dec_sink_event));
gst_element_add_pad (GST_ELEMENT (dec), dec->sinkpad); gst_element_add_pad (GST_ELEMENT (dec), dec->sinkpad);
@ -162,43 +165,40 @@ gst_wavpack_dec_finalize (GObject * object)
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
static void static gboolean
gst_wavpack_dec_format_samples (GstWavpackDec * dec, guint8 * out_buffer, gst_wavpack_dec_sink_set_caps (GstPad * pad, GstCaps * caps)
int32_t * samples, guint num_samples)
{ {
switch (dec->width) { GstWavpackDec *dec = GST_WAVPACK_DEC (gst_pad_get_parent (pad));
case 8:{ GstStructure *structure = gst_caps_get_structure (caps, 0);
gint8 *dst = (gint8 *) out_buffer;
gint8 *end = dst + (num_samples * dec->channels);
while (dst < end) { /* Check if we can set the caps here already */
*dst++ = (gint8) * samples++; if (gst_structure_get_int (structure, "channels", &dec->channels) &&
} gst_structure_get_int (structure, "rate", &dec->sample_rate) &&
break; gst_structure_get_int (structure, "width", &dec->depth)) {
} GstCaps *caps;
case 16:{
gint16 *dst = (gint16 *) out_buffer;
gint16 *end = dst + (num_samples * dec->channels);
while (dst < end) { caps = gst_caps_new_simple ("audio/x-raw-int",
*dst++ = (gint16) * samples++; "rate", G_TYPE_INT, dec->sample_rate,
} "channels", G_TYPE_INT, dec->channels,
break; "depth", G_TYPE_INT, dec->depth,
} "width", G_TYPE_INT, 32,
case 24: "endianness", G_TYPE_INT, G_BYTE_ORDER,
case 32:{ "signed", G_TYPE_BOOLEAN, TRUE, NULL);
gint32 *dst = (gint32 *) out_buffer;
gint32 *end = dst + (num_samples * dec->channels);
while (dst < end) { GST_DEBUG_OBJECT (dec, "setting caps %" GST_PTR_FORMAT, caps);
*dst++ = *samples++;
} /* should always succeed */
break; gst_pad_set_caps (dec->srcpad, caps);
} gst_caps_unref (caps);
default:
g_return_if_reached (); /* send GST_TAG_AUDIO_CODEC and GST_TAG_BITRATE tags before something
break; * is decoded or after the format has changed */
gst_wavpack_dec_post_tags (dec);
} }
gst_object_unref (dec);
return TRUE;
} }
static gboolean static gboolean
@ -220,7 +220,7 @@ gst_wavpack_dec_clip_outgoing_buffer (GstWavpackDec * dec, GstBuffer * buf)
GST_BUFFER_TIMESTAMP (buf) = cstart; GST_BUFFER_TIMESTAMP (buf) = cstart;
GST_BUFFER_DURATION (buf) -= diff; GST_BUFFER_DURATION (buf) -= diff;
diff = (dec->width / 8) * dec->channels diff = 4 * dec->channels
* GST_CLOCK_TIME_TO_FRAMES (diff, dec->sample_rate); * GST_CLOCK_TIME_TO_FRAMES (diff, dec->sample_rate);
GST_BUFFER_DATA (buf) += diff; GST_BUFFER_DATA (buf) += diff;
GST_BUFFER_SIZE (buf) -= diff; GST_BUFFER_SIZE (buf) -= diff;
@ -230,7 +230,7 @@ gst_wavpack_dec_clip_outgoing_buffer (GstWavpackDec * dec, GstBuffer * buf)
if (diff > 0) { if (diff > 0) {
GST_BUFFER_DURATION (buf) -= diff; GST_BUFFER_DURATION (buf) -= diff;
diff = (dec->width / 8) * dec->channels diff = 4 * dec->channels
* GST_CLOCK_TIME_TO_FRAMES (diff, dec->sample_rate); * GST_CLOCK_TIME_TO_FRAMES (diff, dec->sample_rate);
GST_BUFFER_SIZE (buf) -= diff; GST_BUFFER_SIZE (buf) -= diff;
} }
@ -243,7 +243,7 @@ gst_wavpack_dec_clip_outgoing_buffer (GstWavpackDec * dec, GstBuffer * buf)
} }
static void static void
gst_wavpack_dec_post_tags (GstWavpackDec * dec, WavpackHeader * wph) gst_wavpack_dec_post_tags (GstWavpackDec * dec)
{ {
GstTagList *list; GstTagList *list;
GstFormat format_time = GST_FORMAT_TIME, format_bytes = GST_FORMAT_BYTES; GstFormat format_time = GST_FORMAT_TIME, format_bytes = GST_FORMAT_BYTES;
@ -276,7 +276,6 @@ gst_wavpack_dec_chain (GstPad * pad, GstBuffer * buf)
GstBuffer *outbuf; GstBuffer *outbuf;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
WavpackHeader wph; WavpackHeader wph;
int32_t *unpack_buf = NULL;
int32_t decoded, unpacked_size; int32_t decoded, unpacked_size;
gboolean format_changed; gboolean format_changed;
@ -331,14 +330,12 @@ gst_wavpack_dec_chain (GstPad * pad, GstBuffer * buf)
dec->sample_rate = WavpackGetSampleRate (dec->context); dec->sample_rate = WavpackGetSampleRate (dec->context);
dec->channels = WavpackGetNumChannels (dec->context); dec->channels = WavpackGetNumChannels (dec->context);
dec->depth = WavpackGetBitsPerSample (dec->context); dec->depth = WavpackGetBitsPerSample (dec->context);
dec->width =
(GST_ROUND_UP_8 (dec->depth) == 24) ? 32 : GST_ROUND_UP_8 (dec->depth);
caps = gst_caps_new_simple ("audio/x-raw-int", caps = gst_caps_new_simple ("audio/x-raw-int",
"rate", G_TYPE_INT, dec->sample_rate, "rate", G_TYPE_INT, dec->sample_rate,
"channels", G_TYPE_INT, dec->channels, "channels", G_TYPE_INT, dec->channels,
"depth", G_TYPE_INT, dec->depth, "depth", G_TYPE_INT, dec->depth,
"width", G_TYPE_INT, dec->width, "width", G_TYPE_INT, 32,
"endianness", G_TYPE_INT, G_BYTE_ORDER, "endianness", G_TYPE_INT, G_BYTE_ORDER,
"signed", G_TYPE_BOOLEAN, TRUE, NULL); "signed", G_TYPE_BOOLEAN, TRUE, NULL);
@ -350,27 +347,25 @@ gst_wavpack_dec_chain (GstPad * pad, GstBuffer * buf)
/* send GST_TAG_AUDIO_CODEC and GST_TAG_BITRATE tags before something /* send GST_TAG_AUDIO_CODEC and GST_TAG_BITRATE tags before something
* is decoded or after the format has changed */ * is decoded or after the format has changed */
gst_wavpack_dec_post_tags (dec, &wph); gst_wavpack_dec_post_tags (dec);
} }
/* decode */
unpack_buf = g_new (int32_t, wph.block_samples * dec->channels);
decoded = WavpackUnpackSamples (dec->context, unpack_buf, wph.block_samples);
if (decoded != wph.block_samples)
goto decode_error;
/* alloc output buffer */ /* alloc output buffer */
unpacked_size = wph.block_samples * (dec->width / 8) * dec->channels; unpacked_size = 4 * wph.block_samples * dec->channels;
ret = gst_pad_alloc_buffer (dec->srcpad, GST_BUFFER_OFFSET (buf), ret = gst_pad_alloc_buffer (dec->srcpad, GST_BUFFER_OFFSET (buf),
unpacked_size, GST_PAD_CAPS (dec->srcpad), &outbuf); unpacked_size, GST_PAD_CAPS (dec->srcpad), &outbuf);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
goto out; goto out;
/* put samples into the output buffer */
gst_wavpack_dec_format_samples (dec, GST_BUFFER_DATA (outbuf),
unpack_buf, wph.block_samples);
gst_buffer_stamp (outbuf, buf); gst_buffer_stamp (outbuf, buf);
/* decode */
decoded = WavpackUnpackSamples (dec->context,
(int32_t *) GST_BUFFER_DATA (outbuf), wph.block_samples);
if (decoded != wph.block_samples)
goto decode_error;
if (gst_wavpack_dec_clip_outgoing_buffer (dec, outbuf)) { if (gst_wavpack_dec_clip_outgoing_buffer (dec, outbuf)) {
GST_LOG_OBJECT (dec, "pushing buffer with time %" GST_TIME_FORMAT, GST_LOG_OBJECT (dec, "pushing buffer with time %" GST_TIME_FORMAT,
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf))); GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)));
@ -385,7 +380,6 @@ out:
GST_DEBUG_OBJECT (dec, "flow: %s", gst_flow_get_name (ret)); GST_DEBUG_OBJECT (dec, "flow: %s", gst_flow_get_name (ret));
} }
g_free (unpack_buf);
gst_buffer_unref (buf); gst_buffer_unref (buf);
return ret; return ret;
@ -407,7 +401,7 @@ decode_error:
{ {
GST_ELEMENT_ERROR (dec, STREAM, DECODE, (NULL), GST_ELEMENT_ERROR (dec, STREAM, DECODE, (NULL),
("Failed to decode wavpack stream")); ("Failed to decode wavpack stream"));
g_free (unpack_buf); gst_buffer_unref (outbuf);
gst_buffer_unref (buf); gst_buffer_unref (buf);
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }

22
ext/wavpack/gstwavpackdec.h
View file

@ -30,7 +30,6 @@
#include "gstwavpackstreamreader.h" #include "gstwavpackstreamreader.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_WAVPACK_DEC \ #define GST_TYPE_WAVPACK_DEC \
(gst_wavpack_dec_get_type()) (gst_wavpack_dec_get_type())
#define GST_WAVPACK_DEC(obj) \ #define GST_WAVPACK_DEC(obj) \
@ -48,23 +47,22 @@ struct _GstWavpackDec
{ {
GstElement element; GstElement element;
/*< private >*/ /*< private > */
GstPad *sinkpad; GstPad *sinkpad;
GstPad *srcpad; GstPad *srcpad;
WavpackContext *context; WavpackContext *context;
WavpackStreamReader *stream_reader; 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; gint sample_rate;
guint width; gint depth;
guint depth; gint channels;
guint channels;
gint error_count; gint error_count;
}; };
struct _GstWavpackDecClass struct _GstWavpackDecClass

98
ext/wavpack/gstwavpackenc.c
View file

@ -108,26 +108,8 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw-int, " GST_STATIC_CAPS ("audio/x-raw-int, "
"width = (int) 32, " "width = (int) 32, "
"depth = (int) 32, " "depth = (int) [ 1, 32], "
"endianness = (int) LITTLE_ENDIAN, " "endianness = (int) BYTE_ORDER, "
"channels = (int) [ 1, 2 ], "
"rate = (int) [ 6000, 192000 ]," "signed = (boolean) TRUE;"
"audio/x-raw-int, "
"width = (int) 24, "
"depth = (int) 24, "
"endianness = (int) LITTLE_ENDIAN, "
"channels = (int) [ 1, 2 ], "
"rate = (int) [ 6000, 192000 ]," "signed = (boolean) TRUE;"
"audio/x-raw-int, "
"width = (int) 16, "
"depth = (int) 16, "
"endianness = (int) LITTLE_ENDIAN, "
"channels = (int) [ 1, 2 ], "
"rate = (int) [ 6000, 192000 ]," "signed = (boolean) TRUE;"
"audio/x-raw-int, "
"width = (int) 8, "
"depth = (int) 8, "
"endianness = (int) LITTLE_ENDIAN, "
"channels = (int) [ 1, 2 ], " "channels = (int) [ 1, 2 ], "
"rate = (int) [ 6000, 192000 ]," "signed = (boolean) TRUE") "rate = (int) [ 6000, 192000 ]," "signed = (boolean) TRUE")
); );
@ -136,7 +118,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-wavpack, " GST_STATIC_CAPS ("audio/x-wavpack, "
"width = (int) { 8, 16, 24, 32 }, " "width = (int) [ 1, 32 ], "
"channels = (int) [ 1, 2 ], " "channels = (int) [ 1, 2 ], "
"rate = (int) [ 6000, 192000 ], " "framed = (boolean) TRUE") "rate = (int) [ 6000, 192000 ], " "framed = (boolean) TRUE")
); );
@ -343,7 +325,7 @@ gst_wavpack_enc_reset (GstWavpackEnc * enc)
/* reset stream information */ /* reset stream information */
enc->samplerate = 0; enc->samplerate = 0;
enc->width = 0; enc->depth = 0;
enc->channels = 0; enc->channels = 0;
} }
@ -389,14 +371,13 @@ gst_wavpack_enc_sink_set_caps (GstPad * pad, GstCaps * caps)
{ {
GstWavpackEnc *enc = GST_WAVPACK_ENC (gst_pad_get_parent (pad)); GstWavpackEnc *enc = GST_WAVPACK_ENC (gst_pad_get_parent (pad));
GstStructure *structure = gst_caps_get_structure (caps, 0); GstStructure *structure = gst_caps_get_structure (caps, 0);
int depth = 0;
/* FIXME: Workaround for bug #421543: calls gst_pad_accept_caps() */
/* check caps and put relevant parts into our object attributes */ /* check caps and put relevant parts into our object attributes */
if (!gst_structure_get_int (structure, "channels", &enc->channels) || if (!gst_pad_accept_caps (pad, caps) ||
!gst_structure_get_int (structure, "channels", &enc->channels) ||
!gst_structure_get_int (structure, "rate", &enc->samplerate) || !gst_structure_get_int (structure, "rate", &enc->samplerate) ||
!gst_structure_get_int (structure, "width", &enc->width) || !gst_structure_get_int (structure, "depth", &enc->depth)) {
!(gst_structure_get_int (structure, "depth", &depth) ||
depth != enc->width)) {
GST_ELEMENT_ERROR (enc, LIBRARY, INIT, (NULL), GST_ELEMENT_ERROR (enc, LIBRARY, INIT, (NULL),
("got invalid caps: %" GST_PTR_FORMAT, caps)); ("got invalid caps: %" GST_PTR_FORMAT, caps));
gst_object_unref (enc); gst_object_unref (enc);
@ -407,7 +388,7 @@ gst_wavpack_enc_sink_set_caps (GstPad * pad, GstCaps * caps)
caps = gst_caps_new_simple ("audio/x-wavpack", caps = gst_caps_new_simple ("audio/x-wavpack",
"channels", G_TYPE_INT, enc->channels, "channels", G_TYPE_INT, enc->channels,
"rate", G_TYPE_INT, enc->samplerate, "rate", G_TYPE_INT, enc->samplerate,
"width", G_TYPE_INT, enc->width, "framed", G_TYPE_BOOLEAN, TRUE, NULL); "width", G_TYPE_INT, enc->depth, "framed", G_TYPE_BOOLEAN, TRUE, NULL);
if (!gst_pad_set_caps (enc->srcpad, caps)) { if (!gst_pad_set_caps (enc->srcpad, caps)) {
GST_ELEMENT_ERROR (enc, LIBRARY, INIT, (NULL), GST_ELEMENT_ERROR (enc, LIBRARY, INIT, (NULL),
@ -428,8 +409,8 @@ gst_wavpack_enc_set_wp_config (GstWavpackEnc * enc)
{ {
enc->wp_config = g_new0 (WavpackConfig, 1); enc->wp_config = g_new0 (WavpackConfig, 1);
/* set general stream informations in the WavpackConfig */ /* set general stream informations in the WavpackConfig */
enc->wp_config->bytes_per_sample = (enc->width + 7) >> 3; enc->wp_config->bytes_per_sample = GST_ROUND_UP_8 (enc->depth) / 8;
enc->wp_config->bits_per_sample = enc->width; enc->wp_config->bits_per_sample = enc->depth;
enc->wp_config->num_channels = enc->channels; enc->wp_config->num_channels = enc->channels;
/* TODO: handle more than 2 channels correctly! */ /* TODO: handle more than 2 channels correctly! */
@ -540,46 +521,6 @@ gst_wavpack_enc_set_wp_config (GstWavpackEnc * enc)
} }
} }
static int32_t *
gst_wavpack_enc_format_samples (const uchar * src_data, uint32_t sample_count,
guint width)
{
int32_t *data = g_new0 (int32_t, sample_count);
/* put all samples into an int32_t*, no matter what
* width we have and convert them from little endian
* to host byte order */
switch (width) {
int i;
case 8:
for (i = 0; i < sample_count; i++)
data[i] = (int32_t) (int8_t) src_data[i];
break;
case 16:
for (i = 0; i < sample_count; i++)
data[i] = (int32_t) src_data[2 * i]
| ((int32_t) (int8_t) src_data[2 * i + 1] << 8);
break;
case 24:
for (i = 0; i < sample_count; i++)
data[i] = (int32_t) src_data[3 * i]
| ((int32_t) src_data[3 * i + 1] << 8)
| ((int32_t) (int8_t) src_data[3 * i + 2] << 16);
break;
case 32:
for (i = 0; i < sample_count; i++)
data[i] = (int32_t) src_data[4 * i]
| ((int32_t) src_data[4 * i + 1] << 8)
| ((int32_t) src_data[4 * i + 2] << 16)
| ((int32_t) (int8_t) src_data[4 * i + 3] << 24);
break;
}
return data;
}
static int static int
gst_wavpack_enc_push_block (void *id, void *data, int32_t count) gst_wavpack_enc_push_block (void *id, void *data, int32_t count)
{ {
@ -663,8 +604,7 @@ static GstFlowReturn
gst_wavpack_enc_chain (GstPad * pad, GstBuffer * buf) gst_wavpack_enc_chain (GstPad * pad, GstBuffer * buf)
{ {
GstWavpackEnc *enc = GST_WAVPACK_ENC (gst_pad_get_parent (pad)); GstWavpackEnc *enc = GST_WAVPACK_ENC (gst_pad_get_parent (pad));
uint32_t sample_count = GST_BUFFER_SIZE (buf) / ((enc->width + 7) >> 3); uint32_t sample_count = GST_BUFFER_SIZE (buf) / 4;
int32_t *data;
GstFlowReturn ret; GstFlowReturn ret;
/* reset the last returns to GST_FLOW_OK. This is only set to something else /* reset the last returns to GST_FLOW_OK. This is only set to something else
@ -712,17 +652,9 @@ gst_wavpack_enc_chain (GstPad * pad, GstBuffer * buf)
MD5Update (enc->md5_context, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); MD5Update (enc->md5_context, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
} }
/* put all samples into an int32_t*, no matter what
* width we have and convert them from little endian
* to host byte order */
data =
gst_wavpack_enc_format_samples (GST_BUFFER_DATA (buf), sample_count,
enc->width);
gst_buffer_unref (buf);
/* encode and handle return values from encoding */ /* encode and handle return values from encoding */
if (WavpackPackSamples (enc->wp_context, data, sample_count / enc->channels)) { if (WavpackPackSamples (enc->wp_context, (int32_t *) GST_BUFFER_DATA (buf),
sample_count / enc->channels)) {
GST_DEBUG ("encoding samples successful"); GST_DEBUG ("encoding samples successful");
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
} else { } else {
@ -745,7 +677,7 @@ gst_wavpack_enc_chain (GstPad * pad, GstBuffer * buf)
} }
} }
g_free (data); gst_buffer_unref (buf);
gst_object_unref (enc); gst_object_unref (enc);
return ret; return ret;
} }

7
ext/wavpack/gstwavpackenc.h
View file

@ -28,7 +28,6 @@
#include "md5.h" #include "md5.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_WAVPACK_ENC \ #define GST_TYPE_WAVPACK_ENC \
(gst_wavpack_enc_get_type()) (gst_wavpack_enc_get_type())
#define GST_WAVPACK_ENC(obj) \ #define GST_WAVPACK_ENC(obj) \
@ -39,7 +38,6 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_WAVPACK_ENC)) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_WAVPACK_ENC))
#define GST_IS_WAVPACK_ENC_CLASS(klass) \ #define GST_IS_WAVPACK_ENC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_WAVPACK_ENC)) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_WAVPACK_ENC))
typedef struct _GstWavpackEnc GstWavpackEnc; typedef struct _GstWavpackEnc GstWavpackEnc;
typedef struct _GstWavpackEncClass GstWavpackEncClass; typedef struct _GstWavpackEncClass GstWavpackEncClass;
@ -54,7 +52,7 @@ struct _GstWavpackEnc
{ {
GstElement element; GstElement element;
/*< private >*/ /*< private > */
GstPad *sinkpad, *srcpad; GstPad *sinkpad, *srcpad;
GstPad *wvcsrcpad; GstPad *wvcsrcpad;
@ -66,7 +64,7 @@ struct _GstWavpackEnc
gint samplerate; gint samplerate;
gint channels; gint channels;
gint width; gint depth;
GstWavpackEncWriteID wv_id; GstWavpackEncWriteID wv_id;
GstWavpackEncWriteID wvc_id; GstWavpackEncWriteID wvc_id;
@ -93,5 +91,4 @@ GType gst_wavpack_enc_get_type (void);
gboolean gst_wavpack_enc_plugin_init (GstPlugin * plugin); gboolean gst_wavpack_enc_plugin_init (GstPlugin * plugin);
G_END_DECLS G_END_DECLS
#endif /* __GST_WAVPACK_ENC_H__ */ #endif /* __GST_WAVPACK_ENC_H__ */

2
ext/wavpack/gstwavpackparse.c
View file

@ -65,7 +65,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_SOMETIMES, GST_PAD_SOMETIMES,
GST_STATIC_CAPS ("audio/x-wavpack, " GST_STATIC_CAPS ("audio/x-wavpack, "
"width = (int) { 8, 16, 24, 32 }, " "width = (int) [ 1, 32 ], "
"channels = (int) [ 1, 2 ], " "channels = (int) [ 1, 2 ], "
"rate = (int) [ 6000, 192000 ], " "framed = (boolean) true") "rate = (int) [ 6000, 192000 ], " "framed = (boolean) true")
); );

52
ext/wavpack/gstwavpackparse.h
View file

@ -26,7 +26,6 @@
#include <gst/base/gstadapter.h> #include <gst/base/gstadapter.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_WAVPACK_PARSE \ #define GST_TYPE_WAVPACK_PARSE \
(gst_wavpack_parse_get_type()) (gst_wavpack_parse_get_type())
#define GST_WAVPACK_PARSE(obj) \ #define GST_WAVPACK_PARSE(obj) \
@ -37,58 +36,57 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_WAVPACK_PARSE)) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_WAVPACK_PARSE))
#define GST_IS_WAVPACK_PARSE_CLASS(klass) \ #define GST_IS_WAVPACK_PARSE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_WAVPACK_PARSE)) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_WAVPACK_PARSE))
typedef struct _GstWavpackParse GstWavpackParse;
typedef struct _GstWavpackParse GstWavpackParse; typedef struct _GstWavpackParseClass GstWavpackParseClass;
typedef struct _GstWavpackParseClass GstWavpackParseClass;
typedef struct _GstWavpackParseIndexEntry GstWavpackParseIndexEntry; typedef struct _GstWavpackParseIndexEntry GstWavpackParseIndexEntry;
struct _GstWavpackParseIndexEntry { struct _GstWavpackParseIndexEntry
gint64 byte_offset; /* byte offset of this chunk */ {
gint64 sample_offset; /* first sample in this chunk */ gint64 byte_offset; /* byte offset of this chunk */
gint64 sample_offset_end; /* first sample in next chunk */ gint64 sample_offset; /* first sample in this chunk */
gint64 sample_offset_end; /* first sample in next chunk */
}; };
struct _GstWavpackParse struct _GstWavpackParse
{ {
GstElement element; GstElement element;
/*< private >*/ /*< private > */
GstPad *sinkpad; GstPad *sinkpad;
GstPad *srcpad; GstPad *srcpad;
guint samplerate;
guint channels;
guint total_samples;
gboolean need_newsegment; guint samplerate;
guint channels;
guint total_samples;
gint64 current_offset; /* byte offset on sink pad */ gboolean need_newsegment;
gint64 upstream_length; /* length of file in bytes */
GstSegment segment; /* the currently configured segment, in gint64 current_offset; /* byte offset on sink pad */
* samples/audio frames (DEFAULT format) */ gint64 upstream_length; /* length of file in bytes */
GstAdapter *adapter; /* when operating chain-based, otherwise NULL */ GstSegment segment; /* the currently configured segment, in
* samples/audio frames (DEFAULT format) */
GstAdapter *adapter; /* when operating chain-based, otherwise NULL */
/* Array of GstWavpackParseIndexEntry structs, mapping known /* Array of GstWavpackParseIndexEntry structs, mapping known
* sample offsets to byte offsets. Is kept increasing without * sample offsets to byte offsets. Is kept increasing without
* gaps (ie. append only and consecutive entries must always * gaps (ie. append only and consecutive entries must always
* map to consecutive chunks in the file). */ * map to consecutive chunks in the file). */
GArray *entries; GArray *entries;
/* Queued events (e.g. tag events we receive before we create the src pad) */ /* Queued events (e.g. tag events we receive before we create the src pad) */
GList *queued_events; /* STREAM_LOCK */ GList *queued_events; /* STREAM_LOCK */
}; };
struct _GstWavpackParseClass struct _GstWavpackParseClass
{ {
GstElementClass parent; GstElementClass parent;
}; };
GType gst_wavpack_parse_get_type (void); GType gst_wavpack_parse_get_type (void);
gboolean gst_wavpack_parse_plugin_init (GstPlugin *plugin); gboolean gst_wavpack_parse_plugin_init (GstPlugin * plugin);
G_END_DECLS G_END_DECLS
#endif /* __GST_WAVPACK_PARSE_H__ */ #endif /* __GST_WAVPACK_PARSE_H__ */

16
tests/check/elements/wavpackdec.c
View file

@ -51,7 +51,13 @@ guint8 test_frame[] = {
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS_ANY); GST_STATIC_CAPS ("audio/x-raw-int, "
"width = (int) 32, "
"depth = (int) 16, "
"channels = (int) 1, "
"rate = (int) 44100, "
"endianness = (int) BYTE_ORDER, " "signed = (boolean) true")
);
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
@ -117,11 +123,11 @@ GST_START_TEST (test_decode_frame)
outbuffer = GST_BUFFER (buffers->data); outbuffer = GST_BUFFER (buffers->data);
fail_if (outbuffer == NULL); fail_if (outbuffer == NULL);
/* uncompressed data should be 51200 bytes */ /* uncompressed data should be 102400 bytes */
fail_unless_equals_int (GST_BUFFER_SIZE (outbuffer), 51200); fail_unless_equals_int (GST_BUFFER_SIZE (outbuffer), 102400);
/* and all 51200 bytes must be 0, i.e. silence */ /* and all 102400 bytes must be 0, i.e. silence */
for (i = 0; i < 51200; i++) for (i = 0; i < 102400; i++)
fail_unless_equals_int (GST_BUFFER_DATA (outbuffer)[i], 0); fail_unless_equals_int (GST_BUFFER_DATA (outbuffer)[i], 0);
ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 1); ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 1);

19
tests/check/elements/wavpackenc.c
View file

@ -31,7 +31,7 @@ static GstPad *mysrcpad, *mysinkpad;
static GstBus *bus; static GstBus *bus;
#define RAW_CAPS_STRING "audio/x-raw-int, " \ #define RAW_CAPS_STRING "audio/x-raw-int, " \
"width = (int) 16, " \ "width = (int) 32, " \
"depth = (int) 16, " \ "depth = (int) 16, " \
"channels = (int) 1, " \ "channels = (int) 1, " \
"rate = (int) 44100, " \ "rate = (int) 44100, " \
@ -47,11 +47,20 @@ static GstBus *bus;
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS_ANY); GST_STATIC_CAPS ("audio/x-wavpack, "
"width = (int) 16, "
"channels = (int) 1, "
"rate = (int) 44100, " "framed = (boolean) true"));
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS_ANY); GST_STATIC_CAPS ("audio/x-raw-int, "
"width = (int) 32, "
"depth = (int) 16, "
"channels = (int) 1, "
"rate = (int) 44100, "
"endianness = (int) BYTE_ORDER, " "signed = (boolean) true"));
GstElement * GstElement *
setup_wavpackenc () setup_wavpackenc ()
@ -126,8 +135,8 @@ GST_START_TEST (test_encode_silence)
fail_unless_equals_int (GST_BUFFER_TIMESTAMP (outbuffer), 0); fail_unless_equals_int (GST_BUFFER_TIMESTAMP (outbuffer), 0);
fail_unless_equals_int (GST_BUFFER_OFFSET (outbuffer), 0); fail_unless_equals_int (GST_BUFFER_OFFSET (outbuffer), 0);
fail_unless_equals_int (GST_BUFFER_DURATION (outbuffer), 11337868); fail_unless_equals_int (GST_BUFFER_DURATION (outbuffer), 5668934);
fail_unless_equals_int (GST_BUFFER_OFFSET_END (outbuffer), 500); fail_unless_equals_int (GST_BUFFER_OFFSET_END (outbuffer), 250);
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), "wvpk", 4) == 0, fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), "wvpk", 4) == 0,
"Failed to encode to valid Wavpack frames"); "Failed to encode to valid Wavpack frames");

8
tests/check/elements/wavpackparse.c
View file

@ -59,7 +59,11 @@ guint8 test_file[] = {
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS_ANY); GST_STATIC_CAPS ("audio/x-wavpack, "
"width = (int) 16, "
"channels = (int) 1, "
"rate = (int) 44100, " "framed = (boolean) TRUE"));
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
@ -175,11 +179,13 @@ GST_START_TEST (test_parsing_valid_frames)
case 0:{ case 0:{
fail_unless_equals_int (GST_BUFFER_TIMESTAMP (outbuffer), 0); fail_unless_equals_int (GST_BUFFER_TIMESTAMP (outbuffer), 0);
fail_unless_equals_int (GST_BUFFER_OFFSET (outbuffer), 0); fail_unless_equals_int (GST_BUFFER_OFFSET (outbuffer), 0);
fail_unless_equals_int (GST_BUFFER_OFFSET_END (outbuffer), 25600);
break; break;
} }
case 1:{ case 1:{
fail_unless_equals_int (GST_BUFFER_TIMESTAMP (outbuffer), 580498866); fail_unless_equals_int (GST_BUFFER_TIMESTAMP (outbuffer), 580498866);
fail_unless_equals_int (GST_BUFFER_OFFSET (outbuffer), 25600); fail_unless_equals_int (GST_BUFFER_OFFSET (outbuffer), 25600);
fail_unless_equals_int (GST_BUFFER_OFFSET_END (outbuffer), 51200);
break; break;
} }
} }