smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 04:39:33 +01:00
Code Issues Projects Releases Wiki Activity

per-thread interleave buffers for SndFileSource, not per-source.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2463 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-09-12 21:55:36 +00:00
parent 077a598232
commit 1762a1be83
2 changed files with 39 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libs/ardour/ardour/sndfilesource.h
View file

@ -76,9 +76,6 @@ class SndFileSource : public AudioFileSource {
SF_INFO _info;
SF_BROADCAST_INFO *_broadcast_info;
mutable float *interleave_buf;
mutable nframes_t interleave_bufsize;
void init ();
int open();
void close();
@ -105,6 +102,8 @@ class SndFileSource : public AudioFileSource {
void handle_header_position_change ();
static int64_t get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binfo, bool& exists);
static Sample* get_interleave_buffer (nframes_t size);
};
} // namespace ARDOUR

51
libs/ardour/sndfilesource.cc
View file

@ -25,6 +25,7 @@
#include <sys/stat.h>
#include <glibmm/miscutils.h>
#include <glibmm/thread.h>
#include <pbd/stacktrace.h>
#include <ardour/sndfilesource.h>
@ -45,6 +46,20 @@ const AudioFileSource::Flag SndFileSource::default_writable_flags = AudioFileSou
AudioFileSource::Removable|
AudioFileSource::RemovableIfEmpty|
AudioFileSource::CanRename);
struct SizedSampleBuffer {
nframes_t size;
Sample* buf;
SizedSampleBuffer (nframes_t sz) : size (sz) {
buf = new Sample[size];
}
~SizedSampleBuffer() {
delete [] buf;
}
};
Glib::StaticPrivate<SizedSampleBuffer> thread_interleave_buffer = GLIBMM_STATIC_PRIVATE_INIT;
SndFileSource::SndFileSource (Session& s, const XMLNode& node)
: AudioFileSource (s, node)
@ -187,8 +202,6 @@ SndFileSource::init ()
// lets try to keep the object initalizations here at the top
xfade_buf = 0;
interleave_buf = 0;
interleave_bufsize = 0;
sf = 0;
_broadcast_info = 0;
@ -273,10 +286,6 @@ SndFileSource::~SndFileSource ()
touch_peakfile ();
}
if (interleave_buf) {
delete [] interleave_buf;
}
if (_broadcast_info) {
delete _broadcast_info;
}
@ -342,14 +351,7 @@ SndFileSource::read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const
real_cnt = cnt * _info.channels;
if (interleave_bufsize < real_cnt) {
if (interleave_buf) {
delete [] interleave_buf;
}
interleave_bufsize = real_cnt;
interleave_buf = new float[interleave_bufsize];
}
Sample* interleave_buf = get_interleave_buffer (real_cnt);
nread = sf_read_float (sf, interleave_buf, real_cnt);
ptr = interleave_buf + _channel;
@ -905,3 +907,24 @@ SndFileSource::one_of_several_channels () const
{
return _info.channels > 1;
}
Sample*
SndFileSource::get_interleave_buffer (nframes_t size)
{
SizedSampleBuffer* ssb;
if ((ssb = thread_interleave_buffer.get()) == 0) {
ssb = new SizedSampleBuffer (size);
thread_interleave_buffer.set (ssb);
cerr << pthread_self() << " new IB of " << size << endl;
}
if (ssb->size < size) {
delete ssb;
ssb = new SizedSampleBuffer (size);
thread_interleave_buffer.set (ssb);
cerr << pthread_self() << " resized IB to " << size << endl;
}
return ssb->buf;
}