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

output/jack: move jack_ringbuffer_write_space() call to WriteSamples()

Browse Source
This commit is contained in:
Max Kellermann 2014-12-24 23:08:39 +01:00
parent ca88fc4ed3
commit 8928cd53bf
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/output/plugins/JackOutputPlugin.cxx
View File

@ -643,8 +643,24 @@ mpd_jack_delay(AudioOutput *ao)
inline size_t inline size_t
JackOutput::WriteSamples(const float *src, size_t n_frames) JackOutput::WriteSamples(const float *src, size_t n_frames)
{ {
assert(n_frames > 0);
const unsigned n_channels = audio_format.channels; const unsigned n_channels = audio_format.channels;
const size_t result = n_frames;
size_t space = jack_ringbuffer_write_space(ringbuffer[0]);
for (unsigned i = 1; i < n_channels; ++i) {
size_t space1 =
jack_ringbuffer_write_space(ringbuffer[i]);
if (space1 < space)
/* send data symmetrically */
space = space1;
}
space /= jack_sample_size;
if (space == 0)
return 0;
const size_t result = n_frames = std::min(space, n_frames);
while (n_frames-- > 0) while (n_frames-- > 0)
for (unsigned i = 0; i < n_channels; ++i, ++src) for (unsigned i = 0; i < n_channels; ++i, ++src)
@ -664,7 +680,6 @@ JackOutput::Play(const void *chunk, size_t size, Error &error)
assert(size % frame_size == 0); assert(size % frame_size == 0);
size /= frame_size; size /= frame_size;
size_t space = 0;
while (true) { while (true) {
if (shutdown) { if (shutdown) {
error.Set(jack_output_domain, error.Set(jack_output_domain,
@ -673,28 +688,15 @@ JackOutput::Play(const void *chunk, size_t size, Error &error)
return 0; return 0;
} }
space = jack_ringbuffer_write_space(ringbuffer[0]); size_t frames_written =
for (unsigned i = 1; i < audio_format.channels; ++i) { WriteSamples((const float *)chunk, size);
unsigned space1 = if (frames_written > 0)
jack_ringbuffer_write_space(ringbuffer[i]); return frames_written * frame_size;
if (space > space1)
/* send data symmetrically */
space = space1;
}
if (space >= jack_sample_size)
break;
/* XXX do something more intelligent to /* XXX do something more intelligent to
synchronize */ synchronize */
usleep(1000); usleep(1000);
} }
space /= jack_sample_size;
if (space < size)
size = space;
return WriteSamples((const float *)chunk, size) * frame_size;
} }
static size_t static size_t