Skip to content

M
mpd
Commit 0307801d authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

test/test_pcm: convert to C++

parent 72cf8dd8
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 49 deletions
Makefile.am
View file @ 0307801d
...@@ -1401,12 +1401,12 @@ test_test_byte_reverse_LDADD = \ ...@@ -1401,12 +1401,12 @@ test_test_byte_reverse_LDADD = \
$(GLIB_LIBS) $(GLIB_LIBS)
test_test_pcm_SOURCES = \ test_test_pcm_SOURCES = \
test/test_pcm_dither.c \ test/test_pcm_dither.cxx \
test/test_pcm_pack.c \ test/test_pcm_pack.cxx \
test/test_pcm_channels.c \ test/test_pcm_channels.cxx \
test/test_pcm_volume.c \ test/test_pcm_volume.cxx \
test/test_pcm_all.h \ test/test_pcm_all.hxx \
test/test_pcm_main.c test/test_pcm_main.cxx
test_test_pcm_LDADD = \ test_test_pcm_LDADD = \
$(PCM_LIBS) \ $(PCM_LIBS) \
libutil.a \ libutil.a \
......
test/test_pcm_all.h → test/test_pcm_all.hxx
View file @ 0307801d
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -17,40 +17,40 @@ ...@@ -17,40 +17,40 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_TEST_PCM_ALL_H #ifndef MPD_TEST_PCM_ALL_HXX
#define MPD_TEST_PCM_ALL_H #define MPD_TEST_PCM_ALL_HXX
void void
test_pcm_dither_24(void); test_pcm_dither_24();
void void
test_pcm_dither_32(void); test_pcm_dither_32();
void void
test_pcm_pack_24(void); test_pcm_pack_24();
void void
test_pcm_unpack_24(void); test_pcm_unpack_24();
void void
test_pcm_channels_16(void); test_pcm_channels_16();
void void
test_pcm_channels_32(void); test_pcm_channels_32();
void void
test_pcm_volume_8(void); test_pcm_volume_8();
void void
test_pcm_volume_16(void); test_pcm_volume_16();
void void
test_pcm_volume_24(void); test_pcm_volume_24();
void void
test_pcm_volume_32(void); test_pcm_volume_32();
void void
test_pcm_volume_float(void); test_pcm_volume_float();
#endif #endif
test/test_pcm_channels.c → test/test_pcm_channels.cxx
View file @ 0307801d
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -18,14 +18,16 @@ ...@@ -18,14 +18,16 @@
*/ */
#include "config.h" #include "config.h"
#include "test_pcm_all.h" #include "test_pcm_all.hxx"
extern "C" {
#include "pcm_channels.h" #include "pcm_channels.h"
}
#include "pcm_buffer.h" #include "pcm_buffer.h"
#include <glib.h> #include <glib.h>
void void
test_pcm_channels_16(void) test_pcm_channels_16()
{ {
enum { N = 256 }; enum { N = 256 };
int16_t src[N * 2]; int16_t src[N * 2];
...@@ -63,7 +65,7 @@ test_pcm_channels_16(void) ...@@ -63,7 +65,7 @@ test_pcm_channels_16(void)
} }
void void
test_pcm_channels_32(void) test_pcm_channels_32()
{ {
enum { N = 256 }; enum { N = 256 };
int32_t src[N * 2]; int32_t src[N * 2];
......
test/test_pcm_dither.c → test/test_pcm_dither.cxx
View file @ 0307801d
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -17,8 +17,11 @@ ...@@ -17,8 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "test_pcm_all.h" #include "test_pcm_all.hxx"
extern "C" {
#include "pcm_dither.h" #include "pcm_dither.h"
}
#include <glib.h> #include <glib.h>
...@@ -26,7 +29,7 @@ ...@@ -26,7 +29,7 @@
* Generate a random 24 bit PCM sample. * Generate a random 24 bit PCM sample.
*/ */
static int32_t static int32_t
random24(void) random24()
{ {
int32_t x = g_random_int() & 0xffffff; int32_t x = g_random_int() & 0xffffff;
if (x & 0x800000) if (x & 0x800000)
...@@ -35,7 +38,7 @@ random24(void) ...@@ -35,7 +38,7 @@ random24(void)
} }
void void
test_pcm_dither_24(void) test_pcm_dither_24()
{ {
struct pcm_dither dither; struct pcm_dither dither;
...@@ -57,7 +60,7 @@ test_pcm_dither_24(void) ...@@ -57,7 +60,7 @@ test_pcm_dither_24(void)
} }
void void
test_pcm_dither_32(void) test_pcm_dither_32()
{ {
struct pcm_dither dither; struct pcm_dither dither;
......
test/test_pcm_main.c → test/test_pcm_main.cxx
View file @ 0307801d
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "test_pcm_all.h" #include "test_pcm_all.hxx"
#include <glib.h> #include <glib.h>
......
test/test_pcm_pack.c → test/test_pcm_pack.cxx
View file @ 0307801d
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -17,8 +17,11 @@ ...@@ -17,8 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "test_pcm_all.h" #include "test_pcm_all.hxx"
extern "C" {
#include "pcm_pack.h" #include "pcm_pack.h"
}
#include <glib.h> #include <glib.h>
...@@ -26,7 +29,7 @@ ...@@ -26,7 +29,7 @@
* Generate a random 24 bit PCM sample. * Generate a random 24 bit PCM sample.
*/ */
static int32_t static int32_t
random24(void) random24()
{ {
int32_t x = g_random_int() & 0xffffff; int32_t x = g_random_int() & 0xffffff;
if (x & 0x800000) if (x & 0x800000)
...@@ -35,7 +38,7 @@ random24(void) ...@@ -35,7 +38,7 @@ random24(void)
} }
void void
test_pcm_pack_24(void) test_pcm_pack_24()
{ {
enum { N = 256 }; enum { N = 256 };
int32_t src[N * 3]; int32_t src[N * 3];
...@@ -62,7 +65,7 @@ test_pcm_pack_24(void) ...@@ -62,7 +65,7 @@ test_pcm_pack_24(void)
} }
void void
test_pcm_unpack_24(void) test_pcm_unpack_24()
{ {
enum { N = 256 }; enum { N = 256 };
uint8_t src[N * 3]; uint8_t src[N * 3];
......
test/test_pcm_volume.c → test/test_pcm_volume.cxx
View file @ 0307801d
/* /*
* Copyright (C) 2003-2012 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "test_pcm_all.h" #include "test_pcm_all.hxx"
#include "pcm_volume.h" #include "pcm_volume.h"
#include <glib.h> #include <glib.h>
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
#include <string.h> #include <string.h>
void void
test_pcm_volume_8(void) test_pcm_volume_8()
{ {
enum { N = 256 }; enum { N = 256 };
static const int8_t zero[N]; static int8_t zero[N];
int8_t src[N]; int8_t src[N];
for (unsigned i = 0; i < N; ++i) for (unsigned i = 0; i < N; ++i)
src[i] = g_random_int(); src[i] = g_random_int();
...@@ -56,10 +56,10 @@ test_pcm_volume_8(void) ...@@ -56,10 +56,10 @@ test_pcm_volume_8(void)
} }
void void
test_pcm_volume_16(void) test_pcm_volume_16()
{ {
enum { N = 256 }; enum { N = 256 };
static const int16_t zero[N]; static int16_t zero[N];
int16_t src[N]; int16_t src[N];
for (unsigned i = 0; i < N; ++i) for (unsigned i = 0; i < N; ++i)
src[i] = g_random_int(); src[i] = g_random_int();
...@@ -90,7 +90,7 @@ test_pcm_volume_16(void) ...@@ -90,7 +90,7 @@ test_pcm_volume_16(void)
* Generate a random 24 bit PCM sample. * Generate a random 24 bit PCM sample.
*/ */
static int32_t static int32_t
random24(void) random24()
{ {
int32_t x = g_random_int() & 0xffffff; int32_t x = g_random_int() & 0xffffff;
if (x & 0x800000) if (x & 0x800000)
...@@ -99,10 +99,10 @@ random24(void) ...@@ -99,10 +99,10 @@ random24(void)
} }
void void
test_pcm_volume_24(void) test_pcm_volume_24()
{ {
enum { N = 256 }; enum { N = 256 };
static const int32_t zero[N]; static int32_t zero[N];
int32_t src[N]; int32_t src[N];
for (unsigned i = 0; i < N; ++i) for (unsigned i = 0; i < N; ++i)
src[i] = random24(); src[i] = random24();
...@@ -130,10 +130,10 @@ test_pcm_volume_24(void) ...@@ -130,10 +130,10 @@ test_pcm_volume_24(void)
} }
void void
test_pcm_volume_32(void) test_pcm_volume_32()
{ {
enum { N = 256 }; enum { N = 256 };
static const int32_t zero[N]; static int32_t zero[N];
int32_t src[N]; int32_t src[N];
for (unsigned i = 0; i < N; ++i) for (unsigned i = 0; i < N; ++i)
src[i] = g_random_int(); src[i] = g_random_int();
...@@ -161,10 +161,10 @@ test_pcm_volume_32(void) ...@@ -161,10 +161,10 @@ test_pcm_volume_32(void)
} }
void void
test_pcm_volume_float(void) test_pcm_volume_float()
{ {
enum { N = 256 }; enum { N = 256 };
static const float zero[N]; static float zero[N];
float src[N]; float src[N];
for (unsigned i = 0; i < N; ++i) for (unsigned i = 0; i < N; ++i)
src[i] = g_random_double_range(-1.0, 1.0); src[i] = g_random_double_range(-1.0, 1.0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment