From 27ce8aaafd5b58146135d711933f829863cf84d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Thu, 31 May 2007 16:59:49 +0200 Subject: Rename the wavpack combined plugin sources so that their are listed together in a by-name listing. --HG-- rename : src/combined/combined_wavpack.c => src/combined/wavpack_combined.c rename : src/combined/combined_wavpack.h => src/combined/wavpack_combined.h rename : src/combined/decoder_wavpack.c => src/combined/wavpack_decoder.c rename : src/combined/demux_wavpack.c => src/combined/wavpack_demuxer.c --- src/combined/Makefile.am | 2 +- src/combined/combined_wavpack.c | 46 ----- src/combined/combined_wavpack.h | 46 ----- src/combined/decoder_wavpack.c | 337 -------------------------------- src/combined/demux_wavpack.c | 414 ---------------------------------------- src/combined/wavpack_combined.c | 46 +++++ src/combined/wavpack_combined.h | 46 +++++ src/combined/wavpack_decoder.c | 337 ++++++++++++++++++++++++++++++++ src/combined/wavpack_demuxer.c | 414 ++++++++++++++++++++++++++++++++++++++++ 9 files changed, 844 insertions(+), 844 deletions(-) delete mode 100644 src/combined/combined_wavpack.c delete mode 100644 src/combined/combined_wavpack.h delete mode 100644 src/combined/decoder_wavpack.c delete mode 100644 src/combined/demux_wavpack.c create mode 100644 src/combined/wavpack_combined.c create mode 100644 src/combined/wavpack_combined.h create mode 100644 src/combined/wavpack_decoder.c create mode 100644 src/combined/wavpack_demuxer.c (limited to 'src') diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am index 58ea35d06..4ed0f756d 100644 --- a/src/combined/Makefile.am +++ b/src/combined/Makefile.am @@ -19,7 +19,7 @@ xineplug_LTLIBRARIES = \ $(xineplug_flac) \ xineplug_nsf.la -xineplug_wavpack_la_SOURCES = demux_wavpack.c decoder_wavpack.c combined_wavpack.c combined_wavpack.h +xineplug_wavpack_la_SOURCES = wavpack_demuxer.c wavpack_decoder.c wavpack_combined.c wavpack_combined.h xineplug_wavpack_la_LIBADD = $(XINE_LIB) $(WAVPACK_LIBS) xineplug_wavpack_la_CFLAGS = $(AM_CFLAGS) $(WAVPACK_CFLAGS) xineplug_wavpack_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/demuxers diff --git a/src/combined/combined_wavpack.c b/src/combined/combined_wavpack.c deleted file mode 100644 index 7a334b15c..000000000 --- a/src/combined/combined_wavpack.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2007 the xine project - * - * This file is part of xine, a free video player. - * - * xine is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * xine 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * xine interface to libwavpack by Diego Pettenò - * - * $Id: combined_wavpack.c,v 1.3 2007/03/17 07:34:02 dgp85 Exp $ - */ - -#include "xine_internal.h" -#include "combined_wavpack.h" - -static const demuxer_info_t demux_info_wv = { - 0 /* priority */ -}; - -static uint32_t audio_types[] = { - BUF_AUDIO_WAVPACK, 0 - }; - -static const decoder_info_t decoder_info_wv = { - audio_types, /* supported types */ - 7 /* priority */ -}; - -const plugin_info_t xine_plugin_info[] EXPORTED = { - /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "wavpack", XINE_VERSION_CODE, &demux_info_wv, demux_wv_init_plugin }, - { PLUGIN_AUDIO_DECODER, 15, "wavpackdec", XINE_VERSION_CODE, &decoder_info_wv, decoder_wavpack_init_plugin }, - { PLUGIN_NONE, 0, NULL, 0, NULL, NULL } -}; diff --git a/src/combined/combined_wavpack.h b/src/combined/combined_wavpack.h deleted file mode 100644 index 7688f91df..000000000 --- a/src/combined/combined_wavpack.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2007 the xine project - * - * This file is part of xine, a free video player. - * - * xine is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * xine 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * xine interface to libwavpack by Diego Pettenò - * - * $Id: combined_wavpack.h,v 1.3 2007/03/17 07:34:02 dgp85 Exp $ - */ - -#include "os_types.h" -#include "bswap.h" - -typedef struct { - uint32_t idcode; /* This should always be the string "wvpk" */ - uint32_t block_size; /* Size of the rest of the frame */ - uint16_t wv_version; /* Version of the wavpack, 0x0403 should be latest */ - uint8_t track; /* Unused, has to be 0 */ - uint8_t index; /* Unused, has to be 0 */ - uint32_t file_samples; /* (uint32_t)-1 if unknown, else the total number - of samples for the file */ - uint32_t samples_index; /* Index of the first sample in block, from the - start of the file */ - uint32_t samples_count; /* Count of samples in the current frame */ - uint32_t flags; /* Misc flags */ - uint32_t decoded_crc32; /* CRC32 of the decoded data */ -} XINE_PACKED wvheader_t; - -static const uint32_t wvpk_signature = ME_FOURCC('w', 'v', 'p', 'k'); - -void *demux_wv_init_plugin (xine_t *const xine, void *const data); -void *decoder_wavpack_init_plugin (xine_t *xine, void *data); diff --git a/src/combined/decoder_wavpack.c b/src/combined/decoder_wavpack.c deleted file mode 100644 index ec14dfbf5..000000000 --- a/src/combined/decoder_wavpack.c +++ /dev/null @@ -1,337 +0,0 @@ -/* - * Copyright (C) 2007 the xine project - * - * This file is part of xine, a free video player. - * - * xine is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * xine 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * xine interface to libwavpack by Diego Pettenò - * - * $Id: decoder_wavpack.c,v 1.14 2007/03/29 19:45:33 dgp85 Exp $ - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#define LOG_MODULE "decode_wavpack" -#define LOG_VERBOSE - -#include "xine_internal.h" -#include "attributes.h" -#include "bswap.h" - -#include -#include "combined_wavpack.h" - -typedef struct { - audio_decoder_class_t decoder_class; -} wavpack_class_t; - -typedef struct { - audio_decoder_t audio_decoder; - - xine_stream_t *stream; - - uint8_t *buf; - size_t buf_size; - size_t buf_pos; - - int sample_rate; - uint16_t bits_per_sample:6; - uint16_t channels:4; - - uint16_t output_open:1; - -} wavpack_decoder_t; - -/* Wrapper functions for Wavpack */ -static int32_t xine_buffer_read_bytes(void *const this_gen, void *const data, - int32_t bcount) { - wavpack_decoder_t *const this = (wavpack_decoder_t*)this_gen; - - if ( bcount <= 0 ) - return 0; - - if ( bcount > (this->buf_size - this->buf_pos) ) - bcount = (this->buf_size - this->buf_pos); - - xine_fast_memcpy(data, this->buf + this->buf_pos, bcount); - this->buf_pos += bcount; - - return bcount; -} - -static uint32_t xine_buffer_get_pos(void *const this_gen) { - wavpack_decoder_t *const this = (wavpack_decoder_t*)this_gen; - return this->buf_pos; -} - -static int xine_buffer_set_pos_rel(void *const this_gen, const int32_t delta, - const int mode) { - wavpack_decoder_t *const this = (wavpack_decoder_t*)this_gen; - - switch(mode) { - case SEEK_SET: - if ( delta < 0 || delta > this->buf_size ) - return -1; - - this->buf_pos = delta; - return 0; - case SEEK_CUR: - if ( (this->buf_pos+delta) < 0 || (this->buf_pos+delta) > this->buf_size ) - return -1; - - this->buf_pos += delta; - return 0; - case SEEK_END: - if ( delta < 0 || delta > this->buf_size ) - return -1; - - this->buf_pos = this->buf_size - delta; - - return 0; - } -} - -static int xine_buffer_set_pos_abs(void *const this_gen, const uint32_t pos) { - return xine_buffer_set_pos_rel(this_gen, pos, SEEK_SET); -} - -static int xine_buffer_push_back_byte(void *const this_gen, const int c) { - if ( ! xine_buffer_set_pos_rel(this_gen, -1, SEEK_CUR) ) - return EOF; - return c; -} - -static uint32_t xine_buffer_get_length(void *const this_gen) { - wavpack_decoder_t *const this = (wavpack_decoder_t*)this_gen; - return this->buf_size; -} - -static int xine_buffer_can_seek(void *const this_gen) { - return 1; -} - -static int32_t xine_buffer_write_bytes(__attr_unused void *const id, - __attr_unused void *const data, - __attr_unused const int32_t bcount) { - lprintf("xine_buffer_write_bytes: access is read-only.\n"); - return 0; -} - -/* Wavpack plugin functions */ -static void wavpack_reset (audio_decoder_t *const this_gen) -{ - wavpack_decoder_t *const this = (wavpack_decoder_t *) this_gen; - - this->buf_pos = 0; -} - -static void wavpack_discontinuity (audio_decoder_t *const this_gen) -{ - /* wavpack_decoder_t *this = (wavpack_decoder_t *) this_gen; */ - - lprintf("Discontinuity!\n"); -} - -static void wavpack_decode_data (audio_decoder_t *const this_gen, buf_element_t *const buf) -{ - wavpack_decoder_t *const this = (wavpack_decoder_t *) this_gen; - - /* We are getting the stream header, open up the audio - * device, and collect information about the stream - */ - if (buf->decoder_flags & BUF_FLAG_STDHEADER) - { - int mode = AO_CAP_MODE_MONO; - - this->sample_rate = buf->decoder_info[1]; - _x_assert(buf->decoder_info[2] <= 32); - this->bits_per_sample = buf->decoder_info[2]; - _x_assert(buf->decoder_info[3] <= 8); - this->channels = buf->decoder_info[3]; - - mode = _x_ao_channels2mode(this->channels); - - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, - "WavPack"); - - if (!this->output_open) - { - this->output_open = this->stream->audio_out->open ( - this->stream->audio_out, - this->stream, - this->bits_per_sample, - this->sample_rate, - mode) ? 1 : 0; - } - this->buf_pos = 0; - } else if (this->output_open) { - /* This isn't a header frame and we have opened the output device */ - - /* What we have buffered so far, and what is coming in - * is larger than our buffer - */ - if (this->buf_pos + buf->size > this->buf_size) - { - this->buf_size += 2 * buf->size; - this->buf = realloc (this->buf, this->buf_size); - lprintf("reallocating buffer to %zd\n", this->buf_size); - } - - xine_fast_memcpy (&this->buf[this->buf_pos], buf->content, buf->size); - this->buf_pos += buf->size; - - if ( buf->decoder_flags & BUF_FLAG_FRAME_END ) { - static WavpackStreamReader wavpack_buffer_reader = { - .read_bytes = xine_buffer_read_bytes, - .get_pos = xine_buffer_get_pos, - .set_pos_abs = xine_buffer_set_pos_abs, - .set_pos_rel = xine_buffer_set_pos_rel, - .push_back_byte = xine_buffer_push_back_byte, - .get_length = xine_buffer_get_length, - .can_seek = xine_buffer_can_seek, - .write_bytes = xine_buffer_write_bytes - }; - - WavpackContext *ctx = NULL; - /* Current version of wavpack (4.40) does not write more than this */ - char error[256] = { 0, }; - int32_t samples_left; uint32_t samples_total; - const wvheader_t *header = (const wvheader_t*)this->buf; - - this->buf_pos = 0; - - if ( le2me_32(header->samples_count) == 0 ) return; - - ctx = WavpackOpenFileInputEx(&wavpack_buffer_reader, this, NULL, error, OPEN_STREAMING, 0); - if ( ! ctx ) { - lprintf("unable to open the stream: %s\n", error); - this->buf_pos = 0; - return; - } - - samples_left = samples_total = header->samples_count; - while ( samples_left > 0 ) { - uint32_t buf_samples, decoded_count; - audio_buffer_t *audio_buffer = this->stream->audio_out->get_buffer(this->stream->audio_out); - int32_t *decoded; - int i; - - buf_samples = audio_buffer->mem_size / (this->channels * (this->bits_per_sample/8)); - if ( buf_samples > samples_left ) buf_samples = samples_left; - - decoded = alloca(buf_samples * this->channels * sizeof(int32_t)); - - decoded_count = WavpackUnpackSamples(ctx, decoded, buf_samples); - if ( decoded_count == 0 && *error ) { - lprintf("Error during decode: %s\n", error); - this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, NULL); - break; - } - - if ( decoded_count == 0 ) { - lprintf("Finished decoding, but still %d samples left?\n", samples_left); - this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, NULL); - break; - } - - lprintf("Decoded %d samples\n", buf_samples); - - samples_left -= decoded_count; - - audio_buffer->num_frames = decoded_count; - audio_buffer->vpts = 0; /* TODO: Fix the pts calculation */ - // audio_buffer->vpts = (buf->pts * (samples_total-samples_left)) / samples_total; - lprintf("Audio buffer with pts %"PRId64"\n", audio_buffer->vpts); - - switch(this->bits_per_sample) { - case 8: { - int8_t *data8 = (int8_t*)audio_buffer->mem; - for(i = 0; i < decoded_count*this->channels; i++) - data8[i] = decoded[i]; - } - break; - case 16: { - int16_t *data16 = (int16_t*)audio_buffer->mem; - for(i = 0; i < decoded_count*this->channels; i++) - data16[i] = decoded[i]; - } - } - - this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, this->stream); - } - - WavpackCloseFile(ctx); - this->buf_pos = 0; - } - } -} - -static void wavpack_dispose (audio_decoder_t *this_gen) { - wavpack_decoder_t *this = (wavpack_decoder_t *) this_gen; - - if (this->output_open) - this->stream->audio_out->close (this->stream->audio_out, this->stream); - - free(this->buf); - - free (this_gen); -} - -static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stream_t *stream) { - wavpack_decoder_t * const this = (wavpack_decoder_t *) xine_xmalloc (sizeof (wavpack_decoder_t)); - - this->audio_decoder.decode_data = wavpack_decode_data; - this->audio_decoder.reset = wavpack_reset; - this->audio_decoder.discontinuity = wavpack_discontinuity; - this->audio_decoder.dispose = wavpack_dispose; - this->stream = stream; - - this->buf = NULL; - this->buf_size = 0; - - return (audio_decoder_t *) this; -} - -/* - * wavpack plugin class - */ - -static char *get_identifier (audio_decoder_class_t *this) { - return "wavpackdec"; -} - -static char *get_description (audio_decoder_class_t *this) { - return "wavpack audio decoder plugin"; -} - -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - -void *decoder_wavpack_init_plugin (xine_t *xine, void *data) { - wavpack_class_t *this; - - this = (wavpack_class_t *) xine_xmalloc (sizeof (wavpack_class_t)); - - this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; - this->decoder_class.dispose = dispose_class; - - return this; -} diff --git a/src/combined/demux_wavpack.c b/src/combined/demux_wavpack.c deleted file mode 100644 index 6a0e33e19..000000000 --- a/src/combined/demux_wavpack.c +++ /dev/null @@ -1,414 +0,0 @@ -/* - * Copyright (C) 2006-2007 the xine project - * - * This file is part of xine, a free video player. - * - * xine is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * xine 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * xine interface to libwavpack by Diego Pettenò - * - * $Id: demux_wavpack.c,v 1.11 2007/03/17 07:34:02 dgp85 Exp $ - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#define LOG_MODULE "demux_wavpack" -#define LOG_VERBOSE - -#include "xine_internal.h" -#include "xineutils.h" -#include "demux.h" -#include "bswap.h" -#include "attributes.h" - -#include -#include "combined_wavpack.h" - -typedef struct { - demux_plugin_t demux_plugin; - - xine_stream_t *stream; - fifo_buffer_t *audio_fifo; - input_plugin_t *input; - int status; - - uint32_t current_sample; - uint32_t samples; - uint32_t samplerate; - uint16_t bits_per_sample:6; - uint16_t channels:4; -} demux_wv_t; - -typedef struct { - demux_class_t demux_class; -} demux_wv_class_t; - -static int32_t xine_input_read_bytes(void *const this_gen, void *const data, - const int32_t bcount) { - input_plugin_t *const this = (input_plugin_t*)this_gen; - return this->read(this, data, bcount); -} - -static uint32_t xine_input_get_pos(void *const this_gen) { - input_plugin_t *const this = (input_plugin_t*)this_gen; - return this->get_current_pos(this); -} - -static int xine_input_set_pos_abs(void *const this_gen, const uint32_t pos) { - input_plugin_t *const this = (input_plugin_t*)this_gen; - return this->seek(this, pos, SEEK_SET); -} - -static int xine_input_set_pos_rel(void *const this_gen, const int32_t delta, - const int mode) { - input_plugin_t *const this = (input_plugin_t*)this_gen; - return this->seek(this, delta, mode); -} - -static int xine_input_push_back_byte(void *const this_gen, const int c) { - input_plugin_t *const this = (input_plugin_t*)this_gen; - if ( this->seek(this, -1, SEEK_CUR) ) { - return c; - } else { - lprintf("xine_input_push_back_byte: unable to seek.\n"); - return EOF; - } -} - -static uint32_t xine_input_get_length(void *const this_gen) { - input_plugin_t *const this = (input_plugin_t*)this_gen; - return this->get_length(this); -} - -static int xine_input_can_seek(void *const this_gen) { - input_plugin_t *const this = (input_plugin_t*)this_gen; - return INPUT_IS_SEEKABLE(this); -} - -static int32_t xine_input_write_bytes(__attr_unused void *const id, - __attr_unused void *const data, - __attr_unused const int32_t bcount) { - lprintf("xine_input_write_bytes: acces is read-only.\n"); - return 0; -} - -static WavpackStreamReader wavpack_input_reader = { - .read_bytes = xine_input_read_bytes, - .get_pos = xine_input_get_pos, - .set_pos_abs = xine_input_set_pos_abs, - .set_pos_rel = xine_input_set_pos_rel, - .push_back_byte = xine_input_push_back_byte, - .get_length = xine_input_get_length, - .can_seek = xine_input_can_seek, - .write_bytes = xine_input_write_bytes -}; - -static int open_wv_file(demux_wv_t *const this) { - WavpackContext *ctx = NULL; - char error[256]; /* Current version of wavpack (4.31) does not write more than this */ - wvheader_t header; - uint32_t tmp; - - /* Right now we don't support non-seekable streams */ - if (! INPUT_IS_SEEKABLE(this->input) ) { - lprintf("open_wv_file: non-seekable inputs aren't supported yet.\n"); - return 0; - } - - /* Read the file header */ - if (_x_demux_read_header(this->input, (uint8_t*)(&header), sizeof(wvheader_t)) != sizeof(wvheader_t)) - return 0; - - /* Validate header, we currently support only Wavpack 4 */ - if ( header.idcode != wvpk_signature || (le2me_16(header.wv_version) >> 8) != 4 ) - return 0; - - /* Rewind */ - this->input->seek(this->input, 0, SEEK_SET); - - ctx = WavpackOpenFileInputEx(&wavpack_input_reader, this->input, NULL, error, 0, 0); - if ( ! ctx ) { - lprintf("xine_open_wavpack_input: unable to open the stream: %s\n", error); - return 0; - } - - this->current_sample = 0; - this->samples = WavpackGetNumSamples(ctx); - lprintf("number of samples: %u\n", this->samples); - this->samplerate = WavpackGetSampleRate(ctx); - lprintf("samplerate: %u Hz\n", this->samplerate); - - tmp = WavpackGetBitsPerSample(ctx); _x_assert(tmp <= 32); - lprintf("bits_per_sample: %u\n", tmp); - this->bits_per_sample = tmp; - - tmp = WavpackGetNumChannels(ctx); _x_assert(tmp <= 8); - lprintf("channels: %u\n", tmp); - this->channels = tmp; - - _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, - wvpk_signature); - _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, - this->channels); - _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, - this->samplerate); - _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, - this->bits_per_sample); - - WavpackCloseFile(ctx); - this->input->seek(this->input, SEEK_SET, 0); - - return 1; -} - -static int demux_wv_send_chunk(demux_plugin_t *const this_gen) { - demux_wv_t *const this = (demux_wv_t *) this_gen; - uint32_t bytes_to_read; uint8_t header_sent = 0; - wvheader_t header; - - lprintf("new frame\n"); - - /* Check if we've finished */ - if (this->current_sample >= this->samples) { - lprintf("all frames read\n"); - this->status = DEMUX_FINISHED; - return this->status; - } - - lprintf("current sample: %u\n", this->current_sample); - - do { - if ( this->input->read(this->input, (uint8_t*)(&header), sizeof(wvheader_t)) != sizeof(wvheader_t) ) { - this->status = DEMUX_FINISHED; - return this->status; - } - - /* The size of the block is «of course» minus 8, and - it also includes the size of the header. - */ - bytes_to_read = le2me_32(header.block_size) + 8 - sizeof(wvheader_t); - - lprintf("demux_wavpack: going to read %u bytes.\n", bytes_to_read); - - while(bytes_to_read) { - off_t bytes_read = 0, bytes_to_read_now, offset = 0; - buf_element_t *buf = NULL; - int64_t input_time_guess; - - /* Get a buffer */ - buf = this->audio_fifo->buffer_pool_alloc(this->audio_fifo); - buf->type = BUF_AUDIO_WAVPACK; - buf->decoder_flags = 0; - - /* Set normalised position */ - buf->extra_info->input_normpos = - (int) ((double) this->input->get_current_pos(this->input) * 65535 / - this->input->get_length(this->input)); - - buf->pts = (((this->current_sample) / this->samplerate))*90000; - lprintf("Sending buffer with PTS %"PRId64"\n", buf->pts); - - /* Set time */ - input_time_guess = this->samples; - input_time_guess /= this->samplerate; - input_time_guess *= 1000; - input_time_guess *= buf->extra_info->input_normpos; - input_time_guess /= 65535; - buf->extra_info->input_time = input_time_guess; - - bytes_to_read_now = ( bytes_to_read > buf->max_size ) ? buf->max_size : bytes_to_read; - if ( ! header_sent ) { - bytes_to_read_now -= (offset = sizeof(wvheader_t)); - - header_sent = 1; - xine_fast_memcpy(buf->content, &header, sizeof(wvheader_t)); - } - - bytes_read = this->input->read(this->input, &buf->content[offset], bytes_to_read_now); - - buf->size = offset + bytes_read; - - bytes_to_read -= bytes_read; - - if ( bytes_to_read <= 0 && (le2me_32(header.flags) & FINAL_BLOCK) == FINAL_BLOCK) - buf->decoder_flags |= BUF_FLAG_FRAME_END; - - this->audio_fifo->put(this->audio_fifo, buf); - } - } while ( (le2me_32(header.flags) & FINAL_BLOCK) != FINAL_BLOCK ); - - this->current_sample += le2me_32(header.samples_count); - - return this->status; -} - -static void demux_wv_send_headers(demux_plugin_t *const this_gen) { - demux_wv_t *const this = (demux_wv_t *) this_gen; - buf_element_t *buf; - - this->audio_fifo = this->stream->audio_fifo; - - this->status = DEMUX_OK; - - /* Send start buffers */ - _x_demux_control_start(this->stream); - - /* Send header to decoder */ - if (this->audio_fifo) { - buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); - - buf->type = BUF_AUDIO_WAVPACK; - buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END; - buf->decoder_info[0] = this->input->get_length(this->input); - buf->decoder_info[1] = this->samplerate; - buf->decoder_info[2] = this->bits_per_sample; - buf->decoder_info[3] = this->channels; - - buf->size = 0; - - this->audio_fifo->put (this->audio_fifo, buf); - } -} - -static int demux_wv_seek (demux_plugin_t *this_gen, - off_t start_pos, int start_time, int playing) { - demux_wv_t *const this = (demux_wv_t *) this_gen; - - /* If thread is not running, initialize demuxer */ - if( !playing ) { - - /* send new pts */ - _x_demux_control_newpts(this->stream, 0, 0); - - this->status = DEMUX_OK; - - } - - return this->status; -} - -static void demux_wv_dispose (demux_plugin_t *const this_gen) { - demux_wv_t *const this = (demux_wv_t *) this_gen; - - free(this); -} - -static int demux_wv_get_status (demux_plugin_t *const this_gen) { - const demux_wv_t *const this = (const demux_wv_t *) this_gen; - - return this->status; -} - -static int demux_wv_get_stream_length (demux_plugin_t *const this_gen) { - const demux_wv_t *const this = (demux_wv_t *) this_gen; - - return (this->samples*1000) / this->samplerate; -} - -static uint32_t demux_wv_get_capabilities(demux_plugin_t *const this_gen) { - return DEMUX_CAP_NOCAP; -} - -static int demux_wv_get_optional_data(demux_plugin_t *const this_gen, - void *data, const int data_type) { - return DEMUX_OPTIONAL_UNSUPPORTED; -} - -static demux_plugin_t *open_plugin (demux_class_t *const class_gen, - xine_stream_t *const stream, - input_plugin_t *const input) { - demux_wv_t *const this = xine_xmalloc (sizeof (demux_wv_t)); - this->stream = stream; - this->input = input; - - this->demux_plugin.send_headers = demux_wv_send_headers; - this->demux_plugin.send_chunk = demux_wv_send_chunk; - this->demux_plugin.seek = demux_wv_seek; - this->demux_plugin.dispose = demux_wv_dispose; - this->demux_plugin.get_status = demux_wv_get_status; - this->demux_plugin.get_stream_length = demux_wv_get_stream_length; - this->demux_plugin.get_capabilities = demux_wv_get_capabilities; - this->demux_plugin.get_optional_data = demux_wv_get_optional_data; - this->demux_plugin.demux_class = class_gen; - - this->status = DEMUX_FINISHED; - switch (stream->content_detection_method) { - - case METHOD_BY_EXTENSION: { - const char *const mrl = input->get_mrl (input); - const char *const extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* Falling through is intended */ - - case METHOD_BY_CONTENT: - case METHOD_EXPLICIT: - - if (!open_wv_file(this)) { - free (this); - return NULL; - } - - break; - - default: - free (this); - return NULL; - } - - return &this->demux_plugin; -} - -static const char *get_description (demux_class_t *const this_gen) { - return "Wavpack demux plugin"; -} - -static const char *get_identifier (demux_class_t *const this_gen) { - return "Wavpack"; -} - -static const char *get_extensions (demux_class_t *const this_gen) { - return "wv"; -} - -static const char *get_mimetypes (demux_class_t *const this_gen) { - return NULL; -} - -static void class_dispose (demux_class_t *const this_gen) { - demux_wv_class_t *const this = (demux_wv_class_t *) this_gen; - - free (this); -} - -void *demux_wv_init_plugin (xine_t *const xine, void *const data) { - demux_wv_class_t *const this = xine_xmalloc (sizeof (demux_wv_class_t)); - - this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; - - return this; -} diff --git a/src/combined/wavpack_combined.c b/src/combined/wavpack_combined.c new file mode 100644 index 000000000..110de2b2e --- /dev/null +++ b/src/combined/wavpack_combined.c @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2007 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * xine interface to libwavpack by Diego Pettenò + * + * $Id: combined_wavpack.c,v 1.3 2007/03/17 07:34:02 dgp85 Exp $ + */ + +#include "xine_internal.h" +#include "wavpack_combined.h" + +static const demuxer_info_t demux_info_wv = { + 0 /* priority */ +}; + +static uint32_t audio_types[] = { + BUF_AUDIO_WAVPACK, 0 + }; + +static const decoder_info_t decoder_info_wv = { + audio_types, /* supported types */ + 7 /* priority */ +}; + +const plugin_info_t xine_plugin_info[] EXPORTED = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_DEMUX, 26, "wavpack", XINE_VERSION_CODE, &demux_info_wv, demux_wv_init_plugin }, + { PLUGIN_AUDIO_DECODER, 15, "wavpackdec", XINE_VERSION_CODE, &decoder_info_wv, decoder_wavpack_init_plugin }, + { PLUGIN_NONE, 0, NULL, 0, NULL, NULL } +}; diff --git a/src/combined/wavpack_combined.h b/src/combined/wavpack_combined.h new file mode 100644 index 000000000..7688f91df --- /dev/null +++ b/src/combined/wavpack_combined.h @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2007 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * xine interface to libwavpack by Diego Pettenò + * + * $Id: combined_wavpack.h,v 1.3 2007/03/17 07:34:02 dgp85 Exp $ + */ + +#include "os_types.h" +#include "bswap.h" + +typedef struct { + uint32_t idcode; /* This should always be the string "wvpk" */ + uint32_t block_size; /* Size of the rest of the frame */ + uint16_t wv_version; /* Version of the wavpack, 0x0403 should be latest */ + uint8_t track; /* Unused, has to be 0 */ + uint8_t index; /* Unused, has to be 0 */ + uint32_t file_samples; /* (uint32_t)-1 if unknown, else the total number + of samples for the file */ + uint32_t samples_index; /* Index of the first sample in block, from the + start of the file */ + uint32_t samples_count; /* Count of samples in the current frame */ + uint32_t flags; /* Misc flags */ + uint32_t decoded_crc32; /* CRC32 of the decoded data */ +} XINE_PACKED wvheader_t; + +static const uint32_t wvpk_signature = ME_FOURCC('w', 'v', 'p', 'k'); + +void *demux_wv_init_plugin (xine_t *const xine, void *const data); +void *decoder_wavpack_init_plugin (xine_t *xine, void *data); diff --git a/src/combined/wavpack_decoder.c b/src/combined/wavpack_decoder.c new file mode 100644 index 000000000..405bf64f1 --- /dev/null +++ b/src/combined/wavpack_decoder.c @@ -0,0 +1,337 @@ +/* + * Copyright (C) 2007 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * xine interface to libwavpack by Diego Pettenò + * + * $Id: decoder_wavpack.c,v 1.14 2007/03/29 19:45:33 dgp85 Exp $ + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#define LOG_MODULE "decode_wavpack" +#define LOG_VERBOSE + +#include "xine_internal.h" +#include "attributes.h" +#include "bswap.h" + +#include +#include "wavpack_combined.h" + +typedef struct { + audio_decoder_class_t decoder_class; +} wavpack_class_t; + +typedef struct { + audio_decoder_t audio_decoder; + + xine_stream_t *stream; + + uint8_t *buf; + size_t buf_size; + size_t buf_pos; + + int sample_rate; + uint16_t bits_per_sample:6; + uint16_t channels:4; + + uint16_t output_open:1; + +} wavpack_decoder_t; + +/* Wrapper functions for Wavpack */ +static int32_t xine_buffer_read_bytes(void *const this_gen, void *const data, + int32_t bcount) { + wavpack_decoder_t *const this = (wavpack_decoder_t*)this_gen; + + if ( bcount <= 0 ) + return 0; + + if ( bcount > (this->buf_size - this->buf_pos) ) + bcount = (this->buf_size - this->buf_pos); + + xine_fast_memcpy(data, this->buf + this->buf_pos, bcount); + this->buf_pos += bcount; + + return bcount; +} + +static uint32_t xine_buffer_get_pos(void *const this_gen) { + wavpack_decoder_t *const this = (wavpack_decoder_t*)this_gen; + return this->buf_pos; +} + +static int xine_buffer_set_pos_rel(void *const this_gen, const int32_t delta, + const int mode) { + wavpack_decoder_t *const this = (wavpack_decoder_t*)this_gen; + + switch(mode) { + case SEEK_SET: + if ( delta < 0 || delta > this->buf_size ) + return -1; + + this->buf_pos = delta; + return 0; + case SEEK_CUR: + if ( (this->buf_pos+delta) < 0 || (this->buf_pos+delta) > this->buf_size ) + return -1; + + this->buf_pos += delta; + return 0; + case SEEK_END: + if ( delta < 0 || delta > this->buf_size ) + return -1; + + this->buf_pos = this->buf_size - delta; + + return 0; + } +} + +static int xine_buffer_set_pos_abs(void *const this_gen, const uint32_t pos) { + return xine_buffer_set_pos_rel(this_gen, pos, SEEK_SET); +} + +static int xine_buffer_push_back_byte(void *const this_gen, const int c) { + if ( ! xine_buffer_set_pos_rel(this_gen, -1, SEEK_CUR) ) + return EOF; + return c; +} + +static uint32_t xine_buffer_get_length(void *const this_gen) { + wavpack_decoder_t *const this = (wavpack_decoder_t*)this_gen; + return this->buf_size; +} + +static int xine_buffer_can_seek(void *const this_gen) { + return 1; +} + +static int32_t xine_buffer_write_bytes(__attr_unused void *const id, + __attr_unused void *const data, + __attr_unused const int32_t bcount) { + lprintf("xine_buffer_write_bytes: access is read-only.\n"); + return 0; +} + +/* Wavpack plugin functions */ +static void wavpack_reset (audio_decoder_t *const this_gen) +{ + wavpack_decoder_t *const this = (wavpack_decoder_t *) this_gen; + + this->buf_pos = 0; +} + +static void wavpack_discontinuity (audio_decoder_t *const this_gen) +{ + /* wavpack_decoder_t *this = (wavpack_decoder_t *) this_gen; */ + + lprintf("Discontinuity!\n"); +} + +static void wavpack_decode_data (audio_decoder_t *const this_gen, buf_element_t *const buf) +{ + wavpack_decoder_t *const this = (wavpack_decoder_t *) this_gen; + + /* We are getting the stream header, open up the audio + * device, and collect information about the stream + */ + if (buf->decoder_flags & BUF_FLAG_STDHEADER) + { + int mode = AO_CAP_MODE_MONO; + + this->sample_rate = buf->decoder_info[1]; + _x_assert(buf->decoder_info[2] <= 32); + this->bits_per_sample = buf->decoder_info[2]; + _x_assert(buf->decoder_info[3] <= 8); + this->channels = buf->decoder_info[3]; + + mode = _x_ao_channels2mode(this->channels); + + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, + "WavPack"); + + if (!this->output_open) + { + this->output_open = this->stream->audio_out->open ( + this->stream->audio_out, + this->stream, + this->bits_per_sample, + this->sample_rate, + mode) ? 1 : 0; + } + this->buf_pos = 0; + } else if (this->output_open) { + /* This isn't a header frame and we have opened the output device */ + + /* What we have buffered so far, and what is coming in + * is larger than our buffer + */ + if (this->buf_pos + buf->size > this->buf_size) + { + this->buf_size += 2 * buf->size; + this->buf = realloc (this->buf, this->buf_size); + lprintf("reallocating buffer to %zd\n", this->buf_size); + } + + xine_fast_memcpy (&this->buf[this->buf_pos], buf->content, buf->size); + this->buf_pos += buf->size; + + if ( buf->decoder_flags & BUF_FLAG_FRAME_END ) { + static WavpackStreamReader wavpack_buffer_reader = { + .read_bytes = xine_buffer_read_bytes, + .get_pos = xine_buffer_get_pos, + .set_pos_abs = xine_buffer_set_pos_abs, + .set_pos_rel = xine_buffer_set_pos_rel, + .push_back_byte = xine_buffer_push_back_byte, + .get_length = xine_buffer_get_length, + .can_seek = xine_buffer_can_seek, + .write_bytes = xine_buffer_write_bytes + }; + + WavpackContext *ctx = NULL; + /* Current version of wavpack (4.40) does not write more than this */ + char error[256] = { 0, }; + int32_t samples_left; uint32_t samples_total; + const wvheader_t *header = (const wvheader_t*)this->buf; + + this->buf_pos = 0; + + if ( le2me_32(header->samples_count) == 0 ) return; + + ctx = WavpackOpenFileInputEx(&wavpack_buffer_reader, this, NULL, error, OPEN_STREAMING, 0); + if ( ! ctx ) { + lprintf("unable to open the stream: %s\n", error); + this->buf_pos = 0; + return; + } + + samples_left = samples_total = header->samples_count; + while ( samples_left > 0 ) { + uint32_t buf_samples, decoded_count; + audio_buffer_t *audio_buffer = this->stream->audio_out->get_buffer(this->stream->audio_out); + int32_t *decoded; + int i; + + buf_samples = audio_buffer->mem_size / (this->channels * (this->bits_per_sample/8)); + if ( buf_samples > samples_left ) buf_samples = samples_left; + + decoded = alloca(buf_samples * this->channels * sizeof(int32_t)); + + decoded_count = WavpackUnpackSamples(ctx, decoded, buf_samples); + if ( decoded_count == 0 && *error ) { + lprintf("Error during decode: %s\n", error); + this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, NULL); + break; + } + + if ( decoded_count == 0 ) { + lprintf("Finished decoding, but still %d samples left?\n", samples_left); + this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, NULL); + break; + } + + lprintf("Decoded %d samples\n", buf_samples); + + samples_left -= decoded_count; + + audio_buffer->num_frames = decoded_count; + audio_buffer->vpts = 0; /* TODO: Fix the pts calculation */ + // audio_buffer->vpts = (buf->pts * (samples_total-samples_left)) / samples_total; + lprintf("Audio buffer with pts %"PRId64"\n", audio_buffer->vpts); + + switch(this->bits_per_sample) { + case 8: { + int8_t *data8 = (int8_t*)audio_buffer->mem; + for(i = 0; i < decoded_count*this->channels; i++) + data8[i] = decoded[i]; + } + break; + case 16: { + int16_t *data16 = (int16_t*)audio_buffer->mem; + for(i = 0; i < decoded_count*this->channels; i++) + data16[i] = decoded[i]; + } + } + + this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, this->stream); + } + + WavpackCloseFile(ctx); + this->buf_pos = 0; + } + } +} + +static void wavpack_dispose (audio_decoder_t *this_gen) { + wavpack_decoder_t *this = (wavpack_decoder_t *) this_gen; + + if (this->output_open) + this->stream->audio_out->close (this->stream->audio_out, this->stream); + + free(this->buf); + + free (this_gen); +} + +static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stream_t *stream) { + wavpack_decoder_t * const this = (wavpack_decoder_t *) xine_xmalloc (sizeof (wavpack_decoder_t)); + + this->audio_decoder.decode_data = wavpack_decode_data; + this->audio_decoder.reset = wavpack_reset; + this->audio_decoder.discontinuity = wavpack_discontinuity; + this->audio_decoder.dispose = wavpack_dispose; + this->stream = stream; + + this->buf = NULL; + this->buf_size = 0; + + return (audio_decoder_t *) this; +} + +/* + * wavpack plugin class + */ + +static char *get_identifier (audio_decoder_class_t *this) { + return "wavpackdec"; +} + +static char *get_description (audio_decoder_class_t *this) { + return "wavpack audio decoder plugin"; +} + +static void dispose_class (audio_decoder_class_t *this) { + free (this); +} + +void *decoder_wavpack_init_plugin (xine_t *xine, void *data) { + wavpack_class_t *this; + + this = (wavpack_class_t *) xine_xmalloc (sizeof (wavpack_class_t)); + + this->decoder_class.open_plugin = open_plugin; + this->decoder_class.get_identifier = get_identifier; + this->decoder_class.get_description = get_description; + this->decoder_class.dispose = dispose_class; + + return this; +} diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c new file mode 100644 index 000000000..da69731b1 --- /dev/null +++ b/src/combined/wavpack_demuxer.c @@ -0,0 +1,414 @@ +/* + * Copyright (C) 2006-2007 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * xine interface to libwavpack by Diego Pettenò + * + * $Id: demux_wavpack.c,v 1.11 2007/03/17 07:34:02 dgp85 Exp $ + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#define LOG_MODULE "demux_wavpack" +#define LOG_VERBOSE + +#include "xine_internal.h" +#include "xineutils.h" +#include "demux.h" +#include "bswap.h" +#include "attributes.h" + +#include +#include "wavpack_combined.h" + +typedef struct { + demux_plugin_t demux_plugin; + + xine_stream_t *stream; + fifo_buffer_t *audio_fifo; + input_plugin_t *input; + int status; + + uint32_t current_sample; + uint32_t samples; + uint32_t samplerate; + uint16_t bits_per_sample:6; + uint16_t channels:4; +} demux_wv_t; + +typedef struct { + demux_class_t demux_class; +} demux_wv_class_t; + +static int32_t xine_input_read_bytes(void *const this_gen, void *const data, + const int32_t bcount) { + input_plugin_t *const this = (input_plugin_t*)this_gen; + return this->read(this, data, bcount); +} + +static uint32_t xine_input_get_pos(void *const this_gen) { + input_plugin_t *const this = (input_plugin_t*)this_gen; + return this->get_current_pos(this); +} + +static int xine_input_set_pos_abs(void *const this_gen, const uint32_t pos) { + input_plugin_t *const this = (input_plugin_t*)this_gen; + return this->seek(this, pos, SEEK_SET); +} + +static int xine_input_set_pos_rel(void *const this_gen, const int32_t delta, + const int mode) { + input_plugin_t *const this = (input_plugin_t*)this_gen; + return this->seek(this, delta, mode); +} + +static int xine_input_push_back_byte(void *const this_gen, const int c) { + input_plugin_t *const this = (input_plugin_t*)this_gen; + if ( this->seek(this, -1, SEEK_CUR) ) { + return c; + } else { + lprintf("xine_input_push_back_byte: unable to seek.\n"); + return EOF; + } +} + +static uint32_t xine_input_get_length(void *const this_gen) { + input_plugin_t *const this = (input_plugin_t*)this_gen; + return this->get_length(this); +} + +static int xine_input_can_seek(void *const this_gen) { + input_plugin_t *const this = (input_plugin_t*)this_gen; + return INPUT_IS_SEEKABLE(this); +} + +static int32_t xine_input_write_bytes(__attr_unused void *const id, + __attr_unused void *const data, + __attr_unused const int32_t bcount) { + lprintf("xine_input_write_bytes: acces is read-only.\n"); + return 0; +} + +static WavpackStreamReader wavpack_input_reader = { + .read_bytes = xine_input_read_bytes, + .get_pos = xine_input_get_pos, + .set_pos_abs = xine_input_set_pos_abs, + .set_pos_rel = xine_input_set_pos_rel, + .push_back_byte = xine_input_push_back_byte, + .get_length = xine_input_get_length, + .can_seek = xine_input_can_seek, + .write_bytes = xine_input_write_bytes +}; + +static int open_wv_file(demux_wv_t *const this) { + WavpackContext *ctx = NULL; + char error[256]; /* Current version of wavpack (4.31) does not write more than this */ + wvheader_t header; + uint32_t tmp; + + /* Right now we don't support non-seekable streams */ + if (! INPUT_IS_SEEKABLE(this->input) ) { + lprintf("open_wv_file: non-seekable inputs aren't supported yet.\n"); + return 0; + } + + /* Read the file header */ + if (_x_demux_read_header(this->input, (uint8_t*)(&header), sizeof(wvheader_t)) != sizeof(wvheader_t)) + return 0; + + /* Validate header, we currently support only Wavpack 4 */ + if ( header.idcode != wvpk_signature || (le2me_16(header.wv_version) >> 8) != 4 ) + return 0; + + /* Rewind */ + this->input->seek(this->input, 0, SEEK_SET); + + ctx = WavpackOpenFileInputEx(&wavpack_input_reader, this->input, NULL, error, 0, 0); + if ( ! ctx ) { + lprintf("xine_open_wavpack_input: unable to open the stream: %s\n", error); + return 0; + } + + this->current_sample = 0; + this->samples = WavpackGetNumSamples(ctx); + lprintf("number of samples: %u\n", this->samples); + this->samplerate = WavpackGetSampleRate(ctx); + lprintf("samplerate: %u Hz\n", this->samplerate); + + tmp = WavpackGetBitsPerSample(ctx); _x_assert(tmp <= 32); + lprintf("bits_per_sample: %u\n", tmp); + this->bits_per_sample = tmp; + + tmp = WavpackGetNumChannels(ctx); _x_assert(tmp <= 8); + lprintf("channels: %u\n", tmp); + this->channels = tmp; + + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, + wvpk_signature); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + this->channels); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + this->samplerate); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + this->bits_per_sample); + + WavpackCloseFile(ctx); + this->input->seek(this->input, SEEK_SET, 0); + + return 1; +} + +static int demux_wv_send_chunk(demux_plugin_t *const this_gen) { + demux_wv_t *const this = (demux_wv_t *) this_gen; + uint32_t bytes_to_read; uint8_t header_sent = 0; + wvheader_t header; + + lprintf("new frame\n"); + + /* Check if we've finished */ + if (this->current_sample >= this->samples) { + lprintf("all frames read\n"); + this->status = DEMUX_FINISHED; + return this->status; + } + + lprintf("current sample: %u\n", this->current_sample); + + do { + if ( this->input->read(this->input, (uint8_t*)(&header), sizeof(wvheader_t)) != sizeof(wvheader_t) ) { + this->status = DEMUX_FINISHED; + return this->status; + } + + /* The size of the block is «of course» minus 8, and + it also includes the size of the header. + */ + bytes_to_read = le2me_32(header.block_size) + 8 - sizeof(wvheader_t); + + lprintf("demux_wavpack: going to read %u bytes.\n", bytes_to_read); + + while(bytes_to_read) { + off_t bytes_read = 0, bytes_to_read_now, offset = 0; + buf_element_t *buf = NULL; + int64_t input_time_guess; + + /* Get a buffer */ + buf = this->audio_fifo->buffer_pool_alloc(this->audio_fifo); + buf->type = BUF_AUDIO_WAVPACK; + buf->decoder_flags = 0; + + /* Set normalised position */ + buf->extra_info->input_normpos = + (int) ((double) this->input->get_current_pos(this->input) * 65535 / + this->input->get_length(this->input)); + + buf->pts = (((this->current_sample) / this->samplerate))*90000; + lprintf("Sending buffer with PTS %"PRId64"\n", buf->pts); + + /* Set time */ + input_time_guess = this->samples; + input_time_guess /= this->samplerate; + input_time_guess *= 1000; + input_time_guess *= buf->extra_info->input_normpos; + input_time_guess /= 65535; + buf->extra_info->input_time = input_time_guess; + + bytes_to_read_now = ( bytes_to_read > buf->max_size ) ? buf->max_size : bytes_to_read; + if ( ! header_sent ) { + bytes_to_read_now -= (offset = sizeof(wvheader_t)); + + header_sent = 1; + xine_fast_memcpy(buf->content, &header, sizeof(wvheader_t)); + } + + bytes_read = this->input->read(this->input, &buf->content[offset], bytes_to_read_now); + + buf->size = offset + bytes_read; + + bytes_to_read -= bytes_read; + + if ( bytes_to_read <= 0 && (le2me_32(header.flags) & FINAL_BLOCK) == FINAL_BLOCK) + buf->decoder_flags |= BUF_FLAG_FRAME_END; + + this->audio_fifo->put(this->audio_fifo, buf); + } + } while ( (le2me_32(header.flags) & FINAL_BLOCK) != FINAL_BLOCK ); + + this->current_sample += le2me_32(header.samples_count); + + return this->status; +} + +static void demux_wv_send_headers(demux_plugin_t *const this_gen) { + demux_wv_t *const this = (demux_wv_t *) this_gen; + buf_element_t *buf; + + this->audio_fifo = this->stream->audio_fifo; + + this->status = DEMUX_OK; + + /* Send start buffers */ + _x_demux_control_start(this->stream); + + /* Send header to decoder */ + if (this->audio_fifo) { + buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); + + buf->type = BUF_AUDIO_WAVPACK; + buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END; + buf->decoder_info[0] = this->input->get_length(this->input); + buf->decoder_info[1] = this->samplerate; + buf->decoder_info[2] = this->bits_per_sample; + buf->decoder_info[3] = this->channels; + + buf->size = 0; + + this->audio_fifo->put (this->audio_fifo, buf); + } +} + +static int demux_wv_seek (demux_plugin_t *this_gen, + off_t start_pos, int start_time, int playing) { + demux_wv_t *const this = (demux_wv_t *) this_gen; + + /* If thread is not running, initialize demuxer */ + if( !playing ) { + + /* send new pts */ + _x_demux_control_newpts(this->stream, 0, 0); + + this->status = DEMUX_OK; + + } + + return this->status; +} + +static void demux_wv_dispose (demux_plugin_t *const this_gen) { + demux_wv_t *const this = (demux_wv_t *) this_gen; + + free(this); +} + +static int demux_wv_get_status (demux_plugin_t *const this_gen) { + const demux_wv_t *const this = (const demux_wv_t *) this_gen; + + return this->status; +} + +static int demux_wv_get_stream_length (demux_plugin_t *const this_gen) { + const demux_wv_t *const this = (demux_wv_t *) this_gen; + + return (this->samples*1000) / this->samplerate; +} + +static uint32_t demux_wv_get_capabilities(demux_plugin_t *const this_gen) { + return DEMUX_CAP_NOCAP; +} + +static int demux_wv_get_optional_data(demux_plugin_t *const this_gen, + void *data, const int data_type) { + return DEMUX_OPTIONAL_UNSUPPORTED; +} + +static demux_plugin_t *open_plugin (demux_class_t *const class_gen, + xine_stream_t *const stream, + input_plugin_t *const input) { + demux_wv_t *const this = xine_xmalloc (sizeof (demux_wv_t)); + this->stream = stream; + this->input = input; + + this->demux_plugin.send_headers = demux_wv_send_headers; + this->demux_plugin.send_chunk = demux_wv_send_chunk; + this->demux_plugin.seek = demux_wv_seek; + this->demux_plugin.dispose = demux_wv_dispose; + this->demux_plugin.get_status = demux_wv_get_status; + this->demux_plugin.get_stream_length = demux_wv_get_stream_length; + this->demux_plugin.get_capabilities = demux_wv_get_capabilities; + this->demux_plugin.get_optional_data = demux_wv_get_optional_data; + this->demux_plugin.demux_class = class_gen; + + this->status = DEMUX_FINISHED; + switch (stream->content_detection_method) { + + case METHOD_BY_EXTENSION: { + const char *const mrl = input->get_mrl (input); + const char *const extensions = class_gen->get_extensions (class_gen); + + if (!_x_demux_check_extension (mrl, extensions)) { + free (this); + return NULL; + } + } + /* Falling through is intended */ + + case METHOD_BY_CONTENT: + case METHOD_EXPLICIT: + + if (!open_wv_file(this)) { + free (this); + return NULL; + } + + break; + + default: + free (this); + return NULL; + } + + return &this->demux_plugin; +} + +static const char *get_description (demux_class_t *const this_gen) { + return "Wavpack demux plugin"; +} + +static const char *get_identifier (demux_class_t *const this_gen) { + return "Wavpack"; +} + +static const char *get_extensions (demux_class_t *const this_gen) { + return "wv"; +} + +static const char *get_mimetypes (demux_class_t *const this_gen) { + return NULL; +} + +static void class_dispose (demux_class_t *const this_gen) { + demux_wv_class_t *const this = (demux_wv_class_t *) this_gen; + + free (this); +} + +void *demux_wv_init_plugin (xine_t *const xine, void *const data) { + demux_wv_class_t *const this = xine_xmalloc (sizeof (demux_wv_class_t)); + + this->demux_class.open_plugin = open_plugin; + this->demux_class.get_description = get_description; + this->demux_class.get_identifier = get_identifier; + this->demux_class.get_mimetypes = get_mimetypes; + this->demux_class.get_extensions = get_extensions; + this->demux_class.dispose = class_dispose; + + return this; +} -- cgit v1.2.3