Skip to content

Make AudioPlaySdWav object honour the value of AUDIO_BLOCK_SAMPLES #448

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 2 commits into
base: master
Choose a base branch
from
Open

Make AudioPlaySdWav object honour the value of AUDIO_BLOCK_SAMPLES #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53bf471
Make AudioPlaySdWav object honour the value of AUDIO_BLOCK_SAMPLES
h4yn0nnym0u5e Oct 29, 2022
4f894df
Merge branch 'PaulStoffregen:master' into bugfix/play_sd_wav_buffer
h4yn0nnym0u5e Dec 29, 2022
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
2 changes: 1 addition & 1 deletion play_sd_raw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ void AudioPlaySdRaw::update(void)

if (rawfile.available()) {
// we can read more data from the file...
n = rawfile.read(block->data, AUDIO_BLOCK_SAMPLES*2);
n = rawfile.read(block->data, AUDIO_BLOCK_SAMPLES*sizeof(int16_t));
file_offset += n;
for (i=n/2; i < AUDIO_BLOCK_SAMPLES; i++) {
block->data[i] = 0;
Expand Down
4 changes: 2 additions & 2 deletions play_sd_wav.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,11 @@ void AudioPlaySdWav::update(void)
if (consume(n)) return; // it was enough to transmit audio
}

// we only get to this point when buffer[512] is empty
// we only get to this point when buffer[] is empty
if (state != STATE_STOP && wavfile.available()) {
// we can read more data from the file...
readagain:
buffer_length = wavfile.read(buffer, 512);
buffer_length = wavfile.read(buffer, sizeof buffer);
if (buffer_length == 0) goto end;
buffer_offset = 0;
bool parsing = (state >= 8);
Expand Down
12 changes: 11 additions & 1 deletion play_sd_wav.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@
#include "AudioStream.h"
#include "SD.h"

// Need to buffer at least two audio blocks of samples, for stereo files,
// but if AUDIO_BLOCK_SAMPLES has been set to a small value (<128 samples)
// then it's better to buffer 2*128 samples, which happens to be an SD
// card sector.
#if AUDIO_BLOCK_SAMPLES < 128
#define BUFFER_BYTES 2*128*sizeof(int16_t)
#else
#define BUFFER_BYTES 2*AUDIO_BLOCK_SAMPLES*sizeof(int16_t)
#endif // AUDIO_BLOCK_SAMPLES < 128

class AudioPlaySdWav : public AudioStream
{
public:
Expand All @@ -56,7 +66,7 @@ class AudioPlaySdWav : public AudioStream
audio_block_t *block_left;
audio_block_t *block_right;
uint16_t block_offset; // how much data is in block_left & block_right
uint8_t buffer[512]; // buffer one block of data
uint8_t buffer[BUFFER_BYTES]; // buffer at least two audio blocks of data
uint16_t buffer_offset; // where we're at consuming "buffer"
uint16_t buffer_length; // how much data is in "buffer" (512 until last read)
uint8_t header_offset; // number of bytes in header[]
Expand Down