From 9ec9a8705e667280a69abf8f963db8e4ec8f4cd2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 21 Mar 2012 20:55:18 +0100 Subject: pcm_export: use the byte_reverse library directly Delete the now-unused pcm_byteswap library, and optimize the pcm_export_state object. --- test/test_pcm_all.h | 6 ----- test/test_pcm_byteswap.c | 64 ------------------------------------------------ test/test_pcm_main.c | 2 -- 3 files changed, 72 deletions(-) delete mode 100644 test/test_pcm_byteswap.c (limited to 'test') diff --git a/test/test_pcm_all.h b/test/test_pcm_all.h index 2217baf39..14e4c2980 100644 --- a/test/test_pcm_all.h +++ b/test/test_pcm_all.h @@ -38,10 +38,4 @@ test_pcm_channels_16(void); void test_pcm_channels_32(void); -void -test_pcm_byteswap_16(void); - -void -test_pcm_byteswap_32(void); - #endif diff --git a/test/test_pcm_byteswap.c b/test/test_pcm_byteswap.c deleted file mode 100644 index f49991606..000000000 --- a/test/test_pcm_byteswap.c +++ /dev/null @@ -1,64 +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 "test_pcm_all.h" -#include "pcm_byteswap.h" -#include "pcm_buffer.h" -#include "test_glib_compat.h" - -#include - -void -test_pcm_byteswap_16(void) -{ - enum { N = 256 }; - int16_t src[N]; - - for (unsigned i = 0; i < G_N_ELEMENTS(src); ++i) - src[i] = g_random_int(); - - struct pcm_buffer buffer; - pcm_buffer_init(&buffer); - - const int16_t *dest = pcm_byteswap_16(&buffer, src, sizeof(src)); - g_assert(dest != NULL); - for (unsigned i = 0; i < N; ++i) - g_assert_cmpint(dest[i], ==, - (int16_t)GUINT16_SWAP_LE_BE(src[i])); -} - -void -test_pcm_byteswap_32(void) -{ - enum { N = 256 }; - int32_t src[N]; - - for (unsigned i = 0; i < G_N_ELEMENTS(src); ++i) - src[i] = g_random_int(); - - struct pcm_buffer buffer; - pcm_buffer_init(&buffer); - - const int32_t *dest = pcm_byteswap_32(&buffer, src, sizeof(src)); - g_assert(dest != NULL); - for (unsigned i = 0; i < N; ++i) - g_assert_cmpint(dest[i], ==, - (int32_t)GUINT32_SWAP_LE_BE(src[i])); -} diff --git a/test/test_pcm_main.c b/test/test_pcm_main.c index 4e64b443f..7047b5251 100644 --- a/test/test_pcm_main.c +++ b/test/test_pcm_main.c @@ -32,8 +32,6 @@ main(int argc, char **argv) g_test_add_func("/pcm/pack/unpack24", test_pcm_unpack_24); g_test_add_func("/pcm/channels/16", test_pcm_channels_16); g_test_add_func("/pcm/channels/32", test_pcm_channels_32); - g_test_add_func("/pcm/byteswap/16", test_pcm_byteswap_16); - g_test_add_func("/pcm/byteswap/32", test_pcm_byteswap_32); g_test_run(); } -- cgit v1.2.3