devttl/xiaozhi-esp32
1
0
Fork 0
forked from xiaozhi/xiaozhi-esp32
Code Pull Requests Activity

fix i2s race condition error

Browse Source
This commit is contained in:
Terrence
2025-08-12 14:54:16 +08:00
parent a4fe4d8d99
commit f890acfc7c
12 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/audio/codecs/box_audio_codec.cc
View File

@@ -184,6 +184,7 @@ void BoxAudioCodec::SetOutputVolume(int volume) {
}
void BoxAudioCodec::EnableInput(bool enable) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (enable == input_enabled_) {
return;
}
@@ -207,6 +208,7 @@ void BoxAudioCodec::EnableInput(bool enable) {
}
void BoxAudioCodec::EnableOutput(bool enable) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (enable == output_enabled_) {
return;
}
@@ -228,6 +230,7 @@ void BoxAudioCodec::EnableOutput(bool enable) {
}
int BoxAudioCodec::Read(int16_t* dest, int samples) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (input_enabled_) {
ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_read(input_dev_, (void*)dest, samples * sizeof(int16_t)));
}
@@ -235,6 +238,7 @@ int BoxAudioCodec::Read(int16_t* dest, int samples) {
}
int BoxAudioCodec::Write(const int16_t* data, int samples) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (output_enabled_) {
ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_write(output_dev_, (void*)data, samples * sizeof(int16_t)));
}

3
main/audio/codecs/box_audio_codec.h
View File

@@ -5,6 +5,8 @@
#include <esp_codec_dev.h>
#include <esp_codec_dev_defaults.h>
#include <mutex>
class BoxAudioCodec : public AudioCodec {
private:
@@ -17,6 +19,7 @@ private:
esp_codec_dev_handle_t output_dev_ = nullptr;
esp_codec_dev_handle_t input_dev_ = nullptr;
std::mutex data_if_mutex_;
void CreateDuplexChannels(gpio_num_t mclk, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din);

4
main/audio/codecs/es8311_audio_codec.cc
View File

@@ -155,6 +155,7 @@ void Es8311AudioCodec::SetOutputVolume(int volume) {
}
void Es8311AudioCodec::EnableInput(bool enable) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (enable == input_enabled_) {
return;
}
@@ -163,6 +164,7 @@ void Es8311AudioCodec::EnableInput(bool enable) {
}
void Es8311AudioCodec::EnableOutput(bool enable) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (enable == output_enabled_) {
return;
}
@@ -171,6 +173,7 @@ void Es8311AudioCodec::EnableOutput(bool enable) {
}
int Es8311AudioCodec::Read(int16_t* dest, int samples) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (input_enabled_) {
ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_read(dev_, (void*)dest, samples * sizeof(int16_t)));
}
@@ -178,6 +181,7 @@ int Es8311AudioCodec::Read(int16_t* dest, int samples) {
}
int Es8311AudioCodec::Write(const int16_t* data, int samples) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (output_enabled_) {
ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_write(dev_, (void*)data, samples * sizeof(int16_t)));
}

3
main/audio/codecs/es8311_audio_codec.h
View File

@@ -7,6 +7,8 @@
#include <driver/gpio.h>
#include <esp_codec_dev.h>
#include <esp_codec_dev_defaults.h>
#include <mutex>
class Es8311AudioCodec : public AudioCodec {
private:
@@ -18,6 +20,7 @@ private:
esp_codec_dev_handle_t dev_ = nullptr;
gpio_num_t pa_pin_ = GPIO_NUM_NC;
bool pa_inverted_ = false;
std::mutex data_if_mutex_;
void CreateDuplexChannels(gpio_num_t mclk, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din);
void UpdateDeviceState();

4
main/audio/codecs/es8374_audio_codec.cc
View File

@@ -133,6 +133,7 @@ void Es8374AudioCodec::SetOutputVolume(int volume) {
}
void Es8374AudioCodec::EnableInput(bool enable) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (enable == input_enabled_) {
return;
}
@@ -153,6 +154,7 @@ void Es8374AudioCodec::EnableInput(bool enable) {
}
void Es8374AudioCodec::EnableOutput(bool enable) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (enable == output_enabled_) {
return;
}
@@ -180,6 +182,7 @@ void Es8374AudioCodec::EnableOutput(bool enable) {
}
int Es8374AudioCodec::Read(int16_t* dest, int samples) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (input_enabled_) {
ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_read(input_dev_, (void*)dest, samples * sizeof(int16_t)));
}
@@ -187,6 +190,7 @@ int Es8374AudioCodec::Read(int16_t* dest, int samples) {
}
int Es8374AudioCodec::Write(const int16_t* data, int samples) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (output_enabled_) {
ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_write(output_dev_, (void*)data, samples * sizeof(int16_t)));
}

3
main/audio/codecs/es8374_audio_codec.h
View File

@@ -7,6 +7,8 @@
#include <driver/gpio.h>
#include <esp_codec_dev.h>
#include <esp_codec_dev_defaults.h>
#include <mutex>
class Es8374AudioCodec : public AudioCodec {
private:
@@ -18,6 +20,7 @@ private:
esp_codec_dev_handle_t output_dev_ = nullptr;
esp_codec_dev_handle_t input_dev_ = nullptr;
gpio_num_t pa_pin_ = GPIO_NUM_NC;
std::mutex data_if_mutex_;
void CreateDuplexChannels(gpio_num_t mclk, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din);

4
main/audio/codecs/es8388_audio_codec.cc
View File

@@ -137,6 +137,7 @@ void Es8388AudioCodec::SetOutputVolume(int volume) {
}
void Es8388AudioCodec::EnableInput(bool enable) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (enable == input_enabled_) {
return;
}
@@ -157,6 +158,7 @@ void Es8388AudioCodec::EnableInput(bool enable) {
}
void Es8388AudioCodec::EnableOutput(bool enable) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (enable == output_enabled_) {
return;
}
@@ -191,6 +193,7 @@ void Es8388AudioCodec::EnableOutput(bool enable) {
}
int Es8388AudioCodec::Read(int16_t* dest, int samples) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (input_enabled_) {
ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_read(input_dev_, (void*)dest, samples * sizeof(int16_t)));
}
@@ -198,6 +201,7 @@ int Es8388AudioCodec::Read(int16_t* dest, int samples) {
}
int Es8388AudioCodec::Write(const int16_t* data, int samples) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (output_enabled_) {
ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_write(output_dev_, (void*)data, samples * sizeof(int16_t)));
}

3
main/audio/codecs/es8388_audio_codec.h
View File

@@ -6,6 +6,8 @@
#include <driver/i2c_master.h>
#include <esp_codec_dev.h>
#include <esp_codec_dev_defaults.h>
#include <mutex>
class Es8388AudioCodec : public AudioCodec {
private:
@@ -17,6 +19,7 @@ private:
esp_codec_dev_handle_t output_dev_ = nullptr;
esp_codec_dev_handle_t input_dev_ = nullptr;
gpio_num_t pa_pin_ = GPIO_NUM_NC;
std::mutex data_if_mutex_;
void CreateDuplexChannels(gpio_num_t mclk, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din);

4
main/audio/codecs/es8389_audio_codec.cc
View File

@@ -140,6 +140,7 @@ void Es8389AudioCodec::SetOutputVolume(int volume) {
}
void Es8389AudioCodec::EnableInput(bool enable) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (enable == input_enabled_) {
return;
}
@@ -160,6 +161,7 @@ void Es8389AudioCodec::EnableInput(bool enable) {
}
void Es8389AudioCodec::EnableOutput(bool enable) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (enable == output_enabled_) {
return;
}
@@ -187,6 +189,7 @@ void Es8389AudioCodec::EnableOutput(bool enable) {
}
int Es8389AudioCodec::Read(int16_t* dest, int samples) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (input_enabled_) {
ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_read(input_dev_, (void*)dest, samples * sizeof(int16_t)));
}
@@ -194,6 +197,7 @@ int Es8389AudioCodec::Read(int16_t* dest, int samples) {
}
int Es8389AudioCodec::Write(const int16_t* data, int samples) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
if (output_enabled_) {
ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_write(output_dev_, (void*)data, samples * sizeof(int16_t)));
}

2
main/audio/codecs/es8389_audio_codec.h
View File

@@ -7,6 +7,7 @@
#include <driver/gpio.h>
#include <esp_codec_dev.h>
#include <esp_codec_dev_defaults.h>
#include <mutex>
class Es8389AudioCodec : public AudioCodec {
private:
@@ -18,6 +19,7 @@ private:
esp_codec_dev_handle_t output_dev_ = nullptr;
esp_codec_dev_handle_t input_dev_ = nullptr;
gpio_num_t pa_pin_ = GPIO_NUM_NC;
std::mutex data_if_mutex_;
void CreateDuplexChannels(gpio_num_t mclk, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din);

3
main/audio/codecs/no_audio_codec.cc
View File

@@ -279,6 +279,7 @@ NoAudioCodecSimplexPdm::NoAudioCodecSimplexPdm(int input_sample_rate, int output
}
int NoAudioCodec::Write(const int16_t* data, int samples) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
std::vector<int32_t> buffer(samples);
// output_volume_: 0-100
@@ -301,6 +302,7 @@ int NoAudioCodec::Write(const int16_t* data, int samples) {
}
int NoAudioCodec::Read(int16_t* dest, int samples) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
size_t bytes_read;
std::vector<int32_t> bit32_buffer(samples);
@@ -318,6 +320,7 @@ int NoAudioCodec::Read(int16_t* dest, int samples) {
}
int NoAudioCodecSimplexPdm::Read(int16_t* dest, int samples) {
std::lock_guard<std::mutex> lock(data_if_mutex_);
size_t bytes_read;
// PDM 解调后的数据位宽为 16 位，直接读取到目标缓冲区

5
main/audio/codecs/no_audio_codec.h
View File

@@ -5,9 +5,12 @@
#include <driver/gpio.h>
#include <driver/i2s_pdm.h>
#include <mutex>
class NoAudioCodec : public AudioCodec {
private:
protected:
std::mutex data_if_mutex_;
virtual int Write(const int16_t* data, int samples) override;
virtual int Read(int16_t* dest, int samples) override;