Skip to content

Add dedicated rendering functions for separate audio LR inputs. #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add dedicated rendering functions for separate audio LR inputs. #103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions tsf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ TSFDEF int tsf_active_voice_count(tsf* f);
// flag_mixing: if 0 clear the buffer first, otherwise mix into existing data
TSFDEF void tsf_render_short(tsf* f, short* buffer, int samples, int flag_mixing CPP_DEFAULT0);
TSFDEF void tsf_render_float(tsf* f, float* buffer, int samples, int flag_mixing CPP_DEFAULT0);
TSFDEF void tsf_render_float_separate(tsf* f, float* bufferL, float* bufferR, int samples CPP_DEFAULT0);

// Higher level channel based functions, set up channel parameters
// channel: channel number
Expand Down Expand Up @@ -1211,12 +1212,12 @@ static void tsf_voice_calcpitchratio(struct tsf_voice* v, float pitchShift, floa
v->pitchOutputFactor = v->region->sample_rate / (tsf_timecents2Secsd(v->region->pitch_keycenter * 100.0) * outSampleRate);
}

static void tsf_voice_render(tsf* f, struct tsf_voice* v, float* outputBuffer, int numSamples)
TSFDEF void tsf_voice_render_separate(tsf* f, struct tsf_voice* v, float* outputBufferL, float* outputBufferR, int numSamples)
{
struct tsf_region* region = v->region;
float* input = f->fontSamples;
float* outL = outputBuffer;
float* outR = (f->outputmode == TSF_STEREO_UNWEAVED ? outL + numSamples : TSF_NULL);
float* outL = outputBufferL;
float* outR = outputBufferR;

// Cache some values, to give them at least some chance of ending up in registers.
TSF_BOOL updateModEnv = (region->modEnvToPitch || region->modEnvToFilterFc);
Expand Down Expand Up @@ -1352,6 +1353,11 @@ static void tsf_voice_render(tsf* f, struct tsf_voice* v, float* outputBuffer, i
if (tmpLowpass.active || dynamicLowpass) v->lowpass = tmpLowpass;
}

TSFDEF void tsf_voice_render(tsf* f, struct tsf_voice* v, float* outputBuffer, int numSamples)
{
tsf_voice_render_separate(f, v, outputBuffer, f->outputmode == TSF_STEREO_UNWEAVED ? outputBuffer + numSamples : TSF_NULL, numSamples);
}

TSFDEF tsf* tsf_load(struct tsf_stream* stream)
{
tsf* res = TSF_NULL;
Expand Down Expand Up @@ -1737,6 +1743,16 @@ TSFDEF void tsf_render_float(tsf* f, float* buffer, int samples, int flag_mixing
tsf_voice_render(f, v, buffer, samples);
}

TSFDEF void tsf_render_float_separate(tsf* f, float* bufferL, float* bufferR, int samples)
{
struct tsf_voice *v = f->voices, *vEnd = v + f->voiceNum;
TSF_MEMSET(bufferL, 0, sizeof(float) * samples);
TSF_MEMSET(bufferR, 0, sizeof(float) * samples);
for (; v != vEnd; v++)
if (v->playingPreset != -1)
tsf_voice_render_separate(f, v, bufferL, bufferR, samples);
}

static void tsf_channel_setup_voice(tsf* f, struct tsf_voice* v)
{
struct tsf_channel* c = &f->channels->channels[f->channels->activeChannel];
Expand Down