From 6b2b5af3440d8bd5c6ca6bde934610925d652e88 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 16 Oct 2013 21:04:52 +0200 Subject: util/byte_reverse: convert to C++ --- src/decoder/PcmDecoderPlugin.cxx | 5 +- src/pcm/PcmExport.cxx | 5 +- src/util/ByteReverse.cxx | 123 +++++++++++++++++++++++++++++++++++++++ src/util/ByteReverse.hxx | 55 +++++++++++++++++ src/util/byte_reverse.c | 123 --------------------------------------- src/util/byte_reverse.h | 55 ----------------- 6 files changed, 180 insertions(+), 186 deletions(-) create mode 100644 src/util/ByteReverse.cxx create mode 100644 src/util/ByteReverse.hxx delete mode 100644 src/util/byte_reverse.c delete mode 100644 src/util/byte_reverse.h (limited to 'src') diff --git a/src/decoder/PcmDecoderPlugin.cxx b/src/decoder/PcmDecoderPlugin.cxx index 6996b583a..61062f7f9 100644 --- a/src/decoder/PcmDecoderPlugin.cxx +++ b/src/decoder/PcmDecoderPlugin.cxx @@ -22,12 +22,9 @@ #include "DecoderAPI.hxx" #include "InputStream.hxx" #include "util/Error.hxx" +#include "util/ByteReverse.hxx" #include "Log.hxx" -extern "C" { -#include "util/byte_reverse.h" -} - #include #include #include diff --git a/src/pcm/PcmExport.cxx b/src/pcm/PcmExport.cxx index 389670b6f..74b642569 100644 --- a/src/pcm/PcmExport.cxx +++ b/src/pcm/PcmExport.cxx @@ -21,10 +21,7 @@ #include "PcmExport.hxx" #include "PcmDsdUsb.hxx" #include "PcmPack.hxx" - -extern "C" { -#include "util/byte_reverse.h" -} +#include "util/ByteReverse.hxx" void PcmExport::Open(SampleFormat sample_format, unsigned _channels, diff --git a/src/util/ByteReverse.cxx b/src/util/ByteReverse.cxx new file mode 100644 index 000000000..e5367b34c --- /dev/null +++ b/src/util/ByteReverse.cxx @@ -0,0 +1,123 @@ +/* + * 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 "ByteReverse.hxx" + +#include +#include + +void +reverse_bytes_16(uint16_t *dest, const uint16_t *src, const uint16_t *src_end) +{ + assert(dest != nullptr); + assert(src != nullptr); + assert(src_end >= src); + + while (src < src_end) { + const uint16_t x = *src++; + *dest++ = GUINT16_SWAP_LE_BE(x); + } +} + +void +reverse_bytes_32(uint32_t *dest, const uint32_t *src, const uint32_t *src_end) +{ + assert(dest != nullptr); + assert(src != nullptr); + assert(src_end >= src); + + while (src < src_end) { + const uint32_t x = *src++; + *dest++ = GUINT32_SWAP_LE_BE(x); + } +} + +void +reverse_bytes_64(uint64_t *dest, const uint64_t *src, const uint64_t *src_end) +{ + assert(dest != nullptr); + assert(src != nullptr); + assert(src_end >= src); + + while (src < src_end) { + const uint64_t x = *src++; + *dest++ = GUINT64_SWAP_LE_BE(x); + } +} + +static void +reverse_bytes_linear(uint8_t *dest, const uint8_t *src, size_t n) +{ + src += n; + + while (n-- > 0) + *dest++ = *--src; +} + +static void +reverse_bytes_generic(uint8_t *dest, + const uint8_t *src, const uint8_t *src_end, + size_t frame_size) +{ + assert(dest != nullptr); + assert(src != nullptr); + assert(src_end >= src); + assert(frame_size > 0); + assert((src_end - src) % frame_size == 0); + + while (src < src_end) { + reverse_bytes_linear(dest, src, frame_size); + dest += frame_size; + src += frame_size; + } +} + +void +reverse_bytes(uint8_t *dest, const uint8_t *src, const uint8_t *src_end, + size_t frame_size) +{ + assert(dest != nullptr); + assert(src != nullptr); + assert(src_end >= src); + assert(frame_size > 0); + assert((src_end - src) % frame_size == 0); + + switch (frame_size) { + case 2: + reverse_bytes_16((uint16_t *)dest, + (const uint16_t *)src, + (const uint16_t *)src_end); + break; + + case 4: + reverse_bytes_32((uint32_t *)dest, + (const uint32_t *)src, + (const uint32_t *)src_end); + break; + + case 8: + reverse_bytes_64((uint64_t *)dest, + (const uint64_t *)src, + (const uint64_t *)src_end); + break; + + default: + reverse_bytes_generic(dest, src, src_end, frame_size); + } +} diff --git a/src/util/ByteReverse.hxx b/src/util/ByteReverse.hxx new file mode 100644 index 000000000..d6380213a --- /dev/null +++ b/src/util/ByteReverse.hxx @@ -0,0 +1,55 @@ +/* + * 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_BYTE_REVERSE_HXX +#define MPD_BYTE_REVERSE_HXX + +#include +#include + +/** + * Reverse the bytes in each 16 bit "frame". This function can be + * used for in-place operation. + */ +void +reverse_bytes_16(uint16_t *dest, const uint16_t *src, const uint16_t *src_end); + +/** + * Reverse the bytes in each 32 bit "frame". This function can be + * used for in-place operation. + */ +void +reverse_bytes_32(uint32_t *dest, const uint32_t *src, const uint32_t *src_end); + +/** + * Reverse the bytes in each 64 bit "frame". This function can be + * used for in-place operation. + */ +void +reverse_bytes_64(uint64_t *dest, const uint64_t *src, const uint64_t *src_end); + +/** + * Reverse the bytes in each "frame". This function cannot be used + * for in-place operation. + */ +void +reverse_bytes(uint8_t *dest, const uint8_t *src, const uint8_t *src_end, + size_t frame_size); + +#endif diff --git a/src/util/byte_reverse.c b/src/util/byte_reverse.c deleted file mode 100644 index e96af14b9..000000000 --- a/src/util/byte_reverse.c +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (C) 2003-2012 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 "byte_reverse.h" - -#include -#include - -void -reverse_bytes_16(uint16_t *dest, const uint16_t *src, const uint16_t *src_end) -{ - assert(dest != NULL); - assert(src != NULL); - assert(src_end >= src); - - while (src < src_end) { - const uint16_t x = *src++; - *dest++ = GUINT16_SWAP_LE_BE(x); - } -} - -void -reverse_bytes_32(uint32_t *dest, const uint32_t *src, const uint32_t *src_end) -{ - assert(dest != NULL); - assert(src != NULL); - assert(src_end >= src); - - while (src < src_end) { - const uint32_t x = *src++; - *dest++ = GUINT32_SWAP_LE_BE(x); - } -} - -void -reverse_bytes_64(uint64_t *dest, const uint64_t *src, const uint64_t *src_end) -{ - assert(dest != NULL); - assert(src != NULL); - assert(src_end >= src); - - while (src < src_end) { - const uint64_t x = *src++; - *dest++ = GUINT64_SWAP_LE_BE(x); - } -} - -static void -reverse_bytes_linear(uint8_t *dest, const uint8_t *src, size_t n) -{ - src += n; - - while (n-- > 0) - *dest++ = *--src; -} - -static void -reverse_bytes_generic(uint8_t *dest, - const uint8_t *src, const uint8_t *src_end, - size_t frame_size) -{ - assert(dest != NULL); - assert(src != NULL); - assert(src_end >= src); - assert(frame_size > 0); - assert((src_end - src) % frame_size == 0); - - while (src < src_end) { - reverse_bytes_linear(dest, src, frame_size); - dest += frame_size; - src += frame_size; - } -} - -void -reverse_bytes(uint8_t *dest, const uint8_t *src, const uint8_t *src_end, - size_t frame_size) -{ - assert(dest != NULL); - assert(src != NULL); - assert(src_end >= src); - assert(frame_size > 0); - assert((src_end - src) % frame_size == 0); - - switch (frame_size) { - case 2: - reverse_bytes_16((uint16_t *)dest, - (const uint16_t *)src, - (const uint16_t *)src_end); - break; - - case 4: - reverse_bytes_32((uint32_t *)dest, - (const uint32_t *)src, - (const uint32_t *)src_end); - break; - - case 8: - reverse_bytes_64((uint64_t *)dest, - (const uint64_t *)src, - (const uint64_t *)src_end); - break; - - default: - reverse_bytes_generic(dest, src, src_end, frame_size); - } -} diff --git a/src/util/byte_reverse.h b/src/util/byte_reverse.h deleted file mode 100644 index 63213d6c2..000000000 --- a/src/util/byte_reverse.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2003-2012 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_BYTE_REVERSE_H -#define MPD_BYTE_REVERSE_H - -#include -#include - -/** - * Reverse the bytes in each 16 bit "frame". This function can be - * used for in-place operation. - */ -void -reverse_bytes_16(uint16_t *dest, const uint16_t *src, const uint16_t *src_end); - -/** - * Reverse the bytes in each 32 bit "frame". This function can be - * used for in-place operation. - */ -void -reverse_bytes_32(uint32_t *dest, const uint32_t *src, const uint32_t *src_end); - -/** - * Reverse the bytes in each 64 bit "frame". This function can be - * used for in-place operation. - */ -void -reverse_bytes_64(uint64_t *dest, const uint64_t *src, const uint64_t *src_end); - -/** - * Reverse the bytes in each "frame". This function cannot be used - * for in-place operation. - */ -void -reverse_bytes(uint8_t *dest, const uint8_t *src, const uint8_t *src_end, - size_t frame_size); - -#endif -- cgit v1.2.3