Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,14 @@ class AudioEngine(
this.rawFormat = rawFormat
remixer = AudioRemixer[rawFormat.channels, targetFormat.channels]
chunks = ChunkQueue(rawFormat.sampleRate, rawFormat.channels)
resampler.createStream(rawFormat.sampleRate, targetFormat.sampleRate, targetFormat.channels)
}

override fun enqueueEos(data: DecoderData) {
log.i("enqueueEos()")
data.release(false)
chunks.enqueueEos()
resampler.destroyStream()
}

override fun enqueue(data: DecoderData) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@ public interface AudioResampler {
*/
void resample(@NonNull final ShortBuffer inputBuffer, int inputSampleRate, @NonNull final ShortBuffer outputBuffer, int outputSampleRate, int channels);

/**
* createStream() and destroyStream() only to be implemented on Resamplers
* following a stream approach for continuous input buffers. Not for static one shot methods
* to resample.
* @param inputSampleRate the input sample rate
* @param outputSampleRate the output sample rate
* @param numChannels the number of channels
*/
void createStream(int inputSampleRate, int outputSampleRate, int numChannels);
void destroyStream();

AudioResampler DOWNSAMPLE = new DownsampleAudioResampler();

AudioResampler UPSAMPLE = new UpsampleAudioResampler();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,14 @@ public void resample(@NonNull ShortBuffer inputBuffer, int inputSampleRate, @Non
PASSTHROUGH.resample(inputBuffer, inputSampleRate, outputBuffer, outputSampleRate, channels);
}
}

@Override
public void createStream(int inputSampleRate, int outputSampleRate, int numChannels) {
// do nothing
}

@Override
public void destroyStream() {
// do nothing
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,14 @@ public void resample(@NonNull ShortBuffer inputBuffer, int inputSampleRate, @Non
}
}
}

@Override
public void createStream(int inputSampleRate, int outputSampleRate, int numChannels) {
// do nothing
}

@Override
public void destroyStream() {
// do nothing
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,14 @@ public void resample(@NonNull ShortBuffer inputBuffer, int inputSampleRate,
}
outputBuffer.put(inputBuffer);
}

@Override
public void createStream(int inputSampleRate, int outputSampleRate, int numChannels) {
// do nothing
}

@Override
public void destroyStream() {
// do nothing
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,16 @@ public void resample(@NonNull ShortBuffer inputBuffer, int inputSampleRate, @Non
}
}

@Override
public void createStream(int inputSampleRate, int outputSampleRate, int numChannels) {
// do nothing
}

@Override
public void destroyStream() {
// do nothing
}

/**
* We have different options here.
* 1. Return a 0 sample.
Expand Down