Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
95d9bb6d
Commit
95d9bb6d
authored
Mar 21, 2012
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pcm_byteswap: move code to libutil
parent
33986075
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
201 additions
and
38 deletions
+201
-38
Makefile.am
Makefile.am
+2
-0
pcm_byteswap.c
src/pcm_byteswap.c
+21
-38
byte_reverse.c
src/util/byte_reverse.c
+123
-0
byte_reverse.h
src/util/byte_reverse.h
+55
-0
No files found.
Makefile.am
View file @
95d9bb6d
...
@@ -392,6 +392,7 @@ endif
...
@@ -392,6 +392,7 @@ endif
libutil_a_SOURCES
=
\
libutil_a_SOURCES
=
\
src/util/list.h
\
src/util/list.h
\
src/util/list_sort.c src/util/list_sort.h
\
src/util/list_sort.c src/util/list_sort.h
\
src/util/byte_reverse.c src/util/byte_reverse.h
\
src/util/bit_reverse.c src/util/bit_reverse.h
src/util/bit_reverse.c src/util/bit_reverse.h
# PCM library
# PCM library
...
@@ -1271,6 +1272,7 @@ test_test_pcm_SOURCES = \
...
@@ -1271,6 +1272,7 @@ test_test_pcm_SOURCES = \
test
/test_pcm_main.c
test
/test_pcm_main.c
test_test_pcm_LDADD
=
\
test_test_pcm_LDADD
=
\
$(PCM_LIBS)
\
$(PCM_LIBS)
\
libutil.a
\
$(GLIB_LIBS)
$(GLIB_LIBS)
test_test_queue_priority_SOURCES
=
\
test_test_queue_priority_SOURCES
=
\
...
...
src/pcm_byteswap.c
View file @
95d9bb6d
/*
/*
* Copyright (C) 2003-201
1
The Music Player Daemon Project
* Copyright (C) 2003-201
2
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
...
@@ -20,14 +20,10 @@
...
@@ -20,14 +20,10 @@
#include "config.h"
#include "config.h"
#include "pcm_byteswap.h"
#include "pcm_byteswap.h"
#include "pcm_buffer.h"
#include "pcm_buffer.h"
#include "util/byte_reverse.h"
#include <glib.h>
#include <assert.h>
#include <assert.h>
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "pcm"
const
int16_t
*
pcm_byteswap_16
(
struct
pcm_buffer
*
buffer
,
const
int16_t
*
pcm_byteswap_16
(
struct
pcm_buffer
*
buffer
,
const
int16_t
*
src
,
size_t
len
)
const
int16_t
*
src
,
size_t
len
)
{
{
...
@@ -35,13 +31,10 @@ const int16_t *pcm_byteswap_16(struct pcm_buffer *buffer,
...
@@ -35,13 +31,10 @@ const int16_t *pcm_byteswap_16(struct pcm_buffer *buffer,
assert
(
buf
!=
NULL
);
assert
(
buf
!=
NULL
);
const
int16_t
*
src_end
=
src
+
len
/
sizeof
(
*
src
);
const
uint8_t
*
src8
=
(
const
uint8_t
*
)
src
;
int16_t
*
dest
=
buf
;
const
void
*
src_end
=
src8
+
len
;
while
(
src
<
src_end
)
{
const
int16_t
x
=
*
src
++
;
*
dest
++
=
GUINT16_SWAP_LE_BE
(
x
);
}
reverse_bytes_16
((
uint16_t
*
)
buf
,
(
const
uint16_t
*
)
src
,
src_end
);
return
buf
;
return
buf
;
}
}
...
@@ -52,41 +45,31 @@ const int32_t *pcm_byteswap_32(struct pcm_buffer *buffer,
...
@@ -52,41 +45,31 @@ const int32_t *pcm_byteswap_32(struct pcm_buffer *buffer,
assert
(
buf
!=
NULL
);
assert
(
buf
!=
NULL
);
const
int32_t
*
src_end
=
src
+
len
/
sizeof
(
*
src
);
const
uint8_t
*
src8
=
(
const
uint8_t
*
)
src
;
int32_t
*
dest
=
buf
;
const
void
*
src_end
=
src8
+
len
;
while
(
src
<
src_end
)
{
const
int32_t
x
=
*
src
++
;
*
dest
++
=
GUINT32_SWAP_LE_BE
(
x
);
}
reverse_bytes_32
((
uint32_t
*
)
buf
,
(
const
uint32_t
*
)
src
,
src_end
);
return
buf
;
return
buf
;
}
}
const
void
*
const
void
*
pcm_byteswap
(
struct
pcm_buffer
*
buffer
,
enum
sample_format
format
,
pcm_byteswap
(
struct
pcm_buffer
*
buffer
,
enum
sample_format
format
,
const
void
*
src
,
size_t
size
)
const
void
*
_
src
,
size_t
size
)
{
{
switch
(
format
)
{
const
uint8_t
*
const
src
=
_src
;
case
SAMPLE_FORMAT_UNDEFINED
:
case
SAMPLE_FORMAT_S24
:
if
(
size
<=
1
)
case
SAMPLE_FORMAT_FLOAT
:
return
src
;
case
SAMPLE_FORMAT_DSD_OVER_USB
:
/* not implemented */
size_t
sample_size
=
sample_format_size
(
format
);
return
NULL
;
if
(
sample_size
<=
1
)
case
SAMPLE_FORMAT_S8
:
case
SAMPLE_FORMAT_DSD
:
return
src
;
return
src
;
case
SAMPLE_FORMAT_S16
:
assert
(
size
%
sample_size
==
0
);
return
pcm_byteswap_16
(
buffer
,
src
,
size
);
case
SAMPLE_FORMAT_S24_P32
:
uint8_t
*
dest
=
pcm_buffer_get
(
buffer
,
size
);
case
SAMPLE_FORMAT_S32
:
assert
(
dest
!=
NULL
);
return
pcm_byteswap_32
(
buffer
,
src
,
size
);
}
/* unreachable */
reverse_bytes
(
dest
,
src
,
src
+
size
,
sample_size
);
assert
(
false
);
return
dest
;
return
NULL
;
}
}
src/util/byte_reverse.c
0 → 100644
View file @
95d9bb6d
/*
* 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 <glib.h>
#include <assert.h>
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
);
}
}
src/util/byte_reverse.h
0 → 100644
View file @
95d9bb6d
/*
* 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 <stdint.h>
#include <stddef.h>
/**
* 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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment