Skip to content
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

Simplify stream's pcmf32 handling #2693

Closed
wants to merge 3 commits into from
Closed

Simplify stream's pcmf32 handling #2693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
419aee3
Add an audio function to retrieve the audio data since last time.
tamo Jan 1, 2025
289946d
Simplify stream's pcmf32 handling
tamo Jan 2, 2025
b27fc1f
Add headers for gcc c++
tamo Jan 2, 2025
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
38 changes: 26 additions & 12 deletions examples/common-sdl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ bool audio_async::clear() {

m_audio_pos = 0;
m_audio_len = 0;
m_audio_nxt = 0;
}

return true;
Expand Down Expand Up @@ -172,6 +173,28 @@ void audio_async::callback(uint8_t * stream, int len) {
}

void audio_async::get(int ms, std::vector<float> & result) {
if (ms <= 0) {
ms = m_len_ms;
}

size_t n_samples = std::min<size_t>(m_audio_len, (m_sample_rate * ms) / 1000);

get_n(n_samples, result);
}

void audio_async::next(std::vector<float> & result) {
size_t n_samples;

if (m_audio_pos >= m_audio_nxt) {
n_samples = m_audio_pos - m_audio_nxt;
} else {
n_samples = m_audio_len - m_audio_nxt + m_audio_pos;
}

get_n(n_samples, result);
}

void audio_async::get_n(size_t n_samples, std::vector<float> & result) {
if (!m_dev_id_in) {
fprintf(stderr, "%s: no audio device to get audio from!\n", __func__);
return;
Expand All @@ -182,20 +205,9 @@ void audio_async::get(int ms, std::vector<float> & result) {
return;
}

result.clear();

{
std::lock_guard<std::mutex> lock(m_mutex);

if (ms <= 0) {
ms = m_len_ms;
}

size_t n_samples = (m_sample_rate * ms) / 1000;
if (n_samples > m_audio_len) {
n_samples = m_audio_len;
}

result.resize(n_samples);

int s0 = m_audio_pos - n_samples;
Expand All @@ -205,10 +217,12 @@ void audio_async::get(int ms, std::vector<float> & result) {

if (s0 + n_samples > m_audio.size()) {
const size_t n0 = m_audio.size() - s0;
m_audio_nxt = n_samples - n0;

memcpy(result.data(), &m_audio[s0], n0 * sizeof(float));
memcpy(&result[n0], &m_audio[0], (n_samples - n0) * sizeof(float));
memcpy(&result[n0], &m_audio[0], m_audio_nxt * sizeof(float));
} else {
m_audio_nxt = s0 + n_samples;
memcpy(result.data(), &m_audio[s0], n_samples * sizeof(float));
}
}
Expand Down
3 changes: 3 additions & 0 deletions examples/common-sdl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ class audio_async {

// get audio data from the circular buffer
void get(int ms, std::vector<float> & audio);
void next(std::vector<float> & audio);
void get_n(size_t n_samples, std::vector<float> & audio);

private:
SDL_AudioDeviceID m_dev_id_in = 0;
Expand All @@ -43,6 +45,7 @@ class audio_async {
std::vector<float> m_audio;
size_t m_audio_pos = 0;
size_t m_audio_len = 0;
size_t m_audio_nxt = 0;
};

// Return false if need to quit
Expand Down
Loading
Loading