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>
72 lines
2.3 KiB
C++
72 lines
2.3 KiB
C++
#ifndef _AUDIO_CODEC_H
|
|
#define _AUDIO_CODEC_H
|
|
|
|
#include <freertos/FreeRTOS.h>
|
|
#include <freertos/event_groups.h>
|
|
#include <driver/i2s_std.h>
|
|
#include <esp_idf_version.h>
|
|
|
|
#include <vector>
|
|
#include <string>
|
|
#include <functional>
|
|
|
|
#include "board.h"
|
|
|
|
#define AUDIO_CODEC_DMA_DESC_NUM 6
|
|
#define AUDIO_CODEC_DMA_FRAME_NUM 240
|
|
|
|
// ESP-IDF 6 removed i2s_port_t and changed i2s_chan_config_t::id to an integer.
|
|
// Keep numeric I2S controller IDs usable on targets where IDF 5 does not expose
|
|
// every value through the target-specific i2s_port_t enum (for example ESP32-C3).
|
|
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(6, 0, 0)
|
|
#define XIAOZHI_I2S_PORT(port) (port)
|
|
#else
|
|
#define XIAOZHI_I2S_PORT(port) static_cast<i2s_port_t>(port)
|
|
#endif
|
|
|
|
class AudioCodec {
|
|
public:
|
|
AudioCodec();
|
|
virtual ~AudioCodec();
|
|
|
|
virtual void SetOutputVolume(int volume);
|
|
virtual void SetInputGain(float gain);
|
|
virtual void EnableInput(bool enable);
|
|
virtual void EnableOutput(bool enable);
|
|
|
|
virtual void OutputData(std::vector<int16_t>& data);
|
|
virtual bool InputData(std::vector<int16_t>& data);
|
|
virtual void Start();
|
|
|
|
inline bool duplex() const { return duplex_; }
|
|
inline bool input_reference() const { return input_reference_; }
|
|
inline int input_sample_rate() const { return input_sample_rate_; }
|
|
inline int output_sample_rate() const { return output_sample_rate_; }
|
|
inline int input_channels() const { return input_channels_; }
|
|
inline int output_channels() const { return output_channels_; }
|
|
inline int output_volume() const { return output_volume_; }
|
|
inline float input_gain() const { return input_gain_; }
|
|
inline bool input_enabled() const { return input_enabled_; }
|
|
inline bool output_enabled() const { return output_enabled_; }
|
|
|
|
protected:
|
|
i2s_chan_handle_t tx_handle_ = nullptr;
|
|
i2s_chan_handle_t rx_handle_ = nullptr;
|
|
|
|
bool duplex_ = false;
|
|
bool input_reference_ = false;
|
|
bool input_enabled_ = false;
|
|
bool output_enabled_ = false;
|
|
int input_sample_rate_ = 0;
|
|
int output_sample_rate_ = 0;
|
|
int input_channels_ = 1;
|
|
int output_channels_ = 1;
|
|
int output_volume_ = 70;
|
|
float input_gain_ = 0.0;
|
|
|
|
virtual int Read(int16_t* dest, int samples) = 0;
|
|
virtual int Write(const int16_t* data, int samples) = 0;
|
|
};
|
|
|
|
#endif // _AUDIO_CODEC_H
|