diff --git a/main/audio/codecs/box_audio_codec.cc b/main/audio/codecs/box_audio_codec.cc index e8f941b6..7a5b46a3 100644 --- a/main/audio/codecs/box_audio_codec.cc +++ b/main/audio/codecs/box_audio_codec.cc @@ -230,7 +230,6 @@ void BoxAudioCodec::EnableOutput(bool enable) { } int BoxAudioCodec::Read(int16_t* dest, int samples) { - std::lock_guard lock(data_if_mutex_); if (input_enabled_) { ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_read(input_dev_, (void*)dest, samples * sizeof(int16_t))); } @@ -238,7 +237,6 @@ int BoxAudioCodec::Read(int16_t* dest, int samples) { } int BoxAudioCodec::Write(const int16_t* data, int samples) { - std::lock_guard lock(data_if_mutex_); if (output_enabled_) { ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_write(output_dev_, (void*)data, samples * sizeof(int16_t))); } diff --git a/main/audio/codecs/es8311_audio_codec.cc b/main/audio/codecs/es8311_audio_codec.cc index 0da66d1e..33c8c9dc 100644 --- a/main/audio/codecs/es8311_audio_codec.cc +++ b/main/audio/codecs/es8311_audio_codec.cc @@ -173,7 +173,6 @@ void Es8311AudioCodec::EnableOutput(bool enable) { } int Es8311AudioCodec::Read(int16_t* dest, int samples) { - std::lock_guard lock(data_if_mutex_); if (input_enabled_) { ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_read(dev_, (void*)dest, samples * sizeof(int16_t))); } @@ -181,7 +180,6 @@ int Es8311AudioCodec::Read(int16_t* dest, int samples) { } int Es8311AudioCodec::Write(const int16_t* data, int samples) { - std::lock_guard lock(data_if_mutex_); if (output_enabled_) { ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_write(dev_, (void*)data, samples * sizeof(int16_t))); } diff --git a/main/audio/codecs/es8374_audio_codec.cc b/main/audio/codecs/es8374_audio_codec.cc index 2cf33dc5..11dea586 100644 --- a/main/audio/codecs/es8374_audio_codec.cc +++ b/main/audio/codecs/es8374_audio_codec.cc @@ -182,7 +182,6 @@ void Es8374AudioCodec::EnableOutput(bool enable) { } int Es8374AudioCodec::Read(int16_t* dest, int samples) { - std::lock_guard lock(data_if_mutex_); if (input_enabled_) { ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_read(input_dev_, (void*)dest, samples * sizeof(int16_t))); } @@ -190,7 +189,6 @@ int Es8374AudioCodec::Read(int16_t* dest, int samples) { } int Es8374AudioCodec::Write(const int16_t* data, int samples) { - std::lock_guard lock(data_if_mutex_); if (output_enabled_) { ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_write(output_dev_, (void*)data, samples * sizeof(int16_t))); } diff --git a/main/audio/codecs/es8388_audio_codec.cc b/main/audio/codecs/es8388_audio_codec.cc index bb3fb760..4129fe99 100644 --- a/main/audio/codecs/es8388_audio_codec.cc +++ b/main/audio/codecs/es8388_audio_codec.cc @@ -193,7 +193,6 @@ void Es8388AudioCodec::EnableOutput(bool enable) { } int Es8388AudioCodec::Read(int16_t* dest, int samples) { - std::lock_guard lock(data_if_mutex_); if (input_enabled_) { ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_read(input_dev_, (void*)dest, samples * sizeof(int16_t))); } @@ -201,7 +200,6 @@ int Es8388AudioCodec::Read(int16_t* dest, int samples) { } int Es8388AudioCodec::Write(const int16_t* data, int samples) { - std::lock_guard lock(data_if_mutex_); if (output_enabled_) { ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_write(output_dev_, (void*)data, samples * sizeof(int16_t))); } diff --git a/main/audio/codecs/es8389_audio_codec.cc b/main/audio/codecs/es8389_audio_codec.cc index 49693331..ece34b9d 100644 --- a/main/audio/codecs/es8389_audio_codec.cc +++ b/main/audio/codecs/es8389_audio_codec.cc @@ -189,7 +189,6 @@ void Es8389AudioCodec::EnableOutput(bool enable) { } int Es8389AudioCodec::Read(int16_t* dest, int samples) { - std::lock_guard lock(data_if_mutex_); if (input_enabled_) { ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_read(input_dev_, (void*)dest, samples * sizeof(int16_t))); } @@ -197,7 +196,6 @@ int Es8389AudioCodec::Read(int16_t* dest, int samples) { } int Es8389AudioCodec::Write(const int16_t* data, int samples) { - std::lock_guard lock(data_if_mutex_); if (output_enabled_) { ESP_ERROR_CHECK_WITHOUT_ABORT(esp_codec_dev_write(output_dev_, (void*)data, samples * sizeof(int16_t))); } diff --git a/main/audio/codecs/no_audio_codec.cc b/main/audio/codecs/no_audio_codec.cc index f5c6c9c6..92fe3be3 100644 --- a/main/audio/codecs/no_audio_codec.cc +++ b/main/audio/codecs/no_audio_codec.cc @@ -302,7 +302,6 @@ int NoAudioCodec::Write(const int16_t* data, int samples) { } int NoAudioCodec::Read(int16_t* dest, int samples) { - std::lock_guard lock(data_if_mutex_); size_t bytes_read; std::vector bit32_buffer(samples); @@ -320,7 +319,6 @@ int NoAudioCodec::Read(int16_t* dest, int samples) { } int NoAudioCodecSimplexPdm::Read(int16_t* dest, int samples) { - std::lock_guard lock(data_if_mutex_); size_t bytes_read; // PDM 解调后的数据位宽为 16 位,直接读取到目标缓冲区