Skip to content

Commit

Permalink
Merge pull request #11717 from ronso0/cachingreader-debug
Browse files Browse the repository at this point in the history 
ReadAheadManager: fix loop wraparound reader condition
  • Loading branch information
@daschuer
daschuer committed Jul 9, 2023
2 parents cb30b1d + 317176d commit 5c299f5
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 22 deletions.
27 changes: 19 additions & 8 deletions src/engine/cachingreader/cachingreader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,19 +293,30 @@ void CachingReader::process() {

CachingReader::ReadResult CachingReader::read(SINT startSample, SINT numSamples, bool reverse, CSAMPLE* buffer) {
// Check for bad inputs
VERIFY_OR_DEBUG_ASSERT(
// Refuse to read from an invalid position
(startSample % CachingReaderChunk::kChannels == 0) &&
// Refuse to read from an invalid number of samples
(numSamples % CachingReaderChunk::kChannels == 0) && (numSamples >= 0)) {
// Refuse to read from an invalid position
VERIFY_OR_DEBUG_ASSERT(startSample % CachingReaderChunk::kChannels == 0) {
kLogger.critical()
<< "Invalid arguments for read():"
<< "startSample =" << startSample
<< "numSamples =" << numSamples
<< "reverse =" << reverse;
<< "startSample =" << startSample;
return ReadResult::UNAVAILABLE;
}
// Refuse to read from an invalid number of samples
VERIFY_OR_DEBUG_ASSERT(numSamples % CachingReaderChunk::kChannels == 0) {
kLogger.critical()
<< "Invalid arguments for read():"
<< "numSamples =" << numSamples;
return ReadResult::UNAVAILABLE;
}
VERIFY_OR_DEBUG_ASSERT(numSamples >= 0) {
kLogger.critical()
<< "Invalid arguments for read():"
<< "numSamples =" << numSamples;
return ReadResult::UNAVAILABLE;
}
VERIFY_OR_DEBUG_ASSERT(buffer) {
kLogger.critical()
<< "Invalid arguments for read():"
<< "buffer =" << buffer;
return ReadResult::UNAVAILABLE;
}

Expand Down
29 changes: 15 additions & 14 deletions src/engine/readaheadmanager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
#include "util/math.h"
#include "util/sample.h"

static constexpr int kNumChannels = 2;

ReadAheadManager::ReadAheadManager()
: m_pLoopingControl(nullptr),
m_pRateControl(nullptr),
Expand Down Expand Up @@ -37,15 +35,15 @@ ReadAheadManager::~ReadAheadManager() {

SINT ReadAheadManager::getNextSamples(double dRate, CSAMPLE* pOutput,
SINT requested_samples) {
// TODO(XXX): Remove implicit assumption of 2 channels
if (!even(requested_samples)) {
// qDebug() << "getNextSamples:" << m_currentPosition << requested_samples;

int modSamples = requested_samples % mixxx::kEngineChannelCount;
if (modSamples != 0) {
qDebug() << "ERROR: Non-even requested_samples to ReadAheadManager::getNextSamples";
requested_samples--;
requested_samples -= modSamples;
}
bool in_reverse = dRate < 0;

//qDebug() << "start" << start_sample << requested_samples;

mixxx::audio::FramePos targetPosition;
// A loop (beat loop or track on repeat) will only limit the amount we
// can read in one shot.
Expand All @@ -71,7 +69,7 @@ SINT ReadAheadManager::getNextSamples(double dRate, CSAMPLE* pOutput,
// We can only read whole frames from the reader.
// Use ceil here, to be sure to reach the loop trigger.
preloop_samples = SampleUtil::ceilPlayPosToFrameStart(
samplesToLoopTrigger, kNumChannels);
samplesToLoopTrigger, mixxx::kEngineChannelCount);
// clamp requested samples from the caller to the loop trigger point
if (preloop_samples <= requested_samples) {
reachedTrigger = true;
Expand All @@ -87,7 +85,7 @@ SINT ReadAheadManager::getNextSamples(double dRate, CSAMPLE* pOutput,
}

SINT start_sample = SampleUtil::roundPlayPosToFrameStart(
m_currentPosition, kNumChannels);
m_currentPosition, mixxx::kEngineChannelCount);

const auto readResult = m_pReader->read(
start_sample, samples_from_reader, in_reverse, pOutput);
Expand Down Expand Up @@ -144,7 +142,9 @@ SINT ReadAheadManager::getNextSamples(double dRate, CSAMPLE* pOutput,
// start reading before the loop start point, to crossfade these samples
// with the samples we need to the loop end
int loop_read_position = SampleUtil::roundPlayPosToFrameStart(
m_currentPosition + (in_reverse ? preloop_samples : -preloop_samples), kNumChannels);
m_currentPosition +
(in_reverse ? preloop_samples : -preloop_samples),
mixxx::kEngineChannelCount);

int crossFadeStart = 0;
int crossFadeSamples = samples_from_reader;
Expand All @@ -155,12 +155,13 @@ SINT ReadAheadManager::getNextSamples(double dRate, CSAMPLE* pOutput,
} else {
int trackSamples = static_cast<int>(m_pLoopingControl->getTrackSamples());
if (loop_read_position > trackSamples) {
// looping in reverse overlapping post-roll without samples
crossFadeStart = loop_read_position - trackSamples;
crossFadeSamples -= crossFadeStart;
}
}

if (crossFadeSamples) {
if (crossFadeSamples > 0) {
const auto readResult = m_pReader->read(loop_read_position +
(in_reverse ? crossFadeStart : -crossFadeStart),
crossFadeSamples,
Expand All @@ -185,7 +186,7 @@ SINT ReadAheadManager::getNextSamples(double dRate, CSAMPLE* pOutput,
}
}

//qDebug() << "read" << m_currentPosition << samples_read;
// qDebug() << "read" << m_currentPosition << samples_from_reader;
return samples_from_reader;
}

Expand Down Expand Up @@ -220,11 +221,11 @@ void ReadAheadManager::hintReader(double dRate, gsl::not_null<HintVector*> pHint
// this called after the precious chunk was consumed
if (in_reverse) {
current_position.frame =
static_cast<SINT>(ceil(m_currentPosition / kNumChannels)) -
static_cast<SINT>(ceil(m_currentPosition / mixxx::kEngineChannelCount)) -
frameCountToCache;
} else {
current_position.frame =
static_cast<SINT>(floor(m_currentPosition / kNumChannels));
static_cast<SINT>(floor(m_currentPosition / mixxx::kEngineChannelCount));
}

// If we are trying to cache before the start of the track,
Expand Down

0 comments on commit 5c299f5

Please sign in to comment.