aboutsummaryrefslogtreecommitdiffstats
path: root/test/run_convert.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--test/run_convert.c126
-rw-r--r--test/run_convert.cxx126
2 files changed, 126 insertions, 126 deletions
diff --git a/test/run_convert.c b/test/run_convert.c
deleted file mode 100644
index 4f57400fd..000000000
--- a/test/run_convert.c
+++ /dev/null
@@ -1,126 +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.
- */
-
-/*
- * This program is a command line interface to MPD's PCM conversion
- * library (pcm_convert.c).
- *
- */
-
-#include "config.h"
-#include "audio_parser.h"
-#include "audio_format.h"
-#include "pcm_convert.h"
-#include "conf.h"
-#include "fifo_buffer.h"
-#include "stdbin.h"
-
-#include <glib.h>
-
-#include <assert.h>
-#include <stddef.h>
-#include <unistd.h>
-
-static void
-my_log_func(const gchar *log_domain, G_GNUC_UNUSED GLogLevelFlags log_level,
- const gchar *message, G_GNUC_UNUSED gpointer user_data)
-{
- if (log_domain != NULL)
- g_printerr("%s: %s\n", log_domain, message);
- else
- g_printerr("%s\n", message);
-}
-
-const char *
-config_get_string(G_GNUC_UNUSED const char *name, const char *default_value)
-{
- return default_value;
-}
-
-int main(int argc, char **argv)
-{
- GError *error = NULL;
- struct audio_format in_audio_format, out_audio_format;
- struct pcm_convert_state state;
- const void *output;
- ssize_t nbytes;
- size_t length;
-
- if (argc != 3) {
- g_printerr("Usage: run_convert IN_FORMAT OUT_FORMAT <IN >OUT\n");
- return 1;
- }
-
- g_log_set_default_handler(my_log_func, NULL);
-
- if (!audio_format_parse(&in_audio_format, argv[1],
- false, &error)) {
- g_printerr("Failed to parse audio format: %s\n",
- error->message);
- return 1;
- }
-
- struct audio_format out_audio_format_mask;
- if (!audio_format_parse(&out_audio_format_mask, argv[2],
- true, &error)) {
- g_printerr("Failed to parse audio format: %s\n",
- error->message);
- return 1;
- }
-
- out_audio_format = in_audio_format;
- audio_format_mask_apply(&out_audio_format, &out_audio_format_mask);
-
- const size_t in_frame_size = audio_format_frame_size(&in_audio_format);
-
- pcm_convert_init(&state);
-
- struct fifo_buffer *buffer = fifo_buffer_new(4096);
-
- while (true) {
- void *p = fifo_buffer_write(buffer, &length);
- assert(p != NULL);
-
- nbytes = read(0, p, length);
- if (nbytes <= 0)
- break;
-
- fifo_buffer_append(buffer, nbytes);
-
- const void *src = fifo_buffer_read(buffer, &length);
- assert(src != NULL);
-
- length -= length % in_frame_size;
- if (length == 0)
- continue;
-
- fifo_buffer_consume(buffer, length);
-
- output = pcm_convert(&state, &in_audio_format, src, length,
- &out_audio_format, &length, &error);
- if (output == NULL) {
- g_printerr("Failed to convert: %s\n", error->message);
- return 2;
- }
-
- G_GNUC_UNUSED ssize_t ignored = write(1, output, length);
- }
-
- pcm_convert_deinit(&state);
-}
diff --git a/test/run_convert.cxx b/test/run_convert.cxx
new file mode 100644
index 000000000..e66d0be2b
--- /dev/null
+++ b/test/run_convert.cxx
@@ -0,0 +1,126 @@
+/*
+ * 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.
+ */
+
+/*
+ * This program is a command line interface to MPD's PCM conversion
+ * library (pcm_convert.c).
+ *
+ */
+
+#include "config.h"
+#include "AudioParser.hxx"
+#include "audio_format.h"
+#include "PcmConvert.hxx"
+#include "conf.h"
+#include "util/fifo_buffer.h"
+#include "stdbin.h"
+
+#include <glib.h>
+
+#include <assert.h>
+#include <stddef.h>
+#include <unistd.h>
+
+static void
+my_log_func(const gchar *log_domain, G_GNUC_UNUSED GLogLevelFlags log_level,
+ const gchar *message, G_GNUC_UNUSED gpointer user_data)
+{
+ if (log_domain != NULL)
+ g_printerr("%s: %s\n", log_domain, message);
+ else
+ g_printerr("%s\n", message);
+}
+
+const char *
+config_get_string(gcc_unused enum ConfigOption option,
+ const char *default_value)
+{
+ return default_value;
+}
+
+int main(int argc, char **argv)
+{
+ GError *error = NULL;
+ struct audio_format in_audio_format, out_audio_format;
+ const void *output;
+ ssize_t nbytes;
+ size_t length;
+
+ if (argc != 3) {
+ g_printerr("Usage: run_convert IN_FORMAT OUT_FORMAT <IN >OUT\n");
+ return 1;
+ }
+
+ g_log_set_default_handler(my_log_func, NULL);
+
+ if (!audio_format_parse(&in_audio_format, argv[1],
+ false, &error)) {
+ g_printerr("Failed to parse audio format: %s\n",
+ error->message);
+ return 1;
+ }
+
+ struct audio_format out_audio_format_mask;
+ if (!audio_format_parse(&out_audio_format_mask, argv[2],
+ true, &error)) {
+ g_printerr("Failed to parse audio format: %s\n",
+ error->message);
+ return 1;
+ }
+
+ out_audio_format = in_audio_format;
+ audio_format_mask_apply(&out_audio_format, &out_audio_format_mask);
+
+ const size_t in_frame_size = audio_format_frame_size(&in_audio_format);
+
+ PcmConvert state;
+
+ struct fifo_buffer *buffer = fifo_buffer_new(4096);
+
+ while (true) {
+ void *p = fifo_buffer_write(buffer, &length);
+ assert(p != NULL);
+
+ nbytes = read(0, p, length);
+ if (nbytes <= 0)
+ break;
+
+ fifo_buffer_append(buffer, nbytes);
+
+ const void *src = fifo_buffer_read(buffer, &length);
+ assert(src != NULL);
+
+ length -= length % in_frame_size;
+ if (length == 0)
+ continue;
+
+ fifo_buffer_consume(buffer, length);
+
+ output = state.Convert(&in_audio_format, src, length,
+ &out_audio_format, &length, &error);
+ if (output == NULL) {
+ g_printerr("Failed to convert: %s\n", error->message);
+ return 2;
+ }
+
+ G_GNUC_UNUSED ssize_t ignored = write(1, output, length);
+ }
+
+ return EXIT_SUCCESS;
+}