mirror of
https://github.com/cookiengineer/audacity
synced 2025-07-05 15:09:08 +02:00
line lengths
This commit is contained in:
parent
8e151aba8d
commit
575e631d49
@ -2259,8 +2259,10 @@ bool AudioIO::AllocateBuffers(
|
|||||||
// Capacity of the playback buffer.
|
// Capacity of the playback buffer.
|
||||||
mPlaybackRingBufferSecs = 10.0;
|
mPlaybackRingBufferSecs = 10.0;
|
||||||
|
|
||||||
mCaptureRingBufferSecs = 4.5 + 0.5 * std::min(size_t(16), mCaptureTracks.size());
|
mCaptureRingBufferSecs =
|
||||||
mMinCaptureSecsToCopy = 0.2 + 0.2 * std::min(size_t(16), mCaptureTracks.size());
|
4.5 + 0.5 * std::min(size_t(16), mCaptureTracks.size());
|
||||||
|
mMinCaptureSecsToCopy =
|
||||||
|
0.2 + 0.2 * std::min(size_t(16), mCaptureTracks.size());
|
||||||
|
|
||||||
bool bDone;
|
bool bDone;
|
||||||
do
|
do
|
||||||
@ -2295,14 +2297,16 @@ bool AudioIO::AllocateBuffers(
|
|||||||
mPlaybackTracks[i]->SetOldChannelGain(0, 0.0);
|
mPlaybackTracks[i]->SetOldChannelGain(0, 0.0);
|
||||||
mPlaybackTracks[i]->SetOldChannelGain(1, 0.0);
|
mPlaybackTracks[i]->SetOldChannelGain(1, 0.0);
|
||||||
|
|
||||||
mPlaybackBuffers[i] = std::make_unique<RingBuffer>(floatSample, playbackBufferSize);
|
mPlaybackBuffers[i] =
|
||||||
|
std::make_unique<RingBuffer>(floatSample, playbackBufferSize);
|
||||||
|
|
||||||
// use track time for the end time, not real time!
|
// use track time for the end time, not real time!
|
||||||
WaveTrackConstArray mixTracks;
|
WaveTrackConstArray mixTracks;
|
||||||
mixTracks.push_back(mPlaybackTracks[i]);
|
mixTracks.push_back(mPlaybackTracks[i]);
|
||||||
|
|
||||||
double endTime;
|
double endTime;
|
||||||
if (make_iterator_range(tracks.prerollTracks).contains(mPlaybackTracks[i]))
|
if (make_iterator_range(tracks.prerollTracks)
|
||||||
|
.contains(mPlaybackTracks[i]))
|
||||||
// Stop playing this track after pre-roll
|
// Stop playing this track after pre-roll
|
||||||
endTime = t0;
|
endTime = t0;
|
||||||
else
|
else
|
||||||
@ -2329,9 +2333,11 @@ bool AudioIO::AllocateBuffers(
|
|||||||
{
|
{
|
||||||
// Allocate input buffers. For every input track we allocate
|
// Allocate input buffers. For every input track we allocate
|
||||||
// a ring buffer of five seconds
|
// a ring buffer of five seconds
|
||||||
auto captureBufferSize = (size_t)(mRate * mCaptureRingBufferSecs + 0.5);
|
auto captureBufferSize =
|
||||||
|
(size_t)(mRate * mCaptureRingBufferSecs + 0.5);
|
||||||
|
|
||||||
// In the extraordinarily rare case that we can't even afford 100 samples, just give up.
|
// In the extraordinarily rare case that we can't even afford
|
||||||
|
// 100 samples, just give up.
|
||||||
if(captureBufferSize < 100)
|
if(captureBufferSize < 100)
|
||||||
{
|
{
|
||||||
StartStreamCleanup();
|
StartStreamCleanup();
|
||||||
@ -2345,10 +2351,11 @@ bool AudioIO::AllocateBuffers(
|
|||||||
|
|
||||||
for( unsigned int i = 0; i < mCaptureTracks.size(); i++ )
|
for( unsigned int i = 0; i < mCaptureTracks.size(); i++ )
|
||||||
{
|
{
|
||||||
mCaptureBuffers[i] = std::make_unique<RingBuffer>
|
mCaptureBuffers[i] = std::make_unique<RingBuffer>(
|
||||||
( mCaptureTracks[i]->GetSampleFormat(),
|
mCaptureTracks[i]->GetSampleFormat(), captureBufferSize );
|
||||||
captureBufferSize );
|
mResample[i] =
|
||||||
mResample[i] = std::make_unique<Resample>(true, mFactor, mFactor); // constant rate resampling
|
std::make_unique<Resample>(true, mFactor, mFactor);
|
||||||
|
// constant rate resampling
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2363,8 +2370,10 @@ bool AudioIO::AllocateBuffers(
|
|||||||
mMinCaptureSecsToCopy *= 0.5;
|
mMinCaptureSecsToCopy *= 0.5;
|
||||||
bDone = false;
|
bDone = false;
|
||||||
|
|
||||||
// In the extraordinarily rare case that we can't even afford 100 samples, just give up.
|
// In the extraordinarily rare case that we can't even afford 100
|
||||||
auto playbackBufferSize = (size_t)lrint(mRate * mPlaybackRingBufferSecs);
|
// samples, just give up.
|
||||||
|
auto playbackBufferSize =
|
||||||
|
(size_t)lrint(mRate * mPlaybackRingBufferSecs);
|
||||||
auto playbackMixBufferSize = mPlaybackSamplesToCopy;
|
auto playbackMixBufferSize = mPlaybackSamplesToCopy;
|
||||||
if(playbackBufferSize < 100 || playbackMixBufferSize < 100)
|
if(playbackBufferSize < 100 || playbackMixBufferSize < 100)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user