fix: add frame buffering to NoAudioProcessor for ESP32-C5 (#1766)

* add: Moji 2 has built-in ESP32-C5 dual band Wi-Fi

* feat: PowerSaveTimer 160 >> 240

* fix(audio): add frame buffering to NoAudioProcessor

On chips where CONFIG_USE_AUDIO_PROCESSOR is unavailable (e.g., ESP32-C5,
which is excluded by Kconfig despite having PSRAM), NoAudioProcessor is used.
The original implementation passed through 160-sample chunks directly, but
the Opus encoder expects 960 samples (60ms @ 16kHz), resulting in frame size
mismatch errors, high CPU usage, and watchdog resets.

Added output_buffer_ to accumulate audio samples until reaching
frame_samples_ (960) before outputting, matching AfeAudioProcessor behavior.

other:
Turn off sleep mode (PowerSaveTimer)
This commit is contained in:
MOV
2026-02-13 22:50:58 +08:00
committed by GitHub
parent fe66f39ecc
commit 8e34995944
4 changed files with 28 additions and 13 deletions

View File

@@ -6,6 +6,7 @@
void NoAudioProcessor::Initialize(AudioCodec* codec, int frame_duration_ms, srmodel_list_t* models_list) { void NoAudioProcessor::Initialize(AudioCodec* codec, int frame_duration_ms, srmodel_list_t* models_list) {
codec_ = codec; codec_ = codec;
frame_samples_ = frame_duration_ms * 16000 / 1000; frame_samples_ = frame_duration_ms * 16000 / 1000;
output_buffer_.reserve(frame_samples_);
} }
void NoAudioProcessor::Feed(std::vector<int16_t>&& data) { void NoAudioProcessor::Feed(std::vector<int16_t>&& data) {
@@ -13,15 +14,25 @@ void NoAudioProcessor::Feed(std::vector<int16_t>&& data) {
return; return;
} }
// Convert stereo to mono if needed
if (codec_->input_channels() == 2) { if (codec_->input_channels() == 2) {
// If input channels is 2, we need to fetch the left channel data for (size_t i = 0, j = 0; i < data.size() / 2; ++i, j += 2) {
auto mono_data = std::vector<int16_t>(data.size() / 2); output_buffer_.push_back(data[j]);
for (size_t i = 0, j = 0; i < mono_data.size(); ++i, j += 2) {
mono_data[i] = data[j];
} }
output_callback_(std::move(mono_data));
} else { } else {
output_callback_(std::move(data)); output_buffer_.insert(output_buffer_.end(), data.begin(), data.end());
}
// Output complete frames when buffer has enough data
while (output_buffer_.size() >= (size_t)frame_samples_) {
if (output_buffer_.size() == (size_t)frame_samples_) {
output_callback_(std::move(output_buffer_));
output_buffer_.clear();
output_buffer_.reserve(frame_samples_);
} else {
output_callback_(std::vector<int16_t>(output_buffer_.begin(), output_buffer_.begin() + frame_samples_));
output_buffer_.erase(output_buffer_.begin(), output_buffer_.begin() + frame_samples_);
}
} }
} }
@@ -31,6 +42,7 @@ void NoAudioProcessor::Start() {
void NoAudioProcessor::Stop() { void NoAudioProcessor::Stop() {
is_running_ = false; is_running_ = false;
output_buffer_.clear();
} }
bool NoAudioProcessor::IsRunning() { bool NoAudioProcessor::IsRunning() {

View File

@@ -26,6 +26,7 @@ public:
private: private:
AudioCodec* codec_ = nullptr; AudioCodec* codec_ = nullptr;
int frame_samples_ = 0; int frame_samples_ = 0;
std::vector<int16_t> output_buffer_;
std::function<void(std::vector<int16_t>&& data)> output_callback_; std::function<void(std::vector<int16_t>&& data)> output_callback_;
std::function<void(bool speaking)> vad_state_change_callback_; std::function<void(bool speaking)> vad_state_change_callback_;
std::atomic<bool> is_running_ = false; std::atomic<bool> is_running_ = false;

View File

@@ -6,7 +6,6 @@
"sdkconfig_append": [ "sdkconfig_append": [
"CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y", "CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y",
"CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v2/16m.csv\"", "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v2/16m.csv\"",
"CONFIG_PM_ENABLE=y",
"CONFIG_FREERTOS_USE_TICKLESS_IDLE=y", "CONFIG_FREERTOS_USE_TICKLESS_IDLE=y",
"CONFIG_SPIRAM_MODE_QUAD=y", "CONFIG_SPIRAM_MODE_QUAD=y",
"CONFIG_SPIRAM_SPEED_80M=y", "CONFIG_SPIRAM_SPEED_80M=y",

View File

@@ -227,16 +227,19 @@ private:
void InitializeBatteryMonitor() { void InitializeBatteryMonitor() {
adc_battery_monitor_ = new AdcBatteryMonitor(ADC_UNIT_1, ADC_CHANNEL_3, 5100000, 5100000, GPIO_NUM_NC); adc_battery_monitor_ = new AdcBatteryMonitor(ADC_UNIT_1, ADC_CHANNEL_3, 5100000, 5100000, GPIO_NUM_NC);
adc_battery_monitor_->OnChargingStatusChanged([this](bool is_charging) { adc_battery_monitor_->OnChargingStatusChanged([this](bool is_charging) {
if (is_charging) { if (power_save_timer_ != nullptr){
power_save_timer_->SetEnabled(false); if (is_charging) {
} else { power_save_timer_->SetEnabled(false);
power_save_timer_->SetEnabled(true); } else {
power_save_timer_->SetEnabled(true);
}
} }
}); });
} }
void InitializePowerSaveTimer() { void InitializePowerSaveTimer() {
power_save_timer_ = new PowerSaveTimer(240, 300); power_save_timer_ = new PowerSaveTimer(240, -1, -1);
power_save_timer_->OnEnterSleepMode([this]() { power_save_timer_->OnEnterSleepMode([this]() {
GetDisplay()->SetPowerSaveMode(true); GetDisplay()->SetPowerSaveMode(true);
}); });
@@ -348,8 +351,8 @@ private:
public: public:
MovecallMoji2ESP32C5() : boot_button_(BOOT_BUTTON_GPIO) { MovecallMoji2ESP32C5() : boot_button_(BOOT_BUTTON_GPIO) {
InitializeCodecI2c(); InitializeCodecI2c();
InitializeBatteryMonitor();
InitializePowerSaveTimer(); InitializePowerSaveTimer();
InitializeBatteryMonitor();
InitializeSpi(); InitializeSpi();
InitializeSt77916Display(); InitializeSt77916Display();
InitializeButtons(); InitializeButtons();