From 72bc1ba4ba1d799bf0439f834ef77f8a582a2929 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 18 Jul 2006 14:08:06 +0000 Subject: [PATCH] configure.ac: Check for wavpack version and define WAVPACK_OLD_API if necessary. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Original commit message from CVS: Patch by: Sebastian Dröge * configure.ac: Check for wavpack version and define WAVPACK_OLD_API if necessary. * ext/wavpack/Makefile.am: * ext/wavpack/gstwavpackcommon.c: (gst_wavpack_read_header), (gst_wavpack_read_metadata): * ext/wavpack/gstwavpackcommon.h: * ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_base_init), (gst_wavpack_dec_class_init), (gst_wavpack_dec_init), (gst_wavpack_dec_finalize), (gst_wavpack_dec_format_samples), (gst_wavpack_dec_clip_outgoing_buffer), (gst_wavpack_dec_chain), (gst_wavpack_dec_sink_event), (gst_wavpack_dec_change_state), (gst_wavpack_dec_request_new_pad), (gst_wavpack_dec_plugin_init): * ext/wavpack/gstwavpackdec.h: * ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_class_init), (gst_wavpack_enc_init), (gst_wavpack_enc_finalize), (gst_wavpack_enc_set_wp_config): * ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_base_init), (gst_wavpack_parse_finalize), (gst_wavpack_parse_class_init), (gst_wavpack_parse_index_get_entry_from_sample), (gst_wavpack_parse_scan_to_find_sample), (gst_wavpack_parse_handle_seek_event), (gst_wavpack_parse_create_src_pad): * ext/wavpack/gstwavpackstreamreader.c: * ext/wavpack/gstwavpackstreamreader.h: Port to new/official wavpack API, don't use API that was exported in wavpack header files and in the lib but meant to be private, at least not for recent wavpack versions; misc. 'cleanups' (#347443). --- ext/wavpack/Makefile.am | 6 +- ext/wavpack/gstwavpackcommon.c | 87 +++++- ext/wavpack/gstwavpackcommon.h | 65 ++++ ext/wavpack/gstwavpackdec.c | 559 +++++++++++++++++++++++------------ ext/wavpack/gstwavpackdec.h | 44 ++- ext/wavpack/gstwavpackenc.c | 47 +-- ext/wavpack/gstwavpackparse.c | 75 +++-- ext/wavpack/gstwavpackstreamreader.c | 106 +++++++ ext/wavpack/gstwavpackstreamreader.h | 36 +++ 9 files changed, 761 insertions(+), 264 deletions(-) create mode 100644 ext/wavpack/gstwavpackstreamreader.c create mode 100644 ext/wavpack/gstwavpackstreamreader.h diff --git a/ext/wavpack/Makefile.am b/ext/wavpack/Makefile.am index 9220fd7..241e4dc 100644 --- a/ext/wavpack/Makefile.am +++ b/ext/wavpack/Makefile.am @@ -7,10 +7,11 @@ libgstwavpack_la_SOURCES = \ gstwavpackparse.c \ gstwavpackdec.c \ gstwavpackenc.c \ + gstwavpackstreamreader.c \ md5.c -libgstwavpack_la_CFLAGS = $(GST_CFLAGS) $(WAVPACK_CFLAGS) -libgstwavpack_la_LIBADD = $(GST_LIBS) $(WAVPACK_LIBS) +libgstwavpack_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(WAVPACK_CFLAGS) +libgstwavpack_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(WAVPACK_LIBS) libgstwavpack_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = \ @@ -18,5 +19,6 @@ noinst_HEADERS = \ gstwavpackdec.h \ gstwavpackenc.h \ gstwavpackcommon.h \ + gstwavpackstreamreader.h \ md5.h diff --git a/ext/wavpack/gstwavpackcommon.c b/ext/wavpack/gstwavpackcommon.c index 61c8add..0272fdf 100644 --- a/ext/wavpack/gstwavpackcommon.c +++ b/ext/wavpack/gstwavpackcommon.c @@ -1,3 +1,30 @@ +/* GStreamer Wavpack plugin + * Copyright (c) 2005 Arwed v. Merkatz + * Copyright (c) 1998 - 2005 Conifer Software + * Copyright (c) 2006 Sebastian Dröge + * + * gstwavpackcommon.c: common helper functions + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "gstwavpackcommon.h" #include @@ -5,10 +32,64 @@ gboolean gst_wavpack_read_header (WavpackHeader * header, guint8 * buf) { g_memmove (header, buf, sizeof (WavpackHeader)); + +#ifndef WAVPACK_OLD_API + WavpackLittleEndianToNative (header, WavpackHeaderFormat); +#else little_endian_to_native (header, WavpackHeaderFormat); +#endif + + return (memcmp (header->ckID, "wvpk", 4) == 0); +} - if (strncmp (header->ckID, "wvpk", 4)) +/* inspired by the original one in wavpack */ +gboolean +gst_wavpack_read_metadata (GstWavpackMetadata * wpmd, guint8 * header_data, + guint8 ** p_data) +{ + WavpackHeader hdr; + guint8 *end; + + gst_wavpack_read_header (&hdr, header_data); + end = header_data + hdr.ckSize + 8; + + if (end - *p_data < 2) return FALSE; - else - return TRUE; + + wpmd->id = GST_READ_UINT8 (*p_data); + wpmd->byte_length = 2 * (guint) GST_READ_UINT8 (*p_data + 1); + + *p_data += 2; + + if ((wpmd->id & ID_LARGE) == ID_LARGE) { + guint extra; + + wpmd->id &= ~ID_LARGE; + + if (end - *p_data < 2) + return FALSE; + + extra = GST_READ_UINT16_LE (*p_data); + wpmd->byte_length += (extra << 9); + *p_data += 2; + } + + if ((wpmd->id & ID_ODD_SIZE) == ID_ODD_SIZE) { + wpmd->id &= ~ID_ODD_SIZE; + --wpmd->byte_length; + } + + if (wpmd->byte_length > 0) { + if (end - *p_data < wpmd->byte_length + (wpmd->byte_length & 1)) { + wpmd->data = NULL; + return FALSE; + } + + wpmd->data = *p_data; + *p_data += wpmd->byte_length + (wpmd->byte_length & 1); + } else { + wpmd->data = NULL; + } + + return TRUE; } diff --git a/ext/wavpack/gstwavpackcommon.h b/ext/wavpack/gstwavpackcommon.h index e7fb693..cc654a8 100644 --- a/ext/wavpack/gstwavpackcommon.h +++ b/ext/wavpack/gstwavpackcommon.h @@ -1,4 +1,69 @@ +/* GStreamer Wavpack plugin + * Copyright (c) 2005 Arwed v. Merkatz + * Copyright (c) 2006 Sebastian Dröge + * + * gstwavpackcommon.h: common helper functions + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_WAVPACK_COMMON_H__ +#define __GST_WAVPACK_COMMON_H__ + #include #include +typedef struct +{ + guint32 byte_length; + guint8 *data; + guint8 id; +} GstWavpackMetadata; + +#define ID_UNIQUE 0x3f +#define ID_OPTIONAL_DATA 0x20 +#define ID_ODD_SIZE 0x40 +#define ID_LARGE 0x80 + +#define ID_DUMMY 0x0 +#define ID_ENCODER_INFO 0x1 +#define ID_DECORR_TERMS 0x2 +#define ID_DECORR_WEIGHTS 0x3 +#define ID_DECORR_SAMPLES 0x4 +#define ID_ENTROPY_VARS 0x5 +#define ID_HYBRID_PROFILE 0x6 +#define ID_SHAPING_WEIGHTS 0x7 +#define ID_FLOAT_INFO 0x8 +#define ID_INT32_INFO 0x9 +#define ID_WV_BITSTREAM 0xa +#define ID_WVC_BITSTREAM 0xb +#define ID_WVX_BITSTREAM 0xc +#define ID_CHANNEL_INFO 0xd + +#define ID_RIFF_HEADER (ID_OPTIONAL_DATA | 0x1) +#define ID_RIFF_TRAILER (ID_OPTIONAL_DATA | 0x2) +#define ID_REPLAY_GAIN (ID_OPTIONAL_DATA | 0x3) +#define ID_CUESHEET (ID_OPTIONAL_DATA | 0x4) +#define ID_CONFIG_BLOCK (ID_OPTIONAL_DATA | 0x5) +#define ID_MD5_CHECKSUM (ID_OPTIONAL_DATA | 0x6) +#define ID_SAMPLE_RATE (ID_OPTIONAL_DATA | 0x7) + + gboolean gst_wavpack_read_header (WavpackHeader * header, guint8 * buf); +gboolean gst_wavpack_read_metadata (GstWavpackMetadata * meta, + guint8 * header_data, guint8 ** p_data); + +#endif diff --git a/ext/wavpack/gstwavpackdec.c b/ext/wavpack/gstwavpackdec.c index cfd601b..16ee31b 100644 --- a/ext/wavpack/gstwavpackdec.c +++ b/ext/wavpack/gstwavpackdec.c @@ -1,5 +1,7 @@ /* GStreamer Wavpack plugin - * (c) 2005 Arwed v. Merkatz + * Copyright (c) 2005 Arwed v. Merkatz + * Copyright (c) 2006 Edward Hervey + * Copyright (c) 2006 Sebastian Dröge * * gstwavpackdec.c: raw Wavpack bitstream decoder * @@ -20,6 +22,7 @@ */ #include +#include #include #include @@ -27,6 +30,10 @@ #include #include "gstwavpackdec.h" #include "gstwavpackcommon.h" +#include "gstwavpackstreamreader.h" + + +#define WAVPACK_DEC_MAX_ERRORS 16 GST_DEBUG_CATEGORY_STATIC (gst_wavpack_dec_debug); #define GST_CAT_DEFAULT gst_wavpack_dec_debug @@ -36,16 +43,18 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-wavpack, " "width = (int) { 8, 16, 24, 32 }, " - "channels = (int) { 1, 2 }, " + "channels = (int) [ 1, 2 ], " "rate = (int) [ 6000, 192000 ], " "framed = (boolean) true") ); +#if 0 static GstStaticPadTemplate wvc_sink_factory = GST_STATIC_PAD_TEMPLATE ("wvcsink", GST_PAD_SINK, GST_PAD_REQUEST, GST_STATIC_CAPS ("audio/x-wavpack-correction, " "framed = (boolean) true") ); +#endif static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -53,66 +62,24 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_CAPS ("audio/x-raw-int, " "width = (int) { 8, 16, 24, 32 }, " "depth = (int) { 8, 16, 24, 32 }, " - "channels = (int) { 1, 2 }, " + "channels = (int) [ 1, 2 ], " "rate = (int) [ 6000, 192000 ], " "endianness = (int) LITTLE_ENDIAN, " "signed = (boolean) true") -/* - "audio/x-raw-float, " - "width = (int) 32, " - "channels = (int) { 1, 2 }, " - "rate = (int) [ 6000, 192000 ], " "endianness = (int) LITTLE_ENDIAN" -*/ ); static GstFlowReturn gst_wavpack_dec_chain (GstPad * pad, GstBuffer * buffer); static gboolean gst_wavpack_dec_sink_event (GstPad * pad, GstEvent * event); +static void gst_wavpack_dec_finalize (GObject * object); +static GstStateChangeReturn gst_wavpack_dec_change_state (GstElement * element, + GstStateChange transition); +static gboolean gst_wavpack_dec_sink_event (GstPad * pad, GstEvent * event); -GST_BOILERPLATE (GstWavpackDec, gst_wavpack_dec, GstElement, GST_TYPE_ELEMENT); - -static gboolean -gst_wavpack_dec_setcaps (GstPad * pad, GstCaps * caps) -{ - GstWavpackDec *wavpackdec = GST_WAVPACK_DEC (gst_pad_get_parent (pad)); - GstStructure *structure; - GstCaps *srccaps; - gint bits, rate, channels; - - structure = gst_caps_get_structure (caps, 0); - if (!gst_structure_get_int (structure, "rate", &rate) || - !gst_structure_get_int (structure, "channels", &channels) || - !gst_structure_get_int (structure, "width", &bits)) { - return FALSE; - } - - wavpackdec->samplerate = rate; - wavpackdec->channels = channels; - wavpackdec->width = bits; - -/* 32-bit output seems to be in fact 32 bit int (e.g. Prod_Girls.wv) */ -/* if (bits != 32) { */ - srccaps = gst_caps_new_simple ("audio/x-raw-int", - "rate", G_TYPE_INT, wavpackdec->samplerate, - "channels", G_TYPE_INT, wavpackdec->channels, - "depth", G_TYPE_INT, bits, - "width", G_TYPE_INT, bits, - "endianness", G_TYPE_INT, G_LITTLE_ENDIAN, - "signed", G_TYPE_BOOLEAN, TRUE, NULL); -/* - } else { - srccaps = gst_caps_new_simple ("audio/x-raw-float", - "rate", G_TYPE_INT, wavpackdec->samplerate, - "channels", G_TYPE_INT, wavpackdec->channels, - "width", G_TYPE_INT, 32, - "endianness", G_TYPE_INT, G_LITTLE_ENDIAN, NULL); - } -*/ -/* gst_pad_set_caps (wavpackdec->sinkpad, caps); */ - - gst_pad_set_caps (wavpackdec->srcpad, srccaps); - gst_pad_use_fixed_caps (wavpackdec->srcpad); +#if 0 +static GstPad *gst_wavpack_dec_request_new_pad (GstElement * element, + GstPadTemplate * templ, const gchar * name); +#endif - return TRUE; -} +GST_BOILERPLATE (GstWavpackDec, gst_wavpack_dec, GstElement, GST_TYPE_ELEMENT); #if 0 static GstPadLinkReturn @@ -132,70 +99,34 @@ gst_wavpack_dec_base_init (gpointer klass) GST_ELEMENT_DETAILS ("WavePack audio decoder", "Codec/Decoder/Audio", "Decode Wavpack audio data", - "Arwed v. Merkatz "); + "Arwed v. Merkatz , " + "Sebastian Dröge "); GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory)); +#if 0 gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&wvc_sink_factory)); +#endif gst_element_class_set_details (element_class, &plugin_details); } static void -gst_wavpack_dec_dispose (GObject * object) -{ - GstWavpackDec *wavpackdec = GST_WAVPACK_DEC (object); - - g_free (wavpackdec->decodebuf); - wavpackdec->decodebuf = NULL; - - /* FIXME: what about wavpackdec->stream and wavpackdec->context? (tpm) */ - - G_OBJECT_CLASS (parent_class)->dispose (object); -} - -static void gst_wavpack_dec_class_init (GstWavpackDecClass * klass) { - GObjectClass *gobject_class; - GstElementClass *gstelement_class; - - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; - - gobject_class->dispose = gst_wavpack_dec_dispose; -} - -static gboolean -gst_wavpack_dec_src_query (GstPad * pad, GstQuery * query) -{ - return gst_pad_query_default (pad, query); -} - -static gboolean -gst_wavpack_dec_sink_event (GstPad * pad, GstEvent * event) -{ - GstWavpackDec *dec; - - dec = GST_WAVPACK_DEC (gst_pad_get_parent (pad)); - - GST_LOG_OBJECT (dec, "Received %s event", GST_EVENT_TYPE_NAME (event)); - switch (GST_EVENT_TYPE (event)) { - case GST_EVENT_NEWSEGMENT:{ - /* TODO: save current segment so we can do clipping, for now - * we'll just leave the clipping to the audio sink */ - break; - } - default: - break; - } - - gst_object_unref (dec); + GObjectClass *gobject_class = (GObjectClass *) klass; + GstElementClass *gstelement_class = (GstElementClass *) klass; - return gst_pad_event_default (pad, event); + gstelement_class->change_state = + GST_DEBUG_FUNCPTR (gst_wavpack_dec_change_state); +#if 0 + gstelement_class->request_new_pad = + GST_DEBUG_FUNCPTR (gst_wavpack_dec_request_new_pad); +#endif + gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_wavpack_dec_finalize); } static void @@ -206,98 +137,62 @@ gst_wavpack_dec_init (GstWavpackDec * wavpackdec, GstWavpackDecClass * gklass) wavpackdec->sinkpad = gst_pad_new_from_template (gst_element_class_get_pad_template (klass, "sink"), "sink"); - gst_element_add_pad (GST_ELEMENT (wavpackdec), wavpackdec->sinkpad); - gst_pad_set_chain_function (wavpackdec->sinkpad, GST_DEBUG_FUNCPTR (gst_wavpack_dec_chain)); - gst_pad_set_setcaps_function (wavpackdec->sinkpad, - GST_DEBUG_FUNCPTR (gst_wavpack_dec_setcaps)); gst_pad_set_event_function (wavpackdec->sinkpad, GST_DEBUG_FUNCPTR (gst_wavpack_dec_sink_event)); - -#if 0 - wavpackdec->wvcsinkpad = - gst_pad_new_from_template (gst_element_class_get_pad_template (klass, - "wvcsink"), "wvcsink"); - gst_pad_set_link_function (wavpackdec->wvcsinkpad, gst_wavpack_dec_wvclink); - gst_element_add_pad (GST_ELEMENT (wavpackdec), wavpackdec->wvcsinkpad); -#endif - + gst_element_add_pad (GST_ELEMENT (wavpackdec), wavpackdec->sinkpad); wavpackdec->srcpad = gst_pad_new_from_template (gst_element_class_get_pad_template (klass, "src"), "src"); gst_pad_use_fixed_caps (wavpackdec->srcpad); - - gst_pad_set_query_function (wavpackdec->srcpad, - GST_DEBUG_FUNCPTR (gst_wavpack_dec_src_query)); - gst_element_add_pad (GST_ELEMENT (wavpackdec), wavpackdec->srcpad); - wavpackdec->decodebuf = NULL; - wavpackdec->decodebuf_size = 0; - wavpackdec->stream = (WavpackStream *) g_malloc0 (sizeof (WavpackStream)); - wavpackdec->context = (WavpackContext *) g_malloc0 (sizeof (WavpackContext)); -} + wavpackdec->context = NULL; + wavpackdec->stream_reader = gst_wavpack_stream_reader_new (); -static void -gst_wavpack_dec_setup_context (GstWavpackDec * wavpackdec, guchar * data, - guchar * cdata) -{ - WavpackContext *context = wavpackdec->context; - WavpackStream *stream = wavpackdec->stream; - guint buffer_size; + wavpackdec->wv_id.buffer = NULL; + wavpackdec->wv_id.position = wavpackdec->wv_id.length = 0; - memset (context, 0, sizeof (context)); +/* + wavpackdec->wvc_id.buffer = NULL; + wavpackdec->wvc_id.position = wavpackdec->wvc_id.length = 0; + wavpackdec->wvcsinkpad = NULL; +*/ - context->open_flags = 0; - context->current_stream = 0; - context->num_streams = 1; + wavpackdec->error_count = 0; - memset (stream, 0, sizeof (stream)); - context->streams[0] = stream; - gst_wavpack_read_header (&stream->wphdr, data); - stream->blockbuff = data; + wavpackdec->channels = 0; + wavpackdec->sample_rate = 0; + wavpackdec->width = 0; - if (cdata) { - context->wvc_flag = TRUE; - gst_wavpack_read_header (&stream->wphdr, cdata); - stream->block2buff = cdata; - } else { - context->wvc_flag = FALSE; - } + gst_segment_init (&wavpackdec->segment, GST_FORMAT_UNDEFINED); +} - buffer_size = - stream->wphdr.block_samples * wavpackdec->channels * sizeof (int32_t); - if (wavpackdec->decodebuf_size < buffer_size) { - wavpackdec->decodebuf = - (int32_t *) g_realloc (wavpackdec->decodebuf, buffer_size); - wavpackdec->decodebuf_size = buffer_size; - } +static void +gst_wavpack_dec_finalize (GObject * object) +{ + GstWavpackDec *wavpackdec = GST_WAVPACK_DEC (object); + + g_free (wavpackdec->stream_reader); + wavpackdec->stream_reader = NULL; - unpack_init (context); + G_OBJECT_CLASS (parent_class)->finalize (object); } -static GstBuffer * -gst_wavpack_dec_format_samples (GstWavpackDec * wavpackdec, int32_t * samples, - guint num_samples) +static void +gst_wavpack_dec_format_samples (GstWavpackDec * wavpackdec, guint8 * dst, + int32_t * samples, guint num_samples) { - GstBuffer *buf; gint i; - guint8 *dst; int32_t temp; - buf = - gst_buffer_new_and_alloc (num_samples * wavpackdec->width / 8 * - wavpackdec->channels); - - dst = (guint8 *) GST_BUFFER_DATA (buf); - switch (wavpackdec->width) { case 8: for (i = 0; i < num_samples * wavpackdec->channels; ++i) - *dst++ = *samples++ + 128; + *dst++ = (guint8) (*samples++); break; case 16: for (i = 0; i < num_samples * wavpackdec->channels; ++i) { @@ -323,67 +218,353 @@ gst_wavpack_dec_format_samples (GstWavpackDec * wavpackdec, int32_t * samples, default: break; } +} + +static gboolean +gst_wavpack_dec_clip_outgoing_buffer (GstWavpackDec * wavpackdec, + GstBuffer * buf) +{ + gint64 start, stop, cstart, cstop, diff; - return buf; + if (wavpackdec->segment.format != GST_FORMAT_TIME) + return TRUE; + + start = GST_BUFFER_TIMESTAMP (buf); + stop = start + GST_BUFFER_DURATION (buf); + + if (gst_segment_clip (&wavpackdec->segment, GST_FORMAT_TIME, + start, stop, &cstart, &cstop)) { + + diff = cstart - start; + if (diff > 0) { + GST_BUFFER_TIMESTAMP (buf) = cstart; + GST_BUFFER_DURATION (buf) -= diff; + + diff = ((wavpackdec->width + 7) >> 3) * wavpackdec->channels + * GST_CLOCK_TIME_TO_FRAMES (diff, wavpackdec->sample_rate); + GST_BUFFER_DATA (buf) += diff; + GST_BUFFER_SIZE (buf) -= diff; + } + + diff = cstop - stop; + if (diff > 0) { + GST_BUFFER_DURATION (buf) -= diff; + + diff = ((wavpackdec->width + 7) >> 3) * wavpackdec->channels + * GST_CLOCK_TIME_TO_FRAMES (diff, wavpackdec->sample_rate); + GST_BUFFER_SIZE (buf) -= diff; + } + } else { + GST_DEBUG_OBJECT (wavpackdec, "buffer is outside configured segment"); + return FALSE; + } + + return TRUE; } static GstFlowReturn gst_wavpack_dec_chain (GstPad * pad, GstBuffer * buf) { - GstWavpackDec *wavpackdec = GST_WAVPACK_DEC (gst_pad_get_parent (pad)); - GstBuffer *outbuf, *cbuf = NULL; + GstWavpackDec *wavpackdec; + GstBuffer *outbuf; + GstBuffer *cbuf = NULL; GstFlowReturn ret = GST_FLOW_OK; + WavpackHeader wph; + int32_t *unpack_buf; + int32_t unpacked_sample_count; + + wavpackdec = GST_WAVPACK_DEC (GST_PAD_PARENT (pad)); + + /* we only accept framed input with complete chunks */ + g_assert (GST_BUFFER_SIZE (buf) >= sizeof (WavpackHeader)); + gst_wavpack_read_header (&wph, GST_BUFFER_DATA (buf)); + g_assert (GST_BUFFER_SIZE (buf) == + wph.ckSize + 4 * sizeof (char) + sizeof (uint32_t)); + + wavpackdec->wv_id.buffer = GST_BUFFER_DATA (buf); + wavpackdec->wv_id.length = GST_BUFFER_SIZE (buf); + wavpackdec->wv_id.position = 0; #if 0 + /* check whether the correction pad is linked and we can get + * the correction chunk that corresponds to our current data */ if (gst_pad_is_linked (wavpackdec->wvcsinkpad)) { if (GST_FLOW_OK != gst_pad_pull_range (wavpackdec->wvcsinkpad, - wavpackdec->wvcflushed_bytes, -1, &cbuf)) { + GST_BUFFER_OFFSET (buf), -1, &cbuf)) { cbuf = NULL; } else { - wavpackdec->wvcflushed_bytes += GST_BUFFER_SIZE (cbuf); + /* this won't work (tpm) */ + if (!(GST_BUFFER_TIMESTAMP (cbuf) == GST_BUFFER_TIMESTAMP (buf)) || + !(GST_BUFFER_DURATION (cbuf) == GST_BUFFER_DURATION (buf)) || + !(GST_BUFFER_OFFSET (cbuf) == GST_BUFFER_OFFSET (buf)) || + !(GST_BUFFER_OFFSET_END (cbuf) == GST_BUFFER_OFFSET (buf))) { + gst_buffer_unref (cbuf); + cbuf = NULL; + } else { + wavpackdec->wvc_id.buffer = GST_BUFFER_DATA (cbuf); + wavpackdec->wvc_id.length = GST_BUFFER_SIZE (cbuf); + wavpackdec->wvc_id.position = 0; + } } - } #endif - gst_wavpack_dec_setup_context (wavpackdec, GST_BUFFER_DATA (buf), - cbuf ? GST_BUFFER_DATA (cbuf) : NULL); - unpack_samples (wavpackdec->context, wavpackdec->decodebuf, - wavpackdec->context->streams[0]->wphdr.block_samples); - outbuf = - gst_wavpack_dec_format_samples (wavpackdec, wavpackdec->decodebuf, - wavpackdec->context->streams[0]->wphdr.block_samples); + /* create a new wavpack context if there is none yet but if there + * was already one (i.e. caps were set on the srcpad) check whether + * the new one has the same caps */ + if (!wavpackdec->context) { + gchar error_msg[80]; - gst_buffer_stamp (outbuf, buf); +/* + wavpackdec->context = + WavpackOpenFileInputEx (wavpackdec->stream_reader, &wavpackdec->wv_id, + (cbuf) ? &wavpackdec->wvc_id : NULL, error_msg, OPEN_STREAMING, 0); +*/ + + wavpackdec->context = WavpackOpenFileInputEx (wavpackdec->stream_reader, + &wavpackdec->wv_id, NULL, error_msg, OPEN_STREAMING, 0); + + if (!wavpackdec->context) { + wavpackdec->error_count++; + GST_ELEMENT_WARNING (wavpackdec, LIBRARY, INIT, (NULL), + ("Couldn't open buffer for decoding: %s", error_msg)); + if (wavpackdec->error_count <= WAVPACK_DEC_MAX_ERRORS) { + ret = GST_FLOW_OK; + } else { + ret = GST_FLOW_ERROR; + } + gst_buffer_unref (buf); + if (cbuf) { + gst_buffer_unref (cbuf); + } + return ret; + } + + if (GST_PAD_CAPS (wavpackdec->srcpad)) { + if ((wavpackdec->sample_rate != + WavpackGetSampleRate (wavpackdec->context)) + || (wavpackdec->channels != + WavpackGetNumChannels (wavpackdec->context)) + || (wavpackdec->width != + WavpackGetBitsPerSample (wavpackdec->context))) { + gst_buffer_unref (buf); + if (cbuf) { + gst_buffer_unref (cbuf); + } + + /* FIXME: use the right error */ + GST_ELEMENT_ERROR (wavpackdec, LIBRARY, INIT, (NULL), + ("Got Wavpack chunk with changed format settings!")); + return GST_FLOW_ERROR; + } + } + } + wavpackdec->error_count = 0; + + if (!GST_PAD_CAPS (wavpackdec->srcpad)) { + GstCaps *caps; + + g_assert (wavpackdec->context); + wavpackdec->sample_rate = WavpackGetSampleRate (wavpackdec->context); + wavpackdec->channels = WavpackGetNumChannels (wavpackdec->context); + wavpackdec->width = WavpackGetBitsPerSample (wavpackdec->context); + caps = gst_caps_new_simple ("audio/x-raw-int", + "rate", G_TYPE_INT, wavpackdec->sample_rate, + "channels", G_TYPE_INT, wavpackdec->channels, + "depth", G_TYPE_INT, wavpackdec->width, + "width", G_TYPE_INT, wavpackdec->width, + "endianness", G_TYPE_INT, G_LITTLE_ENDIAN, + "signed", G_TYPE_BOOLEAN, TRUE, NULL); + + if (!gst_pad_set_caps (wavpackdec->srcpad, caps)) { + gst_caps_unref (caps); + WavpackCloseFile (wavpackdec->context); + wavpackdec->context = NULL; + gst_buffer_unref (buf); + if (cbuf) { + gst_buffer_unref (cbuf); + } + /* FIXME: use the right error */ + GST_ELEMENT_ERROR (wavpackdec, LIBRARY, INIT, (NULL), + ("Couldn't set caps on source pad: %" GST_PTR_FORMAT, caps)); + return GST_FLOW_ERROR; + } + gst_caps_unref (caps); + gst_pad_use_fixed_caps (wavpackdec->srcpad); + } + + g_assert (wavpackdec->context); + unpack_buf = + (int32_t *) g_malloc (sizeof (int32_t) * wph.block_samples * + wavpackdec->channels); + unpacked_sample_count = + WavpackUnpackSamples (wavpackdec->context, unpack_buf, wph.block_samples); + g_assert (unpacked_sample_count == wph.block_samples); + + ret = + gst_pad_alloc_buffer_and_set_caps (wavpackdec->srcpad, + GST_BUFFER_OFFSET (buf), + wph.block_samples * ((wavpackdec->width + + 7) >> 3) * wavpackdec->channels, + GST_PAD_CAPS (wavpackdec->srcpad), &outbuf); + + if (GST_FLOW_IS_FATAL (ret)) { + WavpackCloseFile (wavpackdec->context); + wavpackdec->context = NULL; + g_free (unpack_buf); + gst_buffer_unref (buf); + if (cbuf) { + gst_buffer_unref (cbuf); + } + return ret; + } else if (ret != GST_FLOW_OK) { + g_free (unpack_buf); + gst_buffer_unref (buf); + if (cbuf) { + gst_buffer_unref (cbuf); + } + return ret; + } + + gst_wavpack_dec_format_samples (wavpackdec, GST_BUFFER_DATA (outbuf), + unpack_buf, wph.block_samples); + g_free (unpack_buf); + gst_buffer_stamp (outbuf, buf); gst_buffer_unref (buf); if (cbuf) { gst_buffer_unref (cbuf); } - gst_buffer_set_caps (outbuf, GST_PAD_CAPS (wavpackdec->srcpad)); + if (gst_wavpack_dec_clip_outgoing_buffer (wavpackdec, outbuf)) { + GST_LOG_OBJECT (wavpackdec, "pushing buffer with time %" GST_TIME_FORMAT, + GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf))); + ret = gst_pad_push (wavpackdec->srcpad, outbuf); + if (ret != GST_FLOW_OK) { + GST_DEBUG_OBJECT (wavpackdec, "pad_push: %s", gst_flow_get_name (ret)); + } + } else { + gst_buffer_unref (outbuf); + } - GST_LOG_OBJECT (wavpackdec, "pushing buffer with time %" GST_TIME_FORMAT, - GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf))); + return ret; +} + +static gboolean +gst_wavpack_dec_sink_event (GstPad * pad, GstEvent * event) +{ + GstWavpackDec *wavpackdec = GST_WAVPACK_DEC (gst_pad_get_parent (pad)); - ret = gst_pad_push (wavpackdec->srcpad, outbuf); - if (ret != GST_FLOW_OK) { - GST_DEBUG_OBJECT (wavpackdec, "pad_push: %s", gst_flow_get_name (ret)); + GST_LOG_OBJECT (wavpackdec, "Received %s event", GST_EVENT_TYPE_NAME (event)); + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_NEWSEGMENT:{ + GstFormat fmt; + gboolean is_update; + gint64 start, end, base; + gdouble rate; + + gst_event_parse_new_segment (event, &is_update, &rate, &fmt, &start, + &end, &base); + if (fmt == GST_FORMAT_TIME) { + GST_DEBUG ("Got NEWSEGMENT event in GST_FORMAT_TIME, passing on (%" + GST_TIME_FORMAT " - %" GST_TIME_FORMAT ")", GST_TIME_ARGS (start), + GST_TIME_ARGS (end)); + gst_segment_set_newsegment (&wavpackdec->segment, is_update, rate, fmt, + start, end, base); + } else { + gst_segment_init (&wavpackdec->segment, GST_FORMAT_UNDEFINED); + } + break; + } + default: + break; + } + + gst_object_unref (wavpackdec); + return gst_pad_event_default (pad, event); +} + +static GstStateChangeReturn +gst_wavpack_dec_change_state (GstElement * element, GstStateChange transition) +{ + GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS; + GstWavpackDec *wavpackdec = GST_WAVPACK_DEC (element); + + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: + break; + case GST_STATE_CHANGE_READY_TO_PAUSED: + gst_segment_init (&wavpackdec->segment, GST_FORMAT_UNDEFINED); + break; + case GST_STATE_CHANGE_PAUSED_TO_PLAYING: + break; + default: + break; + } + + ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + + switch (transition) { + case GST_STATE_CHANGE_PLAYING_TO_PAUSED: + break; + case GST_STATE_CHANGE_PAUSED_TO_READY: + if (wavpackdec->context) { + WavpackCloseFile (wavpackdec->context); + wavpackdec->context = NULL; + } + wavpackdec->wv_id.buffer = NULL; + wavpackdec->wv_id.position = 0; + wavpackdec->wv_id.length = 0; + /* + wavpackdec->wvc_id.buffer = NULL; + wavpackdec->wvc_id.position = 0; + wavpackdec->wvc_id.length = 0; + wavpackdec->error_count = 0; + wavpackdec->wvcsinkpad = NULL; + */ + wavpackdec->channels = 0; + wavpackdec->sample_rate = 0; + wavpackdec->width = 0; + break; + case GST_STATE_CHANGE_READY_TO_NULL: + break; + default: + break; } return ret; } +#if 0 +static GstPad * +gst_wavpack_dec_request_new_pad (GstElement * element, + GstPadTemplate * templ, const gchar * name) +{ + GstWavpackDec *wavpackdec = GST_WAVPACK_DEC (element); + GstPad *pad; + + if (wavpackdec->wvcsinkpad == NULL) { + wavpackdec->wvcsinkpad = gst_pad_new_from_template (template, name); + gst_pad_set_link_function (wavpackdec->wvcsinkpad, gst_wavpack_dec_wvclink); + gst_pad_use_fixed_caps (wavpackdec->wvcsinkpad); + gst_element_add_pad (GST_ELEMENT (wavpackdec), wavpackdec->wvcsinkpad); + gst_element_no_more_pads (GST_ELEMENT (wavpackdec)); + } else { + pad = NULL; + } + + return pad; +} +#endif + gboolean gst_wavpack_dec_plugin_init (GstPlugin * plugin) { if (!gst_element_register (plugin, "wavpackdec", GST_RANK_PRIMARY, GST_TYPE_WAVPACK_DEC)) return FALSE; - GST_DEBUG_CATEGORY_INIT (gst_wavpack_dec_debug, "wavpackdec", 0, "wavpack decoder"); - return TRUE; } diff --git a/ext/wavpack/gstwavpackdec.h b/ext/wavpack/gstwavpackdec.h index 0d8459e..7ab9699 100644 --- a/ext/wavpack/gstwavpackdec.h +++ b/ext/wavpack/gstwavpackdec.h @@ -1,5 +1,6 @@ /* GStreamer Wavpack plugin - * (c) 2004 Arwed v. Merkatz + * Copyright (c) 2004 Arwed v. Merkatz + * Copyright (c) 2006 Sebastian Dröge * * gstwavpackdec.h: raw Wavpack bitstream decoder * @@ -26,8 +27,9 @@ #include -G_BEGIN_DECLS +#include "gstwavpackstreamreader.h" +G_BEGIN_DECLS /* #define's don't like whitespacey bits */ #define GST_TYPE_WAVPACK_DEC \ (gst_wavpack_dec_get_type()) @@ -39,48 +41,40 @@ G_BEGIN_DECLS (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_WAVPACK_DEC)) #define GST_IS_WAVPACK_DEC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_WAVPACK_DEC)) - -typedef struct _GstWavpackDec GstWavpackDec; +typedef struct _GstWavpackDec GstWavpackDec; typedef struct _GstWavpackDecClass GstWavpackDecClass; struct _GstWavpackDec { GstElement element; - GstPad *sinkpad, *srcpad; -#if 0 - GstPad *wvcsinkpad; -#endif + /* GstPad *wvcsinkpad; */ + GstPad *sinkpad; + GstPad *srcpad; - WavpackContext *context; + WavpackContext *context; + WavpackStreamReader *stream_reader; - int32_t *decodebuf; - guint decodebuf_size; + read_id wv_id; + /* read_id wvc_id; */ - WavpackStream *stream; + GstSegment segment; /* used for clipping, TIME format */ - guint32 samplerate; - guint channels; - guint width; - long frame_length; + guint sample_rate; + guint width; + guint channels; - guint64 wvcflushed_bytes; - guint64 duration; - guint64 wvcduration; - - guchar *decdata; - long *cache; + gint error_count; }; -struct _GstWavpackDecClass +struct _GstWavpackDecClass { GstElementClass parent; }; GType gst_wavpack_dec_get_type (void); -gboolean gst_wavpack_dec_plugin_init (GstPlugin *plugin); +gboolean gst_wavpack_dec_plugin_init (GstPlugin * plugin); G_END_DECLS - #endif /* __GST_WAVPACK_DEC_H__ */ diff --git a/ext/wavpack/gstwavpackenc.c b/ext/wavpack/gstwavpackenc.c index bc060f2..60ab40a 100644 --- a/ext/wavpack/gstwavpackenc.c +++ b/ext/wavpack/gstwavpackenc.c @@ -52,7 +52,7 @@ static int gst_wavpack_enc_push_block (void *id, void *data, int32_t count); static gboolean gst_wavpack_enc_sink_event (GstPad * pad, GstEvent * event); static GstStateChangeReturn gst_wavpack_enc_change_state (GstElement * element, GstStateChange transition); -static void gst_wavpack_enc_dispose (GObject * object); +static void gst_wavpack_enc_finalize (GObject * object); static void gst_wavpack_enc_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); static void gst_wavpack_enc_get_property (GObject * object, guint prop_id, @@ -214,7 +214,7 @@ gst_wavpack_enc_class_init (GstWavpackEncClass * klass) /* set state change handler */ gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_wavpack_enc_change_state); - gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_wavpack_enc_dispose); + gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_wavpack_enc_finalize); /* set property handlers */ gobject_class->set_property = @@ -270,15 +270,13 @@ gst_wavpack_enc_init (GstWavpackEnc * wavpack_enc, GstWavpackEncClass * gclass) GST_DEBUG_FUNCPTR (gst_wavpack_enc_chain)); gst_pad_set_event_function (wavpack_enc->sinkpad, GST_DEBUG_FUNCPTR (gst_wavpack_enc_sink_event)); - gst_element_add_pad (GST_ELEMENT (wavpack_enc), - GST_DEBUG_FUNCPTR (wavpack_enc->sinkpad)); + gst_element_add_pad (GST_ELEMENT (wavpack_enc), wavpack_enc->sinkpad); /* setup src pad */ wavpack_enc->srcpad = gst_pad_new_from_template (gst_element_class_get_pad_template (klass, "src"), "src"); - gst_element_add_pad (GST_ELEMENT (wavpack_enc), - GST_DEBUG_FUNCPTR (wavpack_enc->srcpad)); + gst_element_add_pad (GST_ELEMENT (wavpack_enc), wavpack_enc->srcpad); /* initialize object attributes */ wavpack_enc->wp_config = NULL; @@ -307,7 +305,7 @@ gst_wavpack_enc_init (GstWavpackEnc * wavpack_enc, GstWavpackEncClass * gclass) } static void -gst_wavpack_enc_dispose (GObject * object) +gst_wavpack_enc_finalize (GObject * object) { GstWavpackEnc *wavpack_enc = GST_WAVPACK_ENC (object); @@ -315,7 +313,7 @@ gst_wavpack_enc_dispose (GObject * object) g_free (wavpack_enc->wv_id); g_free (wavpack_enc->wvc_id); - G_OBJECT_CLASS (parent_class)->dispose (object); + G_OBJECT_CLASS (parent_class)->finalize (object); } static gboolean @@ -410,29 +408,31 @@ gst_wavpack_enc_set_wp_config (GstWavpackEnc * wavpack_enc) (GST_ELEMENT_GET_CLASS (wavpack_enc), "wvcsrc"), "wvcsrc"); /* try to add correction src pad, don't set correction mode on failure */ - if (gst_element_add_pad (GST_ELEMENT (wavpack_enc), - GST_DEBUG_FUNCPTR (wavpack_enc->wvcsrcpad))) { - GstCaps *caps = gst_caps_new_simple ("audio/x-wavpack-correction", - "framed", G_TYPE_BOOLEAN, FALSE, NULL); + GstCaps *caps = gst_caps_new_simple ("audio/x-wavpack-correction", + "framed", G_TYPE_BOOLEAN, FALSE, NULL); - gst_element_no_more_pads (GST_ELEMENT (wavpack_enc)); + gst_element_no_more_pads (GST_ELEMENT (wavpack_enc)); + + if (!gst_pad_set_caps (wavpack_enc->wvcsrcpad, caps)) { + wavpack_enc->correction_mode = 0; + GST_ELEMENT_WARNING (wavpack_enc, LIBRARY, INIT, (NULL), + ("setting correction caps failed: %", GST_PTR_FORMAT, caps)); + } else { + gst_pad_use_fixed_caps (wavpack_enc->wvcsrcpad); + + if (gst_element_add_pad (GST_ELEMENT (wavpack_enc), + wavpack_enc->wvcsrcpad)) { - if (!gst_pad_set_caps (wavpack_enc->wvcsrcpad, caps)) { - wavpack_enc->correction_mode = 0; - GST_ELEMENT_WARNING (wavpack_enc, LIBRARY, INIT, (NULL), - ("setting correction caps failed: %", GST_PTR_FORMAT, caps)); - } else { - gst_pad_use_fixed_caps (wavpack_enc->wvcsrcpad); wavpack_enc->wp_config->flags |= CONFIG_CREATE_WVC; if (wavpack_enc->correction_mode == 2) { wavpack_enc->wp_config->flags |= CONFIG_OPTIMIZE_WVC; } + } else { + wavpack_enc->correction_mode = 0; + GST_ELEMENT_WARNING (wavpack_enc, LIBRARY, INIT, (NULL), + ("add correction pad failed. no correction file will be created.")); } gst_caps_unref (caps); - } else { - wavpack_enc->correction_mode = 0; - GST_ELEMENT_WARNING (wavpack_enc, LIBRARY, INIT, (NULL), - ("add correction pad failed. no correction file will be created.")); } } } else { @@ -442,6 +442,7 @@ gst_wavpack_enc_set_wp_config (GstWavpackEnc * wavpack_enc) ("settings correction mode only has effect if a bitrate is provided.")); } } + gst_element_no_more_pads (GST_ELEMENT (wavpack_enc)); /* MD5, setup MD5 context */ if ((wavpack_enc->md5) && !(wavpack_enc->md5_context)) { diff --git a/ext/wavpack/gstwavpackparse.c b/ext/wavpack/gstwavpackparse.c index 49f87a5..1febaf6 100644 --- a/ext/wavpack/gstwavpackparse.c +++ b/ext/wavpack/gstwavpackparse.c @@ -1,6 +1,7 @@ /* GStreamer wavpack plugin - * (c) 2005 Arwed v. Merkatz - * (c) 2006 Tim-Philipp Müller + * Copyright (c) 2005 Arwed v. Merkatz + * Copyright (c) 2006 Tim-Philipp Müller + * Copyright (c) 2006 Sebastian Dröge * * gstwavpackparse.c: wavpack file parser * @@ -27,6 +28,7 @@ #include #include "gstwavpackparse.h" +#include "gstwavpackstreamreader.h" #include "gstwavpackcommon.h" GST_DEBUG_CATEGORY_STATIC (gst_wavpack_parse_debug); @@ -45,7 +47,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SOMETIMES, GST_STATIC_CAPS ("audio/x-wavpack, " "width = (int) { 8, 16, 24, 32 }, " - "channels = (int) { 1, 2 }, " + "channels = (int) [ 1, 2 ], " "rate = (int) [ 6000, 192000 ], " "framed = (boolean) true") ); @@ -77,7 +79,7 @@ gst_wavpack_parse_base_init (gpointer klass) GST_ELEMENT_DETAILS ("WavePack parser", "Codec/Demuxer/Audio", "Parses Wavpack files", - "Arwed v. Merkatz "); + "Sebastian Dröge "); GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gst_element_class_add_pad_template (element_class, @@ -90,10 +92,11 @@ gst_wavpack_parse_base_init (gpointer klass) } static void -gst_wavpack_parse_dispose (GObject * object) +gst_wavpack_parse_finalize (GObject * object) { gst_wavpack_parse_reset (GST_WAVPACK_PARSE (object)); - G_OBJECT_CLASS (parent_class)->dispose (object); + + G_OBJECT_CLASS (parent_class)->finalize (object); } static void @@ -105,7 +108,7 @@ gst_wavpack_parse_class_init (GstWavpackParseClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - gobject_class->dispose = gst_wavpack_parse_dispose; + gobject_class->finalize = gst_wavpack_parse_finalize; gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_wavpack_parse_change_state); } @@ -137,13 +140,19 @@ gst_wavpack_parse_index_get_entry_from_sample (GstWavpackParse * wvparse, entry = &g_array_index (wvparse->entries, GstWavpackParseIndexEntry, i); GST_LOG_OBJECT (wvparse, "Index entry %03u: sample %" G_GINT64_FORMAT " @" - " byte %" G_GINT64_FORMAT, entry->sample_offset, entry->byte_offset); + " byte %" G_GINT64_FORMAT, i, entry->sample_offset, entry->byte_offset); if (entry->sample_offset <= sample_offset && sample_offset < entry->sample_offset_end) { GST_LOG_OBJECT (wvparse, "found match"); return entry; } + + /* as the list is sorted and we first look at the latest entry + * we can abort searching for an entry if the sample we want is + * after the latest one */ + if (sample_offset >= entry->sample_offset_end) + break; } GST_LOG_OBJECT (wvparse, "no match in index"); return NULL; @@ -331,9 +340,7 @@ gst_wavpack_parse_scan_to_find_sample (GstWavpackParse * parse, /* now scan forward until we find the chunk we're looking for or hit EOS */ do { - WavpackHeader header = { {0,} - , 0, - }; + WavpackHeader header; GstBuffer *buf; buf = gst_wavpack_parse_pull_buffer (parse, off, sizeof (WavpackHeader), @@ -451,6 +458,11 @@ gst_wavpack_parse_handle_seek_event (GstWavpackParse * wvparse, stop = gst_util_uint64_scale_int (stop, rate, GST_SECOND); } + /* if seek is to something after the end of the stream seek only + * to the end. this can be caused by rounding errors */ + if (start >= wvparse->total_samples) + start = wvparse->total_samples; + flush = ((seek_flags & GST_SEEK_FLAG_FLUSH) != 0); if (start < 0) { @@ -628,7 +640,7 @@ static gboolean gst_wavpack_parse_create_src_pad (GstWavpackParse * wvparse, GstBuffer * buf, WavpackHeader * header) { - WavpackMetadata meta; + GstWavpackMetadata meta; GstCaps *caps = NULL; guchar *bufptr; @@ -636,7 +648,7 @@ gst_wavpack_parse_create_src_pad (GstWavpackParse * wvparse, GstBuffer * buf, bufptr = GST_BUFFER_DATA (buf) + sizeof (WavpackHeader); - while (read_metadata_buff (&meta, GST_BUFFER_DATA (buf), &bufptr)) { + while (gst_wavpack_read_metadata (&meta, GST_BUFFER_DATA (buf), &bufptr)) { switch (meta.id) { case ID_WVC_BITSTREAM:{ caps = gst_caps_new_simple ("audio/x-wavpack-correction", @@ -646,23 +658,41 @@ gst_wavpack_parse_create_src_pad (GstWavpackParse * wvparse, GstBuffer * buf, (GST_ELEMENT_GET_CLASS (wvparse), "wvcsrc"), "wvcsrc"); break; } - case ID_RIFF_HEADER:{ - WaveHeader wheader; - - /* skip RiffChunkHeader and ChunkHeader */ - g_memmove (&wheader, meta.data + 20, sizeof (WaveHeader)); - little_endian_to_native (&wheader, WaveHeaderFormat); - wvparse->samplerate = wheader.SampleRate; - wvparse->channels = wheader.NumChannels; + case ID_WV_BITSTREAM: + case ID_WVX_BITSTREAM:{ + WavpackStreamReader *stream_reader = gst_wavpack_stream_reader_new (); + WavpackContext *wpc; + gchar error_msg[80]; + read_id rid; + + rid.buffer = GST_BUFFER_DATA (buf); + rid.length = GST_BUFFER_SIZE (buf); + rid.position = 0; + + wpc = + WavpackOpenFileInputEx (stream_reader, &rid, NULL, error_msg, 0, 0); + + if (!wpc) + return FALSE; + + wvparse->samplerate = WavpackGetSampleRate (wpc); + wvparse->channels = WavpackGetNumChannels (wpc); wvparse->total_samples = header->total_samples; + if (wvparse->total_samples == (int32_t) - 1) + wvparse->total_samples = 0; + else + wvparse->total_samples--; + caps = gst_caps_new_simple ("audio/x-wavpack", - "width", G_TYPE_INT, wheader.BitsPerSample, + "width", G_TYPE_INT, WavpackGetBitsPerSample (wpc), "channels", G_TYPE_INT, wvparse->channels, "rate", G_TYPE_INT, wvparse->samplerate, "framed", G_TYPE_BOOLEAN, TRUE, NULL); wvparse->srcpad = gst_pad_new_from_template (gst_element_class_get_pad_template (GST_ELEMENT_GET_CLASS (wvparse), "src"), "src"); + WavpackCloseFile (wpc); + g_free (stream_reader); break; } default:{ @@ -685,6 +715,7 @@ gst_wavpack_parse_create_src_pad (GstWavpackParse * wvparse, GstBuffer * buf, GST_DEBUG_FUNCPTR (gst_wavpack_parse_src_event)); gst_pad_set_caps (wvparse->srcpad, caps); + gst_caps_unref (caps); gst_pad_use_fixed_caps (wvparse->srcpad); gst_object_ref (wvparse->srcpad); diff --git a/ext/wavpack/gstwavpackstreamreader.c b/ext/wavpack/gstwavpackstreamreader.c new file mode 100644 index 0000000..9b3c0bf --- /dev/null +++ b/ext/wavpack/gstwavpackstreamreader.c @@ -0,0 +1,106 @@ +/* GStreamer Wavpack plugin + * Copyright (c) 2006 Sebastian Dröge + * + * gstwavpackstreamreader.c: stream reader used for decoding + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include +#include +#include + +#include "gstwavpackstreamreader.h" + +static int32_t +gst_wavpack_stream_reader_read_bytes (void *id, void *data, int32_t bcount) +{ + read_id *rid = (read_id *) id; + uint32_t left = rid->length - rid->position; + uint32_t to_read = MIN (left, bcount); + + if (to_read > 0) { + g_memmove (data, rid->buffer + rid->position, to_read); + rid->position += to_read; + return to_read; + } else { + return 0; + } +} + +static uint32_t +gst_wavpack_stream_reader_get_pos (void *id) +{ + return ((read_id *) id)->position; +} + +static int +gst_wavpack_stream_reader_set_pos_abs (void *id, uint32_t pos) +{ + return -1; +} + +static int +gst_wavpack_stream_reader_set_pos_rel (void *id, int32_t delta, int mode) +{ + return -1; +} + +static int +gst_wavpack_stream_reader_push_back_byte (void *id, int c) +{ + read_id *rid = (read_id *) id; + + rid->position -= 1; + if (rid->position < 0) + rid->position = 0; + return rid->position; +} + +static uint32_t +gst_wavpack_stream_reader_get_length (void *id) +{ + return ((read_id *) id)->length; +} + +static int +gst_wavpack_stream_reader_can_seek (void *id) +{ + return FALSE; +} + +static int32_t +gst_wavpack_stream_reader_write_bytes (void *id, void *data, int32_t bcount) +{ + return 0; +} + +WavpackStreamReader * +gst_wavpack_stream_reader_new () +{ + WavpackStreamReader *stream_reader = + (WavpackStreamReader *) g_malloc0 (sizeof (WavpackStreamReader)); + stream_reader->read_bytes = gst_wavpack_stream_reader_read_bytes; + stream_reader->get_pos = gst_wavpack_stream_reader_get_pos; + stream_reader->set_pos_abs = gst_wavpack_stream_reader_set_pos_abs; + stream_reader->set_pos_rel = gst_wavpack_stream_reader_set_pos_rel; + stream_reader->push_back_byte = gst_wavpack_stream_reader_push_back_byte; + stream_reader->get_length = gst_wavpack_stream_reader_get_length; + stream_reader->can_seek = gst_wavpack_stream_reader_can_seek; + stream_reader->write_bytes = gst_wavpack_stream_reader_write_bytes; + + return stream_reader; +} diff --git a/ext/wavpack/gstwavpackstreamreader.h b/ext/wavpack/gstwavpackstreamreader.h new file mode 100644 index 0000000..e9ffd70 --- /dev/null +++ b/ext/wavpack/gstwavpackstreamreader.h @@ -0,0 +1,36 @@ +/* GStreamer Wavpack plugin + * Copyright (c) 2006 Sebastian Dröge + * + * gstwavpackstreamreader.h: stream reader used for decoding + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_WAVPACK_STREAM_READER_H__ +#define __GST_WAVPACK_STREAM_READER_H__ + +#include + +typedef struct +{ + guint8 *buffer; + uint32_t length; + uint32_t position; +} read_id; + +WavpackStreamReader *gst_wavpack_stream_reader_new (); + +#endif -- 2.7.4