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
e777fb4e
Commit
e777fb4e
authored
Mar 08, 2021
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test/run_convert: pass FileDescriptor to RunConvert()
parent
3fb25d40
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
8 deletions
+9
-8
run_convert.cxx
test/run_convert.cxx
+9
-8
No files found.
test/run_convert.cxx
View file @
e777fb4e
...
...
@@ -29,6 +29,7 @@
#include "pcm/Convert.hxx"
#include "fs/Path.hxx"
#include "fs/NarrowPath.hxx"
#include "io/FileDescriptor.hxx"
#include "util/ConstBuffer.hxx"
#include "util/StaticFifoBuffer.hxx"
#include "util/OptionDef.hxx"
...
...
@@ -102,7 +103,8 @@ public:
};
static
void
RunConvert
(
PcmConvert
&
convert
,
size_t
in_frame_size
)
RunConvert
(
PcmConvert
&
convert
,
size_t
in_frame_size
,
FileDescriptor
in_fd
,
FileDescriptor
out_fd
)
{
StaticFifoBuffer
<
uint8_t
,
4096
>
buffer
;
...
...
@@ -111,7 +113,7 @@ RunConvert(PcmConvert &convert, size_t in_frame_size)
const
auto
dest
=
buffer
.
Write
();
assert
(
!
dest
.
empty
());
ssize_t
nbytes
=
read
(
0
,
dest
.
data
,
dest
.
size
);
ssize_t
nbytes
=
in_fd
.
Read
(
dest
.
data
,
dest
.
size
);
if
(
nbytes
<=
0
)
break
;
...
...
@@ -128,9 +130,7 @@ RunConvert(PcmConvert &convert, size_t in_frame_size)
buffer
.
Consume
(
src
.
size
);
auto
output
=
convert
.
Convert
({
src
.
data
,
src
.
size
});
[[
maybe_unused
]]
ssize_t
ignored
=
write
(
1
,
output
.
data
,
output
.
size
);
out_fd
.
FullWrite
(
output
.
data
,
output
.
size
);
}
while
(
true
)
{
...
...
@@ -138,8 +138,7 @@ RunConvert(PcmConvert &convert, size_t in_frame_size)
if
(
output
.
IsNull
())
break
;
[[
maybe_unused
]]
ssize_t
ignored
=
write
(
1
,
output
.
data
,
output
.
size
);
out_fd
.
FullWrite
(
output
.
data
,
output
.
size
);
}
}
...
...
@@ -152,7 +151,9 @@ try {
const
GlobalInit
init
(
c
.
config_path
);
PcmConvert
state
(
c
.
in_audio_format
,
c
.
out_audio_format
);
RunConvert
(
state
,
c
.
in_audio_format
.
GetFrameSize
());
RunConvert
(
state
,
c
.
in_audio_format
.
GetFrameSize
(),
FileDescriptor
(
STDIN_FILENO
),
FileDescriptor
(
STDOUT_FILENO
));
return
EXIT_SUCCESS
;
}
catch
(...)
{
...
...
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