oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

test/run_convert: pass FileDescriptor to RunConvert()

This commit is contained in:
Max Kellermann 2021-03-08 16:50:32 +01:00
parent 3fb25d4062
commit e777fb4edb
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/run_convert.cxx
View File

@ -29,6 +29,7 @@
#include "pcm/Convert.hxx" #include "pcm/Convert.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "fs/NarrowPath.hxx" #include "fs/NarrowPath.hxx"
#include "io/FileDescriptor.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "util/StaticFifoBuffer.hxx" #include "util/StaticFifoBuffer.hxx"
#include "util/OptionDef.hxx" #include "util/OptionDef.hxx"
@ -102,7 +103,8 @@ public:
}; };
static void 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; StaticFifoBuffer<uint8_t, 4096> buffer;
@ -111,7 +113,7 @@ RunConvert(PcmConvert &convert, size_t in_frame_size)
const auto dest = buffer.Write(); const auto dest = buffer.Write();
assert(!dest.empty()); 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) if (nbytes <= 0)
break; break;
@ -128,9 +130,7 @@ RunConvert(PcmConvert &convert, size_t in_frame_size)
buffer.Consume(src.size); buffer.Consume(src.size);
auto output = convert.Convert({src.data, src.size}); auto output = convert.Convert({src.data, src.size});
out_fd.FullWrite(output.data, output.size);
[[maybe_unused]] ssize_t ignored = write(1, output.data,
output.size);
} }
while (true) { while (true) {
@ -138,8 +138,7 @@ RunConvert(PcmConvert &convert, size_t in_frame_size)
if (output.IsNull()) if (output.IsNull())
break; break;
[[maybe_unused]] ssize_t ignored = write(1, output.data, out_fd.FullWrite(output.data, output.size);
output.size);
} }
} }
@ -152,7 +151,9 @@ try {
const GlobalInit init(c.config_path); const GlobalInit init(c.config_path);
PcmConvert state(c.in_audio_format, c.out_audio_format); 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; return EXIT_SUCCESS;
} catch (...) { } catch (...) {