From abaabe92d6485043fd1a5705818b3d4c74a4b08f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 17 Apr 2013 22:45:10 +0200 Subject: decoder_buffer: convert to C++ --- Makefile.am | 3 +- src/DecoderBuffer.cxx | 167 ++++++++++++++++++++++++++++++++++++++ src/DecoderBuffer.hxx | 105 ++++++++++++++++++++++++ src/decoder/FaadDecoderPlugin.cxx | 18 ++-- src/decoder_buffer.c | 167 -------------------------------------- src/decoder_buffer.h | 106 ------------------------ 6 files changed, 281 insertions(+), 285 deletions(-) create mode 100644 src/DecoderBuffer.cxx create mode 100644 src/DecoderBuffer.hxx delete mode 100644 src/decoder_buffer.c delete mode 100644 src/decoder_buffer.h diff --git a/Makefile.am b/Makefile.am index 8a78aa857..c0121dd00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,6 @@ mpd_headers = \ src/conf.h \ src/decoder_plugin.h \ src/decoder_command.h \ - src/decoder_buffer.h \ src/decoder_api.h \ src/decoder_plugin.h \ src/encoder_plugin.h \ @@ -455,7 +454,7 @@ libdecoder_plugins_a_SOURCES = \ src/decoder/dsf_decoder_plugin.h \ src/decoder/dsdlib.c \ src/decoder/dsdlib.h \ - src/decoder_buffer.c \ + src/DecoderBuffer.cxx src/DecoderBuffer.hxx \ src/DecoderPlugin.cxx \ src/DecoderList.cxx src/DecoderList.hxx libdecoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \ diff --git a/src/DecoderBuffer.cxx b/src/DecoderBuffer.cxx new file mode 100644 index 000000000..8e7da859b --- /dev/null +++ b/src/DecoderBuffer.cxx @@ -0,0 +1,167 @@ +/* + * Copyright (C) 2003-2013 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program 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. + * + * This program 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., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" +#include "DecoderBuffer.hxx" +#include "decoder_api.h" + +#include + +#include + +struct DecoderBuffer { + struct decoder *decoder; + struct input_stream *is; + + /** the allocated size of the buffer */ + size_t size; + + /** the current length of the buffer */ + size_t length; + + /** number of bytes already consumed at the beginning of the + buffer */ + size_t consumed; + + /** the actual buffer (dynamic size) */ + unsigned char data[sizeof(size_t)]; +}; + +DecoderBuffer * +decoder_buffer_new(struct decoder *decoder, struct input_stream *is, + size_t size) +{ + DecoderBuffer *buffer = (DecoderBuffer *) + g_malloc(sizeof(*buffer) - sizeof(buffer->data) + size); + + assert(is != nullptr); + assert(size > 0); + + buffer->decoder = decoder; + buffer->is = is; + buffer->size = size; + buffer->length = 0; + buffer->consumed = 0; + + return buffer; +} + +void +decoder_buffer_free(DecoderBuffer *buffer) +{ + assert(buffer != nullptr); + + g_free(buffer); +} + +bool +decoder_buffer_is_empty(const DecoderBuffer *buffer) +{ + return buffer->consumed == buffer->length; +} + +bool +decoder_buffer_is_full(const DecoderBuffer *buffer) +{ + return buffer->consumed == 0 && buffer->length == buffer->size; +} + +static void +decoder_buffer_shift(DecoderBuffer *buffer) +{ + assert(buffer->consumed > 0); + + buffer->length -= buffer->consumed; + memmove(buffer->data, buffer->data + buffer->consumed, buffer->length); + buffer->consumed = 0; +} + +bool +decoder_buffer_fill(DecoderBuffer *buffer) +{ + size_t nbytes; + + if (buffer->consumed > 0) + decoder_buffer_shift(buffer); + + if (buffer->length >= buffer->size) + /* buffer is full */ + return false; + + nbytes = decoder_read(buffer->decoder, buffer->is, + buffer->data + buffer->length, + buffer->size - buffer->length); + if (nbytes == 0) + /* end of file, I/O error or decoder command + received */ + return false; + + buffer->length += nbytes; + assert(buffer->length <= buffer->size); + + return true; +} + +const void * +decoder_buffer_read(const DecoderBuffer *buffer, size_t *length_r) +{ + if (buffer->consumed >= buffer->length) + /* buffer is empty */ + return nullptr; + + *length_r = buffer->length - buffer->consumed; + return buffer->data + buffer->consumed; +} + +void +decoder_buffer_consume(DecoderBuffer *buffer, size_t nbytes) +{ + /* just move the "consumed" pointer - decoder_buffer_shift() + will do the real work later (called by + decoder_buffer_fill()) */ + buffer->consumed += nbytes; + + assert(buffer->consumed <= buffer->length); +} + +bool +decoder_buffer_skip(DecoderBuffer *buffer, size_t nbytes) +{ + size_t length; + const void *data; + bool success; + + /* this could probably be optimized by seeking */ + + while (true) { + data = decoder_buffer_read(buffer, &length); + if (data != nullptr) { + if (length > nbytes) + length = nbytes; + decoder_buffer_consume(buffer, length); + nbytes -= length; + if (nbytes == 0) + return true; + } + + success = decoder_buffer_fill(buffer); + if (!success) + return false; + } +} diff --git a/src/DecoderBuffer.hxx b/src/DecoderBuffer.hxx new file mode 100644 index 000000000..4f7efb29a --- /dev/null +++ b/src/DecoderBuffer.hxx @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2003-2013 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program 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. + * + * This program 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., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_DECODER_BUFFER_HXX +#define MPD_DECODER_BUFFER_HXX + +#include + +/** + * This objects handles buffered reads in decoder plugins easily. You + * create a buffer object, and use its high-level methods to fill and + * read it. It will automatically handle shifting the buffer. + */ +struct DecoderBuffer; + +struct decoder; +struct input_stream; + +/** + * Creates a new buffer. + * + * @param decoder the decoder object, used for decoder_read(), may be NULL + * @param is the input stream object where we should read from + * @param size the maximum size of the buffer + * @return the new decoder_buffer object + */ +DecoderBuffer * +decoder_buffer_new(struct decoder *decoder, struct input_stream *is, + size_t size); + +/** + * Frees resources used by the decoder_buffer object. + */ +void +decoder_buffer_free(DecoderBuffer *buffer); + +bool +decoder_buffer_is_empty(const DecoderBuffer *buffer); + +bool +decoder_buffer_is_full(const DecoderBuffer *buffer); + +/** + * Read data from the input_stream and append it to the buffer. + * + * @return true if data was appended; false if there is no data + * available (yet), end of file, I/O error or a decoder command was + * received + */ +bool +decoder_buffer_fill(DecoderBuffer *buffer); + +/** + * Reads data from the buffer. This data is not yet consumed, you + * have to call decoder_buffer_consume() to do that. The returned + * buffer becomes invalid after a decoder_buffer_fill() or a + * decoder_buffer_consume() call. + * + * @param buffer the decoder_buffer object + * @param length_r pointer to a size_t where you will receive the + * number of bytes available + * @return a pointer to the read buffer, or NULL if there is no data + * available + */ +const void * +decoder_buffer_read(const DecoderBuffer *buffer, size_t *length_r); + +/** + * Consume (delete, invalidate) a part of the buffer. The "nbytes" + * parameter must not be larger than the length returned by + * decoder_buffer_read(). + * + * @param buffer the decoder_buffer object + * @param nbytes the number of bytes to consume + */ +void +decoder_buffer_consume(DecoderBuffer *buffer, size_t nbytes); + +/** + * Skips the specified number of bytes, discarding its data. + * + * @param buffer the decoder_buffer object + * @param nbytes the number of bytes to skip + * @return true on success, false on error + */ +bool +decoder_buffer_skip(DecoderBuffer *buffer, size_t nbytes); + +#endif diff --git a/src/decoder/FaadDecoderPlugin.cxx b/src/decoder/FaadDecoderPlugin.cxx index c2e79b771..3e8a9b6bc 100644 --- a/src/decoder/FaadDecoderPlugin.cxx +++ b/src/decoder/FaadDecoderPlugin.cxx @@ -20,9 +20,7 @@ #include "config.h" #include "FaadDecoderPlugin.hxx" #include "decoder_api.h" -extern "C" { -#include "decoder_buffer.h" -} +#include "DecoderBuffer.hxx" #include "audio_check.h" #include "tag_handler.h" @@ -73,7 +71,7 @@ adts_check_frame(const unsigned char *data) * found or if not enough data is available. */ static size_t -adts_find_frame(struct decoder_buffer *buffer) +adts_find_frame(DecoderBuffer *buffer) { size_t length, frame_length; bool ret; @@ -138,7 +136,7 @@ adts_find_frame(struct decoder_buffer *buffer) } static float -adts_song_duration(struct decoder_buffer *buffer) +adts_song_duration(DecoderBuffer *buffer) { unsigned int frames, frame_length; unsigned sample_rate = 0; @@ -172,7 +170,7 @@ adts_song_duration(struct decoder_buffer *buffer) } static float -faad_song_duration(struct decoder_buffer *buffer, struct input_stream *is) +faad_song_duration(DecoderBuffer *buffer, struct input_stream *is) { size_t fileread; size_t tagsize; @@ -248,7 +246,7 @@ faad_song_duration(struct decoder_buffer *buffer, struct input_stream *is) * inconsistencies in libfaad. */ static bool -faad_decoder_init(NeAACDecHandle decoder, struct decoder_buffer *buffer, +faad_decoder_init(NeAACDecHandle decoder, DecoderBuffer *buffer, struct audio_format *audio_format, GError **error_r) { int32_t nbytes; @@ -294,7 +292,7 @@ faad_decoder_init(NeAACDecHandle decoder, struct decoder_buffer *buffer, * inconsistencies in libfaad. */ static const void * -faad_decoder_decode(NeAACDecHandle decoder, struct decoder_buffer *buffer, +faad_decoder_decode(NeAACDecHandle decoder, DecoderBuffer *buffer, NeAACDecFrameInfo *frame_info) { size_t length; @@ -317,7 +315,7 @@ faad_decoder_decode(NeAACDecHandle decoder, struct decoder_buffer *buffer, static float faad_get_file_time_float(struct input_stream *is) { - struct decoder_buffer *buffer; + DecoderBuffer *buffer; float length; buffer = decoder_buffer_new(nullptr, is, @@ -374,7 +372,7 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is) struct audio_format audio_format; bool ret; uint16_t bit_rate = 0; - struct decoder_buffer *buffer; + DecoderBuffer *buffer; enum decoder_command cmd; buffer = decoder_buffer_new(mpd_decoder, is, diff --git a/src/decoder_buffer.c b/src/decoder_buffer.c deleted file mode 100644 index fcb135976..000000000 --- a/src/decoder_buffer.c +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Copyright (C) 2003-2011 The Music Player Daemon Project - * http://www.musicpd.org - * - * This program 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. - * - * This program 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., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" -#include "decoder_buffer.h" -#include "decoder_api.h" - -#include - -#include - -struct decoder_buffer { - struct decoder *decoder; - struct input_stream *is; - - /** the allocated size of the buffer */ - size_t size; - - /** the current length of the buffer */ - size_t length; - - /** number of bytes already consumed at the beginning of the - buffer */ - size_t consumed; - - /** the actual buffer (dynamic size) */ - unsigned char data[sizeof(size_t)]; -}; - -struct decoder_buffer * -decoder_buffer_new(struct decoder *decoder, struct input_stream *is, - size_t size) -{ - struct decoder_buffer *buffer = - g_malloc(sizeof(*buffer) - sizeof(buffer->data) + size); - - assert(is != NULL); - assert(size > 0); - - buffer->decoder = decoder; - buffer->is = is; - buffer->size = size; - buffer->length = 0; - buffer->consumed = 0; - - return buffer; -} - -void -decoder_buffer_free(struct decoder_buffer *buffer) -{ - assert(buffer != NULL); - - g_free(buffer); -} - -bool -decoder_buffer_is_empty(const struct decoder_buffer *buffer) -{ - return buffer->consumed == buffer->length; -} - -bool -decoder_buffer_is_full(const struct decoder_buffer *buffer) -{ - return buffer->consumed == 0 && buffer->length == buffer->size; -} - -static void -decoder_buffer_shift(struct decoder_buffer *buffer) -{ - assert(buffer->consumed > 0); - - buffer->length -= buffer->consumed; - memmove(buffer->data, buffer->data + buffer->consumed, buffer->length); - buffer->consumed = 0; -} - -bool -decoder_buffer_fill(struct decoder_buffer *buffer) -{ - size_t nbytes; - - if (buffer->consumed > 0) - decoder_buffer_shift(buffer); - - if (buffer->length >= buffer->size) - /* buffer is full */ - return false; - - nbytes = decoder_read(buffer->decoder, buffer->is, - buffer->data + buffer->length, - buffer->size - buffer->length); - if (nbytes == 0) - /* end of file, I/O error or decoder command - received */ - return false; - - buffer->length += nbytes; - assert(buffer->length <= buffer->size); - - return true; -} - -const void * -decoder_buffer_read(const struct decoder_buffer *buffer, size_t *length_r) -{ - if (buffer->consumed >= buffer->length) - /* buffer is empty */ - return NULL; - - *length_r = buffer->length - buffer->consumed; - return buffer->data + buffer->consumed; -} - -void -decoder_buffer_consume(struct decoder_buffer *buffer, size_t nbytes) -{ - /* just move the "consumed" pointer - decoder_buffer_shift() - will do the real work later (called by - decoder_buffer_fill()) */ - buffer->consumed += nbytes; - - assert(buffer->consumed <= buffer->length); -} - -bool -decoder_buffer_skip(struct decoder_buffer *buffer, size_t nbytes) -{ - size_t length; - const void *data; - bool success; - - /* this could probably be optimized by seeking */ - - while (true) { - data = decoder_buffer_read(buffer, &length); - if (data != NULL) { - if (length > nbytes) - length = nbytes; - decoder_buffer_consume(buffer, length); - nbytes -= length; - if (nbytes == 0) - return true; - } - - success = decoder_buffer_fill(buffer); - if (!success) - return false; - } -} diff --git a/src/decoder_buffer.h b/src/decoder_buffer.h deleted file mode 100644 index 77eff5dd1..000000000 --- a/src/decoder_buffer.h +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (C) 2003-2011 The Music Player Daemon Project - * http://www.musicpd.org - * - * This program 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. - * - * This program 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., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPD_DECODER_BUFFER_H -#define MPD_DECODER_BUFFER_H - -#include -#include - -/** - * This objects handles buffered reads in decoder plugins easily. You - * create a buffer object, and use its high-level methods to fill and - * read it. It will automatically handle shifting the buffer. - */ -struct decoder_buffer; - -struct decoder; -struct input_stream; - -/** - * Creates a new buffer. - * - * @param decoder the decoder object, used for decoder_read(), may be NULL - * @param is the input stream object where we should read from - * @param size the maximum size of the buffer - * @return the new decoder_buffer object - */ -struct decoder_buffer * -decoder_buffer_new(struct decoder *decoder, struct input_stream *is, - size_t size); - -/** - * Frees resources used by the decoder_buffer object. - */ -void -decoder_buffer_free(struct decoder_buffer *buffer); - -bool -decoder_buffer_is_empty(const struct decoder_buffer *buffer); - -bool -decoder_buffer_is_full(const struct decoder_buffer *buffer); - -/** - * Read data from the input_stream and append it to the buffer. - * - * @return true if data was appended; false if there is no data - * available (yet), end of file, I/O error or a decoder command was - * received - */ -bool -decoder_buffer_fill(struct decoder_buffer *buffer); - -/** - * Reads data from the buffer. This data is not yet consumed, you - * have to call decoder_buffer_consume() to do that. The returned - * buffer becomes invalid after a decoder_buffer_fill() or a - * decoder_buffer_consume() call. - * - * @param buffer the decoder_buffer object - * @param length_r pointer to a size_t where you will receive the - * number of bytes available - * @return a pointer to the read buffer, or NULL if there is no data - * available - */ -const void * -decoder_buffer_read(const struct decoder_buffer *buffer, size_t *length_r); - -/** - * Consume (delete, invalidate) a part of the buffer. The "nbytes" - * parameter must not be larger than the length returned by - * decoder_buffer_read(). - * - * @param buffer the decoder_buffer object - * @param nbytes the number of bytes to consume - */ -void -decoder_buffer_consume(struct decoder_buffer *buffer, size_t nbytes); - -/** - * Skips the specified number of bytes, discarding its data. - * - * @param buffer the decoder_buffer object - * @param nbytes the number of bytes to skip - * @return true on success, false on error - */ -bool -decoder_buffer_skip(struct decoder_buffer *buffer, size_t nbytes); - -#endif -- cgit v1.2.3