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

v1.7.1: fix send audio (#771)

Browse Source 
* screen -> display

* Add AUDIO_CODEC_DEFAULT_MIC_GAIN

* WebRTC -> NSNet

* fix: send audio priority
This commit is contained in:
Xiaoxia
2025-06-06 14:03:46 +08:00
committed by GitHub
parent b18dda3f2f
commit 8729fad9a8
16 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main/audio_codecs/audio_codec.h
View File

@@ -13,6 +13,7 @@
#define AUDIO_CODEC_DMA_DESC_NUM 6
#define AUDIO_CODEC_DMA_FRAME_NUM 240
#define AUDIO_CODEC_DEFAULT_MIC_GAIN 36.0
class AudioCodec {
public:

4
main/audio_codecs/box_audio_codec.cc
View File

@@ -4,7 +4,7 @@
#include <driver/i2c_master.h>
#include <driver/i2s_tdm.h>
static const char TAG[] = "BoxAudioCodec";
#define TAG "BoxAudioCodec"
BoxAudioCodec::BoxAudioCodec(void* i2c_master_handle, int input_sample_rate, int output_sample_rate,
gpio_num_t mclk, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din,
@@ -199,7 +199,7 @@ void BoxAudioCodec::EnableInput(bool enable) {
fs.channel_mask |= ESP_CODEC_DEV_MAKE_CHANNEL_MASK(1);
}
ESP_ERROR_CHECK(esp_codec_dev_open(input_dev_, &fs));
ESP_ERROR_CHECK(esp_codec_dev_set_in_channel_gain(input_dev_, ESP_CODEC_DEV_MAKE_CHANNEL_MASK(0), 40.0));
ESP_ERROR_CHECK(esp_codec_dev_set_in_channel_gain(input_dev_, ESP_CODEC_DEV_MAKE_CHANNEL_MASK(0), 36.0));
} else {
ESP_ERROR_CHECK(esp_codec_dev_close(input_dev_));
}

4
main/audio_codecs/es8311_audio_codec.cc
View File

@@ -2,7 +2,7 @@
#include <esp_log.h>
static const char TAG[] = "Es8311AudioCodec";
#define TAG "Es8311AudioCodec"
Es8311AudioCodec::Es8311AudioCodec(void* i2c_master_handle, i2c_port_t i2c_port, int input_sample_rate, int output_sample_rate,
gpio_num_t mclk, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din,
@@ -148,7 +148,7 @@ void Es8311AudioCodec::EnableInput(bool enable) {
.mclk_multiple = 0,
};
ESP_ERROR_CHECK(esp_codec_dev_open(input_dev_, &fs));
ESP_ERROR_CHECK(esp_codec_dev_set_in_gain(input_dev_, 40.0));
ESP_ERROR_CHECK(esp_codec_dev_set_in_gain(input_dev_, AUDIO_CODEC_DEFAULT_MIC_GAIN));
} else {
ESP_ERROR_CHECK(esp_codec_dev_close(input_dev_));
}

4
main/audio_codecs/es8374_audio_codec.cc
View File

@@ -2,7 +2,7 @@
#include <esp_log.h>
static const char TAG[] = "Es8374AudioCodec";
#define TAG "Es8374AudioCodec"
Es8374AudioCodec::Es8374AudioCodec(void* i2c_master_handle, i2c_port_t i2c_port, int input_sample_rate, int output_sample_rate,
gpio_num_t mclk, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din,
@@ -145,7 +145,7 @@ void Es8374AudioCodec::EnableInput(bool enable) {
.mclk_multiple = 0,
};
ESP_ERROR_CHECK(esp_codec_dev_open(input_dev_, &fs));
ESP_ERROR_CHECK(esp_codec_dev_set_in_gain(input_dev_, 40.0));
ESP_ERROR_CHECK(esp_codec_dev_set_in_gain(input_dev_, AUDIO_CODEC_DEFAULT_MIC_GAIN));
} else {
ESP_ERROR_CHECK(esp_codec_dev_close(input_dev_));
}

2
main/audio_codecs/es8388_audio_codec.cc
View File

@@ -2,7 +2,7 @@
#include <esp_log.h>
static const char TAG[] = "Es8388AudioCodec";
#define TAG "Es8388AudioCodec"
Es8388AudioCodec::Es8388AudioCodec(void* i2c_master_handle, i2c_port_t i2c_port, int input_sample_rate, int output_sample_rate,
gpio_num_t mclk, gpio_num_t bclk, gpio_num_t ws, gpio_num_t dout, gpio_num_t din,