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
96d74e77
Commit
96d74e77
authored
Jun 17, 2019
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pcm/Dsd{16,32}: move the conversion loop to a separate function
parent
ca8451cd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
20 deletions
+30
-20
Dsd16.cxx
src/pcm/Dsd16.cxx
+15
-10
Dsd32.cxx
src/pcm/Dsd32.cxx
+15
-10
No files found.
src/pcm/Dsd16.cxx
View file @
96d74e77
...
@@ -39,6 +39,18 @@ Dsd8To16Sample(const uint8_t *src, unsigned channels) noexcept
...
@@ -39,6 +39,18 @@ Dsd8To16Sample(const uint8_t *src, unsigned channels) noexcept
return
Construct16
(
src
[
0
],
src
[
channels
]);
return
Construct16
(
src
[
0
],
src
[
channels
]);
}
}
static
void
Dsd8To16
(
uint16_t
*
dest
,
const
uint8_t
*
src
,
size_t
out_frames
,
unsigned
channels
)
noexcept
{
for
(
size_t
i
=
0
;
i
<
out_frames
;
++
i
)
{
for
(
size_t
c
=
0
;
c
<
channels
;
++
c
)
*
dest
++
=
Dsd8To16Sample
(
src
++
,
channels
);
src
+=
channels
;
}
}
ConstBuffer
<
uint16_t
>
ConstBuffer
<
uint16_t
>
Dsd8To16
(
PcmBuffer
&
buffer
,
unsigned
channels
,
Dsd8To16
(
PcmBuffer
&
buffer
,
unsigned
channels
,
ConstBuffer
<
uint8_t
>
_src
)
noexcept
ConstBuffer
<
uint8_t
>
_src
)
noexcept
...
@@ -48,15 +60,8 @@ Dsd8To16(PcmBuffer &buffer, unsigned channels,
...
@@ -48,15 +60,8 @@ Dsd8To16(PcmBuffer &buffer, unsigned channels,
const
size_t
out_samples
=
out_frames
*
channels
;
const
size_t
out_samples
=
out_frames
*
channels
;
const
uint8_t
*
src
=
_src
.
data
;
const
uint8_t
*
src
=
_src
.
data
;
uint16_t
*
const
dest0
=
buffer
.
GetT
<
uint16_t
>
(
out_samples
);
const
auto
dest
=
buffer
.
GetT
<
uint16_t
>
(
out_samples
);
uint16_t
*
dest
=
dest0
;
Dsd8To16
(
dest
,
src
,
out_frames
,
channels
);
for
(
size_t
i
=
0
;
i
<
out_frames
;
++
i
)
{
for
(
size_t
c
=
0
;
c
<
channels
;
++
c
)
*
dest
++
=
Dsd8To16Sample
(
src
++
,
channels
);
src
+=
channels
;
}
return
{
dest
0
,
out_samples
};
return
{
dest
,
out_samples
};
}
}
src/pcm/Dsd32.cxx
View file @
96d74e77
...
@@ -41,6 +41,18 @@ Dsd8To32Sample(const uint8_t *src, unsigned channels) noexcept
...
@@ -41,6 +41,18 @@ Dsd8To32Sample(const uint8_t *src, unsigned channels) noexcept
src
[
2
*
channels
],
src
[
3
*
channels
]);
src
[
2
*
channels
],
src
[
3
*
channels
]);
}
}
static
void
Dsd8To32
(
uint32_t
*
dest
,
const
uint8_t
*
src
,
size_t
out_frames
,
unsigned
channels
)
noexcept
{
for
(
size_t
i
=
0
;
i
<
out_frames
;
++
i
)
{
for
(
size_t
c
=
0
;
c
<
channels
;
++
c
)
*
dest
++
=
Dsd8To32Sample
(
src
++
,
channels
);
src
+=
3
*
channels
;
}
}
ConstBuffer
<
uint32_t
>
ConstBuffer
<
uint32_t
>
Dsd8To32
(
PcmBuffer
&
buffer
,
unsigned
channels
,
Dsd8To32
(
PcmBuffer
&
buffer
,
unsigned
channels
,
ConstBuffer
<
uint8_t
>
_src
)
noexcept
ConstBuffer
<
uint8_t
>
_src
)
noexcept
...
@@ -50,15 +62,8 @@ Dsd8To32(PcmBuffer &buffer, unsigned channels,
...
@@ -50,15 +62,8 @@ Dsd8To32(PcmBuffer &buffer, unsigned channels,
const
size_t
out_samples
=
out_frames
*
channels
;
const
size_t
out_samples
=
out_frames
*
channels
;
const
uint8_t
*
src
=
_src
.
data
;
const
uint8_t
*
src
=
_src
.
data
;
uint32_t
*
const
dest0
=
buffer
.
GetT
<
uint32_t
>
(
out_samples
);
const
auto
dest
=
buffer
.
GetT
<
uint32_t
>
(
out_samples
);
uint32_t
*
dest
=
dest0
;
Dsd8To32
(
dest
,
src
,
out_frames
,
channels
);
for
(
size_t
i
=
0
;
i
<
out_frames
;
++
i
)
{
for
(
size_t
c
=
0
;
c
<
channels
;
++
c
)
*
dest
++
=
Dsd8To32Sample
(
src
++
,
channels
);
src
+=
3
*
channels
;
}
return
{
dest
0
,
out_samples
};
return
{
dest
,
out_samples
};
}
}
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