ardour/livetrax
13
0
Fork 0
Code

make sure we allocate large enough buffers when doing a non-butler context disk buffer refill.

Browse Source 
The size of the buffer now needs to reflect that we calculate read
refills in bytes, and if we are not using 32 bit float sample format
on disk, that can translate into > 1M samples.
This commit is contained in:
Paul Davis 2015-01-30 12:57:58 -05:00
parent 3a65005a75
commit 682d8ae064
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/ardour/audio_diskstream.cc
View File

@ -1079,8 +1079,14 @@ AudioDiskstream::read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
int
AudioDiskstream::_do_refill_with_alloc (bool partial_fill)
{
Sample* mix_buf = new Sample[1048576];
float* gain_buf = new float[1048576];
/* We limit disk reads to at most 4MB chunks, which with floating point
samples would be 1M samples. But we might use 16 or 14 bit samples,
in which case 4MB is more samples than that. Therefore size this for
the smallest sample value .. 4MB = 2M samples (16 bit).
*/
Sample* mix_buf = new Sample[2*1048576];
float* gain_buf = new float[2*1048576];
int ret = _do_refill (mix_buf, gain_buf, (partial_fill ? disk_read_chunk_frames : 0));