From f016a99f2447e68d19dcccc68ecc47d12ac32e5b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 28 Jul 2013 13:04:12 +0200 Subject: decoder/mpcdec: convert to C++ --- Makefile.am | 4 +- src/DecoderList.cxx | 2 +- src/decoder/MpcdecDecoderPlugin.cxx | 354 ++++++++++++++++++++++++++++++++++++ src/decoder/MpcdecDecoderPlugin.hxx | 25 +++ src/decoder/mpcdec_decoder_plugin.c | 347 ----------------------------------- 5 files changed, 383 insertions(+), 349 deletions(-) create mode 100644 src/decoder/MpcdecDecoderPlugin.cxx create mode 100644 src/decoder/MpcdecDecoderPlugin.hxx delete mode 100644 src/decoder/mpcdec_decoder_plugin.c diff --git a/Makefile.am b/Makefile.am index bb5cc4f6a..919da1be8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -510,7 +510,9 @@ libdecoder_plugins_a_SOURCES += \ endif if HAVE_MPCDEC -libdecoder_plugins_a_SOURCES += src/decoder/mpcdec_decoder_plugin.c +libdecoder_plugins_a_SOURCES += \ + src/decoder/MpcdecDecoderPlugin.cxx \ + src/decoder/MpcdecDecoderPlugin.hxx endif if HAVE_OPUS diff --git a/src/DecoderList.cxx b/src/DecoderList.cxx index 562e25a18..3964a12f0 100644 --- a/src/DecoderList.cxx +++ b/src/DecoderList.cxx @@ -40,12 +40,12 @@ #include "decoder/WildmidiDecoderPlugin.hxx" #include "decoder/MikmodDecoderPlugin.hxx" #include "decoder/ModplugDecoderPlugin.hxx" +#include "decoder/MpcdecDecoderPlugin.hxx" #include #include -extern const struct decoder_plugin mpcdec_decoder_plugin; extern const struct decoder_plugin sidplay_decoder_plugin; extern const struct decoder_plugin fluidsynth_decoder_plugin; diff --git a/src/decoder/MpcdecDecoderPlugin.cxx b/src/decoder/MpcdecDecoderPlugin.cxx new file mode 100644 index 000000000..36cf620c6 --- /dev/null +++ b/src/decoder/MpcdecDecoderPlugin.cxx @@ -0,0 +1,354 @@ +/* + * 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 "MpcdecDecoderPlugin.hxx" +#include "decoder_api.h" +#include "audio_check.h" +#include "tag_handler.h" + +#ifdef MPC_IS_OLD_API +#include +#else +#include +#include +#endif + +#include +#include +#include + +#undef G_LOG_DOMAIN +#define G_LOG_DOMAIN "mpcdec" + +struct mpc_decoder_data { + struct input_stream *is; + struct decoder *decoder; +}; + +#ifdef MPC_IS_OLD_API +#define cb_first_arg void *vdata +#define cb_data vdata +#else +#define cb_first_arg mpc_reader *reader +#define cb_data reader->data +#endif + +static mpc_int32_t +mpc_read_cb(cb_first_arg, void *ptr, mpc_int32_t size) +{ + struct mpc_decoder_data *data = (struct mpc_decoder_data *) cb_data; + + return decoder_read(data->decoder, data->is, ptr, size); +} + +static mpc_bool_t +mpc_seek_cb(cb_first_arg, mpc_int32_t offset) +{ + struct mpc_decoder_data *data = (struct mpc_decoder_data *) cb_data; + + return input_stream_lock_seek(data->is, offset, SEEK_SET, nullptr); +} + +static mpc_int32_t +mpc_tell_cb(cb_first_arg) +{ + struct mpc_decoder_data *data = (struct mpc_decoder_data *) cb_data; + + return (long)input_stream_get_offset(data->is); +} + +static mpc_bool_t +mpc_canseek_cb(cb_first_arg) +{ + struct mpc_decoder_data *data = (struct mpc_decoder_data *) cb_data; + + return input_stream_is_seekable(data->is); +} + +static mpc_int32_t +mpc_getsize_cb(cb_first_arg) +{ + struct mpc_decoder_data *data = (struct mpc_decoder_data *) cb_data; + + return input_stream_get_size(data->is); +} + +/* this _looks_ performance-critical, don't de-inline -- eric */ +static inline int32_t +mpc_to_mpd_sample(MPC_SAMPLE_FORMAT sample) +{ + /* only doing 16-bit audio for now */ + int32_t val; + + enum { + bits = 24, + }; + + const int clip_min = -1 << (bits - 1); + const int clip_max = (1 << (bits - 1)) - 1; + +#ifdef MPC_FIXED_POINT + const int shift = bits - MPC_FIXED_POINT_SCALE_SHIFT; + + if (shift < 0) + val = sample >> -shift; + else + val = sample << shift; +#else + const int float_scale = 1 << (bits - 1); + + val = sample * float_scale; +#endif + + if (val < clip_min) + val = clip_min; + else if (val > clip_max) + val = clip_max; + + return val; +} + +static void +mpc_to_mpd_buffer(int32_t *dest, const MPC_SAMPLE_FORMAT *src, + unsigned num_samples) +{ + while (num_samples-- > 0) + *dest++ = mpc_to_mpd_sample(*src++); +} + +static void +mpcdec_decode(struct decoder *mpd_decoder, struct input_stream *is) +{ +#ifdef MPC_IS_OLD_API + mpc_decoder decoder; +#else + mpc_demux *demux; + mpc_frame_info frame; + mpc_status status; +#endif + mpc_reader reader; + mpc_streaminfo info; + GError *error = nullptr; + struct audio_format audio_format; + + struct mpc_decoder_data data; + + MPC_SAMPLE_FORMAT sample_buffer[MPC_DECODER_BUFFER_LENGTH]; + + mpc_uint32_t ret; + int32_t chunk[G_N_ELEMENTS(sample_buffer)]; + long bit_rate = 0; + mpc_uint32_t vbr_update_bits; + enum decoder_command cmd = DECODE_COMMAND_NONE; + + data.is = is; + data.decoder = mpd_decoder; + + reader.read = mpc_read_cb; + reader.seek = mpc_seek_cb; + reader.tell = mpc_tell_cb; + reader.get_size = mpc_getsize_cb; + reader.canseek = mpc_canseek_cb; + reader.data = &data; + +#ifdef MPC_IS_OLD_API + mpc_streaminfo_init(&info); + + if ((ret = mpc_streaminfo_read(&info, &reader)) != ERROR_CODE_OK) { + if (decoder_get_command(mpd_decoder) != DECODE_COMMAND_STOP) + g_warning("Not a valid musepack stream\n"); + return; + } + + mpc_decoder_setup(&decoder, &reader); + + if (!mpc_decoder_initialize(&decoder, &info)) { + if (decoder_get_command(mpd_decoder) != DECODE_COMMAND_STOP) + g_warning("Not a valid musepack stream\n"); + return; + } +#else + demux = mpc_demux_init(&reader); + if (demux == nullptr) { + if (decoder_get_command(mpd_decoder) != DECODE_COMMAND_STOP) + g_warning("Not a valid musepack stream"); + return; + } + + mpc_demux_get_info(demux, &info); +#endif + + if (!audio_format_init_checked(&audio_format, info.sample_freq, + SAMPLE_FORMAT_S24_P32, + info.channels, &error)) { + g_warning("%s", error->message); + g_error_free(error); +#ifndef MPC_IS_OLD_API + mpc_demux_exit(demux); +#endif + return; + } + + struct replay_gain_info replay_gain_info; + replay_gain_info_init(&replay_gain_info); +#ifdef MPC_IS_OLD_API + replay_gain_info.tuples[REPLAY_GAIN_ALBUM].gain = info.gain_album * 0.01; + replay_gain_info.tuples[REPLAY_GAIN_ALBUM].peak = info.peak_album / 32767.0; + replay_gain_info.tuples[REPLAY_GAIN_TRACK].gain = info.gain_title * 0.01; + replay_gain_info.tuples[REPLAY_GAIN_TRACK].peak = info.peak_title / 32767.0; +#else + replay_gain_info.tuples[REPLAY_GAIN_ALBUM].gain = MPC_OLD_GAIN_REF - (info.gain_album / 256.); + replay_gain_info.tuples[REPLAY_GAIN_ALBUM].peak = pow(10, info.peak_album / 256. / 20) / 32767; + replay_gain_info.tuples[REPLAY_GAIN_TRACK].gain = MPC_OLD_GAIN_REF - (info.gain_title / 256.); + replay_gain_info.tuples[REPLAY_GAIN_TRACK].peak = pow(10, info.peak_title / 256. / 20) / 32767; +#endif + + decoder_replay_gain(mpd_decoder, &replay_gain_info); + + decoder_initialized(mpd_decoder, &audio_format, + input_stream_is_seekable(is), + mpc_streaminfo_get_length(&info)); + + do { + if (cmd == DECODE_COMMAND_SEEK) { + mpc_int64_t where = decoder_seek_where(mpd_decoder) * + audio_format.sample_rate; + bool success; + +#ifdef MPC_IS_OLD_API + success = mpc_decoder_seek_sample(&decoder, where); +#else + success = mpc_demux_seek_sample(demux, where) + == MPC_STATUS_OK; +#endif + if (success) + decoder_command_finished(mpd_decoder); + else + decoder_seek_error(mpd_decoder); + } + + vbr_update_bits = 0; + +#ifdef MPC_IS_OLD_API + mpc_uint32_t vbr_update_acc = 0; + + ret = mpc_decoder_decode(&decoder, sample_buffer, + &vbr_update_acc, &vbr_update_bits); + if (ret == 0 || ret == (mpc_uint32_t)-1) + break; +#else + frame.buffer = (MPC_SAMPLE_FORMAT *)sample_buffer; + status = mpc_demux_decode(demux, &frame); + if (status != MPC_STATUS_OK) { + g_warning("Failed to decode sample"); + break; + } + + if (frame.bits == -1) + break; + + ret = frame.samples; +#endif + + ret *= info.channels; + + mpc_to_mpd_buffer(chunk, sample_buffer, ret); + + bit_rate = vbr_update_bits * audio_format.sample_rate + / 1152 / 1000; + + cmd = decoder_data(mpd_decoder, is, + chunk, ret * sizeof(chunk[0]), + bit_rate); + } while (cmd != DECODE_COMMAND_STOP); + +#ifndef MPC_IS_OLD_API + mpc_demux_exit(demux); +#endif +} + +static float +mpcdec_get_file_duration(struct input_stream *is) +{ + float total_time = -1; + + mpc_reader reader; +#ifndef MPC_IS_OLD_API + mpc_demux *demux; +#endif + mpc_streaminfo info; + struct mpc_decoder_data data; + + data.is = is; + data.decoder = nullptr; + + reader.read = mpc_read_cb; + reader.seek = mpc_seek_cb; + reader.tell = mpc_tell_cb; + reader.get_size = mpc_getsize_cb; + reader.canseek = mpc_canseek_cb; + reader.data = &data; + +#ifdef MPC_IS_OLD_API + mpc_streaminfo_init(&info); + + if (mpc_streaminfo_read(&info, &reader) != ERROR_CODE_OK) + return -1; +#else + demux = mpc_demux_init(&reader); + if (demux == nullptr) + return -1; + + mpc_demux_get_info(demux, &info); + mpc_demux_exit(demux); +#endif + + total_time = mpc_streaminfo_get_length(&info); + + return total_time; +} + +static bool +mpcdec_scan_stream(struct input_stream *is, + const struct tag_handler *handler, void *handler_ctx) +{ + float total_time = mpcdec_get_file_duration(is); + + if (total_time < 0) + return false; + + tag_handler_invoke_duration(handler, handler_ctx, total_time); + return true; +} + +static const char *const mpcdec_suffixes[] = { "mpc", nullptr }; + +const struct decoder_plugin mpcdec_decoder_plugin = { + "mpcdec", + nullptr, + nullptr, + mpcdec_decode, + nullptr, + nullptr, + mpcdec_scan_stream, + nullptr, + mpcdec_suffixes, + nullptr, +}; diff --git a/src/decoder/MpcdecDecoderPlugin.hxx b/src/decoder/MpcdecDecoderPlugin.hxx new file mode 100644 index 000000000..7e9b51cdb --- /dev/null +++ b/src/decoder/MpcdecDecoderPlugin.hxx @@ -0,0 +1,25 @@ +/* + * 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_MPCDEC_HXX +#define MPD_DECODER_MPCDEC_HXX + +extern const struct decoder_plugin mpcdec_decoder_plugin; + +#endif diff --git a/src/decoder/mpcdec_decoder_plugin.c b/src/decoder/mpcdec_decoder_plugin.c deleted file mode 100644 index 77db2416b..000000000 --- a/src/decoder/mpcdec_decoder_plugin.c +++ /dev/null @@ -1,347 +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_api.h" -#include "audio_check.h" -#include "tag_handler.h" - -#ifdef MPC_IS_OLD_API -#include -#else -#include -#include -#endif - -#include -#include -#include - -#undef G_LOG_DOMAIN -#define G_LOG_DOMAIN "mpcdec" - -struct mpc_decoder_data { - struct input_stream *is; - struct decoder *decoder; -}; - -#ifdef MPC_IS_OLD_API -#define cb_first_arg void *vdata -#define cb_data vdata -#else -#define cb_first_arg mpc_reader *reader -#define cb_data reader->data -#endif - -static mpc_int32_t -mpc_read_cb(cb_first_arg, void *ptr, mpc_int32_t size) -{ - struct mpc_decoder_data *data = (struct mpc_decoder_data *) cb_data; - - return decoder_read(data->decoder, data->is, ptr, size); -} - -static mpc_bool_t -mpc_seek_cb(cb_first_arg, mpc_int32_t offset) -{ - struct mpc_decoder_data *data = (struct mpc_decoder_data *) cb_data; - - return input_stream_lock_seek(data->is, offset, SEEK_SET, NULL); -} - -static mpc_int32_t -mpc_tell_cb(cb_first_arg) -{ - struct mpc_decoder_data *data = (struct mpc_decoder_data *) cb_data; - - return (long)input_stream_get_offset(data->is); -} - -static mpc_bool_t -mpc_canseek_cb(cb_first_arg) -{ - struct mpc_decoder_data *data = (struct mpc_decoder_data *) cb_data; - - return input_stream_is_seekable(data->is); -} - -static mpc_int32_t -mpc_getsize_cb(cb_first_arg) -{ - struct mpc_decoder_data *data = (struct mpc_decoder_data *) cb_data; - - return input_stream_get_size(data->is); -} - -/* this _looks_ performance-critical, don't de-inline -- eric */ -static inline int32_t -mpc_to_mpd_sample(MPC_SAMPLE_FORMAT sample) -{ - /* only doing 16-bit audio for now */ - int32_t val; - - enum { - bits = 24, - }; - - const int clip_min = -1 << (bits - 1); - const int clip_max = (1 << (bits - 1)) - 1; - -#ifdef MPC_FIXED_POINT - const int shift = bits - MPC_FIXED_POINT_SCALE_SHIFT; - - if (shift < 0) - val = sample >> -shift; - else - val = sample << shift; -#else - const int float_scale = 1 << (bits - 1); - - val = sample * float_scale; -#endif - - if (val < clip_min) - val = clip_min; - else if (val > clip_max) - val = clip_max; - - return val; -} - -static void -mpc_to_mpd_buffer(int32_t *dest, const MPC_SAMPLE_FORMAT *src, - unsigned num_samples) -{ - while (num_samples-- > 0) - *dest++ = mpc_to_mpd_sample(*src++); -} - -static void -mpcdec_decode(struct decoder *mpd_decoder, struct input_stream *is) -{ -#ifdef MPC_IS_OLD_API - mpc_decoder decoder; -#else - mpc_demux *demux; - mpc_frame_info frame; - mpc_status status; -#endif - mpc_reader reader; - mpc_streaminfo info; - GError *error = NULL; - struct audio_format audio_format; - - struct mpc_decoder_data data; - - MPC_SAMPLE_FORMAT sample_buffer[MPC_DECODER_BUFFER_LENGTH]; - - mpc_uint32_t ret; - int32_t chunk[G_N_ELEMENTS(sample_buffer)]; - long bit_rate = 0; - mpc_uint32_t vbr_update_bits; - enum decoder_command cmd = DECODE_COMMAND_NONE; - - data.is = is; - data.decoder = mpd_decoder; - - reader.read = mpc_read_cb; - reader.seek = mpc_seek_cb; - reader.tell = mpc_tell_cb; - reader.get_size = mpc_getsize_cb; - reader.canseek = mpc_canseek_cb; - reader.data = &data; - -#ifdef MPC_IS_OLD_API - mpc_streaminfo_init(&info); - - if ((ret = mpc_streaminfo_read(&info, &reader)) != ERROR_CODE_OK) { - if (decoder_get_command(mpd_decoder) != DECODE_COMMAND_STOP) - g_warning("Not a valid musepack stream\n"); - return; - } - - mpc_decoder_setup(&decoder, &reader); - - if (!mpc_decoder_initialize(&decoder, &info)) { - if (decoder_get_command(mpd_decoder) != DECODE_COMMAND_STOP) - g_warning("Not a valid musepack stream\n"); - return; - } -#else - demux = mpc_demux_init(&reader); - if (demux == NULL) { - if (decoder_get_command(mpd_decoder) != DECODE_COMMAND_STOP) - g_warning("Not a valid musepack stream"); - return; - } - - mpc_demux_get_info(demux, &info); -#endif - - if (!audio_format_init_checked(&audio_format, info.sample_freq, - SAMPLE_FORMAT_S24_P32, - info.channels, &error)) { - g_warning("%s", error->message); - g_error_free(error); -#ifndef MPC_IS_OLD_API - mpc_demux_exit(demux); -#endif - return; - } - - struct replay_gain_info replay_gain_info; - replay_gain_info_init(&replay_gain_info); -#ifdef MPC_IS_OLD_API - replay_gain_info.tuples[REPLAY_GAIN_ALBUM].gain = info.gain_album * 0.01; - replay_gain_info.tuples[REPLAY_GAIN_ALBUM].peak = info.peak_album / 32767.0; - replay_gain_info.tuples[REPLAY_GAIN_TRACK].gain = info.gain_title * 0.01; - replay_gain_info.tuples[REPLAY_GAIN_TRACK].peak = info.peak_title / 32767.0; -#else - replay_gain_info.tuples[REPLAY_GAIN_ALBUM].gain = MPC_OLD_GAIN_REF - (info.gain_album / 256.); - replay_gain_info.tuples[REPLAY_GAIN_ALBUM].peak = pow(10, info.peak_album / 256. / 20) / 32767; - replay_gain_info.tuples[REPLAY_GAIN_TRACK].gain = MPC_OLD_GAIN_REF - (info.gain_title / 256.); - replay_gain_info.tuples[REPLAY_GAIN_TRACK].peak = pow(10, info.peak_title / 256. / 20) / 32767; -#endif - - decoder_replay_gain(mpd_decoder, &replay_gain_info); - - decoder_initialized(mpd_decoder, &audio_format, - input_stream_is_seekable(is), - mpc_streaminfo_get_length(&info)); - - do { - if (cmd == DECODE_COMMAND_SEEK) { - mpc_int64_t where = decoder_seek_where(mpd_decoder) * - audio_format.sample_rate; - bool success; - -#ifdef MPC_IS_OLD_API - success = mpc_decoder_seek_sample(&decoder, where); -#else - success = mpc_demux_seek_sample(demux, where) - == MPC_STATUS_OK; -#endif - if (success) - decoder_command_finished(mpd_decoder); - else - decoder_seek_error(mpd_decoder); - } - - vbr_update_bits = 0; - -#ifdef MPC_IS_OLD_API - mpc_uint32_t vbr_update_acc = 0; - - ret = mpc_decoder_decode(&decoder, sample_buffer, - &vbr_update_acc, &vbr_update_bits); - if (ret == 0 || ret == (mpc_uint32_t)-1) - break; -#else - frame.buffer = (MPC_SAMPLE_FORMAT *)sample_buffer; - status = mpc_demux_decode(demux, &frame); - if (status != MPC_STATUS_OK) { - g_warning("Failed to decode sample"); - break; - } - - if (frame.bits == -1) - break; - - ret = frame.samples; -#endif - - ret *= info.channels; - - mpc_to_mpd_buffer(chunk, sample_buffer, ret); - - bit_rate = vbr_update_bits * audio_format.sample_rate - / 1152 / 1000; - - cmd = decoder_data(mpd_decoder, is, - chunk, ret * sizeof(chunk[0]), - bit_rate); - } while (cmd != DECODE_COMMAND_STOP); - -#ifndef MPC_IS_OLD_API - mpc_demux_exit(demux); -#endif -} - -static float -mpcdec_get_file_duration(struct input_stream *is) -{ - float total_time = -1; - - mpc_reader reader; -#ifndef MPC_IS_OLD_API - mpc_demux *demux; -#endif - mpc_streaminfo info; - struct mpc_decoder_data data; - - data.is = is; - data.decoder = NULL; - - reader.read = mpc_read_cb; - reader.seek = mpc_seek_cb; - reader.tell = mpc_tell_cb; - reader.get_size = mpc_getsize_cb; - reader.canseek = mpc_canseek_cb; - reader.data = &data; - -#ifdef MPC_IS_OLD_API - mpc_streaminfo_init(&info); - - if (mpc_streaminfo_read(&info, &reader) != ERROR_CODE_OK) - return -1; -#else - demux = mpc_demux_init(&reader); - if (demux == NULL) - return -1; - - mpc_demux_get_info(demux, &info); - mpc_demux_exit(demux); -#endif - - total_time = mpc_streaminfo_get_length(&info); - - return total_time; -} - -static bool -mpcdec_scan_stream(struct input_stream *is, - const struct tag_handler *handler, void *handler_ctx) -{ - float total_time = mpcdec_get_file_duration(is); - - if (total_time < 0) - return false; - - tag_handler_invoke_duration(handler, handler_ctx, total_time); - return true; -} - -static const char *const mpcdec_suffixes[] = { "mpc", NULL }; - -const struct decoder_plugin mpcdec_decoder_plugin = { - .name = "mpcdec", - .stream_decode = mpcdec_decode, - .scan_stream = mpcdec_scan_stream, - .suffixes = mpcdec_suffixes, -}; -- cgit v1.2.3