jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #200 from nowrep/pabuf

Browse source 
pulse: Set pa_buffer_attr.maxlength when creating stream
This commit is contained in:
loki-47-6F-64 2021-09-03 15:45:56 +02:00 • committed by GitHub
commit 302b61090b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sunshine/platform/linux/audio.cpp
View file

@ -65,7 +65,7 @@ struct mic_attr_t : public mic_t {
} }
}; };
std::unique_ptr<mic_t> microphone(const std::uint8_t *mapping, int channels, std::uint32_t sample_rate) { std::unique_ptr<mic_t> microphone(const std::uint8_t *mapping, int channels, std::uint32_t sample_rate, std::uint32_t frame_size) {
auto mic = std::make_unique<mic_attr_t>(); auto mic = std::make_unique<mic_attr_t>();
pa_sample_spec ss { PA_SAMPLE_S16LE, sample_rate, (std::uint8_t)channels }; pa_sample_spec ss { PA_SAMPLE_S16LE, sample_rate, (std::uint8_t)channels };
@ -76,6 +76,9 @@ std::unique_ptr<mic_t> microphone(const std::uint8_t *mapping, int channels, std
channel = position_mapping[*mapping++]; channel = position_mapping[*mapping++];
}); });
pa_buffer_attr pa_attr = {};
pa_attr.maxlength = frame_size * 8;
int status; int status;
const char *audio_sink = "@DEFAULT_MONITOR@"; const char *audio_sink = "@DEFAULT_MONITOR@";
@ -86,7 +89,7 @@ std::unique_ptr<mic_t> microphone(const std::uint8_t *mapping, int channels, std
mic->mic.reset( mic->mic.reset(
pa_simple_new(nullptr, "sunshine", pa_simple_new(nullptr, "sunshine",
pa_stream_direction_t::PA_STREAM_RECORD, audio_sink, pa_stream_direction_t::PA_STREAM_RECORD, audio_sink,
"sunshine-record", &ss, &pa_map, nullptr, &status)); "sunshine-record", &ss, &pa_map, &pa_attr, &status));
if(!mic->mic) { if(!mic->mic) {
auto err_str = pa_strerror(status); auto err_str = pa_strerror(status);
@ -380,7 +383,7 @@ public:
} }
std::unique_ptr<mic_t> microphone(const std::uint8_t *mapping, int channels, std::uint32_t sample_rate, std::uint32_t frame_size) override { std::unique_ptr<mic_t> microphone(const std::uint8_t *mapping, int channels, std::uint32_t sample_rate, std::uint32_t frame_size) override {
return ::platf::microphone(mapping, channels, sample_rate); return ::platf::microphone(mapping, channels, sample_rate, frame_size);
} }
int set_sink(const std::string &sink) override { int set_sink(const std::string &sink) override {