Skip to content

fix: ogg decoding example with stereo #74

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
pjsph wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −5
Open

fix: ogg decoding example with stereo #74

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
12 changes: 7 additions & 5 deletions audio/ogg-vorbis-decoding/source/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* by Lauren Kelly (thejsa) with help from mtheall.
* See the opus-decoding example for more details
*
* Last update: 2024-03-31
* Last update: 2026-04-22
*/

#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
Expand Down Expand Up @@ -129,7 +129,7 @@ bool audioInit(OggVorbis_File *vorbisFile_) {

for(size_t i = 0; i < ARRAY_SIZE(s_waveBufs); ++i) {
s_waveBufs[i].data_vaddr = buffer;
s_waveBufs[i].nsamples = WAVEBUF_SIZE / sizeof(buffer[0]);
s_waveBufs[i].nsamples = SAMPLES_PER_BUF; // stereo = two s16 played in parallel = still one sample for the dsp
s_waveBufs[i].status = NDSP_WBUF_DONE;

buffer += WAVEBUF_SIZE / sizeof(buffer[0]);
Expand All @@ -154,11 +154,13 @@ bool fillBuffer(OggVorbis_File *vorbisFile_, ndspWaveBuf *waveBuf_) {
osTickCounterStart(&timer);
#endif // DEBUG

const size_t CHANNELS_PER_SAMPLE = ndspChnGetFormat(0) == NDSP_FORMAT_STEREO_PCM16 ? 2 : 1;

// Decode (2-byte) samples until our waveBuf is full
int totalBytes = 0;
while(totalBytes < waveBuf_->nsamples * sizeof(s16)) {
while(totalBytes < waveBuf_->nsamples * sizeof(s16) * CHANNELS_PER_SAMPLE) {
int16_t *buffer = waveBuf_->data_pcm16 + (totalBytes / sizeof(s16));
const size_t bufferSize = (waveBuf_->nsamples * sizeof(s16) - totalBytes);
const size_t bufferSize = (waveBuf_->nsamples * sizeof(s16) * CHANNELS_PER_SAMPLE - totalBytes);

// Decode bufferSize bytes from vorbisFile_ into buffer,
// storing the number of bytes that were read (or error)
Expand All @@ -185,7 +187,7 @@ bool fillBuffer(OggVorbis_File *vorbisFile_, ndspWaveBuf *waveBuf_) {
// = for most cases
// < for the last possible chunk of the file, which may have less samples before EOF
// after which we don't care to recover the length
waveBuf_->nsamples = totalBytes / sizeof(s16);
waveBuf_->nsamples = totalBytes / sizeof(s16) / CHANNELS_PER_SAMPLE;
ndspChnWaveBufAdd(0, waveBuf_);
DSP_FlushDataCache(waveBuf_->data_pcm16, totalBytes);

Expand Down