smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Optimize buffer zero-filling

Browse source
This commit is contained in:
Robin Gareus 2019-02-06 16:59:41 +01:00
parent 007c4ffdc0
commit b3fda6236a
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 47 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libs/ardour/disk_reader.cc
View file

@ -692,11 +692,7 @@ DiskReader::audio_read (PBD::PlaybackBuffer<Sample>*rb,
Location *loc = 0; Location *loc = 0;
if (!_playlists[DataType::AUDIO]) { if (!_playlists[DataType::AUDIO]) {
// TODO optimize use zero-buffer rb->write_zero (cnt);
for (uint32_t z = 0; z < cnt; ++z) {
Sample t = 0;
rb->write (&t, 1);
}
return 0; return 0;
} }
@ -908,12 +904,7 @@ DiskReader::refill_audio (Sample* sum_buffer, Sample* mixdown_buffer, float* gai
/* at start: nothing to do but fill with silence */ /* at start: nothing to do but fill with silence */
for (chan_n = 0, i = c->begin(); i != c->end(); ++i, ++chan_n) { for (chan_n = 0, i = c->begin(); i != c->end(); ++i, ++chan_n) {
ChannelInfo* chan (*i); ChannelInfo* chan (*i);
// TODO optimize use zero-buffer chan->rbuf->write_zero (chan->rbuf->write_space ());
samplecnt_t ws = chan->rbuf->write_space ();
for (uint32_t z = 0; z < ws; ++z) {
Sample t = 0;
chan->rbuf->write (&t, 1);
}
} }
return 0; return 0;
} }
@ -932,12 +923,7 @@ DiskReader::refill_audio (Sample* sum_buffer, Sample* mixdown_buffer, float* gai
/* at end: nothing to do but fill with silence */ /* at end: nothing to do but fill with silence */
for (chan_n = 0, i = c->begin(); i != c->end(); ++i, ++chan_n) { for (chan_n = 0, i = c->begin(); i != c->end(); ++i, ++chan_n) {
ChannelInfo* chan (*i); ChannelInfo* chan (*i);
// TODO optimize use zero-buffer chan->rbuf->write_zero (chan->rbuf->write_space ());
samplecnt_t ws = chan->rbuf->write_space ();
for (uint32_t z = 0; z < ws; ++z) {
Sample t = 0;
chan->rbuf->write (&t, 1);
}
} }
return 0; return 0;
} }
@ -990,7 +976,10 @@ DiskReader::refill_audio (Sample* sum_buffer, Sample* mixdown_buffer, float* gai
} }
if (zero_fill) { if (zero_fill) {
/* XXX: do something */ /* not sure if action is needed,
* we'll later hit the "to close to the end" case
*/
//chan->rbuf->write_zero (zero_fill);
} }
} }

40
libs/pbd/pbd/playback_buffer.h
View file

@ -107,6 +107,7 @@ public:
guint read (T *dest, guint cnt, bool commit = true); guint read (T *dest, guint cnt, bool commit = true);
guint write (T const * src, guint cnt); guint write (T const * src, guint cnt);
guint write_zero (guint cnt);
T *buffer () { return buf; } T *buffer () { return buf; }
guint bufsize () const { return size; } guint bufsize () const { return size; }
@ -139,7 +140,6 @@ private:
Glib::Threads::Mutex _reset_lock; Glib::Threads::Mutex _reset_lock;
}; };
template<class T> /*LIBPBD_API*/ guint template<class T> /*LIBPBD_API*/ guint
PlaybackBuffer<T>::write (T const *src, guint cnt) PlaybackBuffer<T>::write (T const *src, guint cnt)
{ {
@ -178,6 +178,44 @@ PlaybackBuffer<T>::write (T const *src, guint cnt)
return to_write; return to_write;
} }
template<class T> /*LIBPBD_API*/ guint
PlaybackBuffer<T>::write_zero (guint cnt)
{
guint w = g_atomic_int_get (&write_idx);
const guint free_cnt = write_space ();
if (free_cnt == 0) {
return 0;
}
const guint to_write = cnt > free_cnt ? free_cnt : cnt;
const guint cnt2 = w + to_write;
guint n1, n2;
if (cnt2 > size) {
n1 = size - w;
n2 = cnt2 & size_mask;
} else {
n1 = to_write;
n2 = 0;
}
memset (&buf[w], 0, n1 * sizeof (T));
w = (w + n1) & size_mask;
if (n2) {
memset (buf, 0, n2 * sizeof (T));
w = n2;
}
{
SpinLock sl (_writepos_lock);
write_pos += to_write;
g_atomic_int_set (&write_idx, w);
}
return to_write;
}
template<class T> /*LIBPBD_API*/ guint template<class T> /*LIBPBD_API*/ guint
PlaybackBuffer<T>::read (T *dest, guint cnt, bool commit) PlaybackBuffer<T>::read (T *dest, guint cnt, bool commit)
{ {