mirror of
https://github.com/78/xiaozhi-esp32.git
synced 2026-07-21 02:05:52 +00:00
3e78cd73bd
* Migrate board builds to ESP-IDF 6.0.1 * Document upstream IDF 6 CI blockers * Use IDF 6 patched registry components * Fix board-specific ESP-IDF 6 build errors * Fix remaining ESP-IDF 6 board builds * Document final ESP-IDF 6 matrix results [skip ci] * update IDF 6 component releases * rebase IDF 6 migration and use upstream SSCMA * Enhance audio input management in AudioService - Introduced AS_EVENT_AUDIO_INPUT_STOP_REQUEST to manage audio input stopping more effectively. - Updated AudioService::Start() to clear the new stop request event. - Modified AudioService::AudioInputTask() to handle the stop request and ensure proper input disabling. - Adjusted AdcPdmAudioCodec::Start() to reflect lazy input opening, ensuring start/stop operations run in the same task. * Refactor audio codec management and configuration - Added output_device_opened_ flag to track the state of the output device in Es8388 and Es8389 codecs. - Updated EnableOutput method to prevent unnecessary device reopening and added mute functionality to manage audio output more effectively. - Enhanced error handling in Es8311AudioCodec by ensuring proper closure and deletion of the codec device. - Adjusted sample rates in board configurations for atk-dnesp32s3-box2 to 24000 Hz and introduced AUDIO_CODEC_USE_MCLK for improved clock management. * Update build configurations and documentation for ESP-IDF 6 compatibility - Added container specification for the build workflow using espressif/idf:v6.0.1. - Updated the version of the espressif/esp_video component to ^2.3.0. - Enhanced documentation to clarify the support status of ESP32-P4 variants, specifying that legacy Rev < 3 variants are excluded from the IDF 6 matrix. - Adjusted board configurations to include IDF version constraints and necessary SDK configurations for legacy support. - Improved handling of YUV formats in EspVideo to maintain compatibility with previous versions. * Implement playback drained event handling in Application - Added MAIN_EVENT_PLAYBACK_DRAINED to manage playback state transitions. - Introduced callbacks for playback drained events in AudioService to trigger listening state changes. - Refactored Application::Run() to handle deferred listening start based on playback queue status. - Enhanced audio processing logic to prevent audio truncation during state changes. - Updated related methods to ensure proper wake word detection configuration during listening mode. * Fix variant selection shell in CI * Update project version to 2.4.0 and adjust component dependencies - Bump project version in CMakeLists.txt to 2.4.0. - Change espressif/esp_video component version to ^2.0.1 in idf_component.yml. - Modify AUDIO_INPUT_REFERENCE setting in config.h to false for m5stack-core-s3. - Remove unnecessary infinite loops in xmini_c3_board.cc during initialization. --------- Co-authored-by: Xiaoxia <terrence.huang@tenclass.com>
77 lines
2.2 KiB
C++
77 lines
2.2 KiB
C++
#ifndef CUSTOM_WAKE_WORD_H
|
|
#define CUSTOM_WAKE_WORD_H
|
|
|
|
#include <esp_attr.h>
|
|
#include <freertos/FreeRTOS.h>
|
|
#include <freertos/task.h>
|
|
#include <esp_mn_iface.h>
|
|
#include <esp_mn_models.h>
|
|
#include <model_path.h>
|
|
|
|
#include <deque>
|
|
#include <string>
|
|
#include <vector>
|
|
#include <functional>
|
|
#include <mutex>
|
|
#include <condition_variable>
|
|
#include <atomic>
|
|
|
|
#include "audio_codec.h"
|
|
#include "wake_word.h"
|
|
#include "wake_word_audio_cache.h"
|
|
|
|
class CustomWakeWord : public WakeWord {
|
|
public:
|
|
CustomWakeWord();
|
|
~CustomWakeWord();
|
|
|
|
bool Initialize(AudioCodec* codec, srmodel_list_t* models_list);
|
|
void Feed(const std::vector<int16_t>& data);
|
|
void FeedMono(const int16_t* data, size_t samples);
|
|
void OnWakeWordDetected(std::function<void(const std::string& wake_word)> callback);
|
|
void Start();
|
|
void Stop();
|
|
size_t GetFeedSize();
|
|
void EncodeWakeWordData();
|
|
bool GetWakeWordOpus(std::vector<uint8_t>& opus);
|
|
const std::string& GetLastDetectedWakeWord() const { return last_detected_wake_word_; }
|
|
|
|
private:
|
|
struct Command {
|
|
std::string command;
|
|
std::string text;
|
|
std::string action;
|
|
};
|
|
|
|
// multinet 相关成员变量
|
|
esp_mn_iface_t* multinet_ = nullptr;
|
|
model_iface_data_t* multinet_model_data_ = nullptr;
|
|
srmodel_list_t *models_ = nullptr;
|
|
bool owns_models_ = false;
|
|
char* mn_name_ = nullptr;
|
|
std::string language_ = "cn";
|
|
int duration_ = 3000;
|
|
float threshold_ = 0.2;
|
|
std::deque<Command> commands_;
|
|
|
|
std::function<void(const std::string& wake_word)> wake_word_detected_callback_;
|
|
AudioCodec* codec_ = nullptr;
|
|
std::string last_detected_wake_word_;
|
|
std::atomic<bool> running_ = false;
|
|
std::vector<int16_t> input_buffer_;
|
|
std::mutex input_buffer_mutex_;
|
|
|
|
TaskHandle_t wake_word_encode_task_ = nullptr;
|
|
StaticTask_t* wake_word_encode_task_buffer_ = nullptr;
|
|
StackType_t* wake_word_encode_task_stack_ = nullptr;
|
|
WakeWordAudioCache wake_word_audio_cache_;
|
|
std::deque<std::vector<uint8_t>> wake_word_opus_;
|
|
std::mutex wake_word_mutex_;
|
|
std::condition_variable wake_word_cv_;
|
|
|
|
void FeedSamples(const int16_t* data, size_t samples, bool mono);
|
|
void ParseWakenetModelConfig();
|
|
};
|
|
|
|
#endif
|