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

Fix: 切换状态后一段时间内无法录音问题

Browse Source
This commit is contained in:
Terrence
2025-05-19 01:29:39 +08:00
parent beffb362dc
commit 7925f77739
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
main/application.cc
View File

@@ -531,7 +531,7 @@ void Application::Start() {
opus_encoder_->Encode(std::move(data), [this](std::vector<uint8_t>&& opus) { opus_encoder_->Encode(std::move(data), [this](std::vector<uint8_t>&& opus) {
AudioStreamPacket packet; AudioStreamPacket packet;
packet.payload = std::move(opus); packet.payload = std::move(opus);
uint32_t last_output_timestamp_value = last_output_timestamp_.load(); #ifdef CONFIG_USE_SERVER_AEC
{ {
std::lock_guard<std::mutex> lock(timestamp_mutex_); std::lock_guard<std::mutex> lock(timestamp_mutex_);
if (!timestamp_queue_.empty()) { if (!timestamp_queue_.empty()) {
@@ -546,10 +546,9 @@ void Application::Start() {
return; return;
} }
} }
Schedule([this, last_output_timestamp_value, packet = std::move(packet)]() { #endif
Schedule([this, packet = std::move(packet)]() {
protocol_->SendAudio(packet); protocol_->SendAudio(packet);
// ESP_LOGI(TAG, "Send %zu bytes, timestamp %lu, last_ts %lu, qsize %zu",
// packet.payload.size(), packet.timestamp, last_output_timestamp_value, timestamp_queue_.size());
}); });
}); });
}); });
@@ -732,11 +731,11 @@ void Application::OnAudioOutput() {
pcm = std::move(resampled); pcm = std::move(resampled);
} }
codec->OutputData(pcm); codec->OutputData(pcm);
{ #ifdef CONFIG_USE_SERVER_AEC
std::lock_guard<std::mutex> lock(timestamp_mutex_); std::lock_guard<std::mutex> lock(timestamp_mutex_);
timestamp_queue_.push_back(packet.timestamp); timestamp_queue_.push_back(packet.timestamp);
last_output_timestamp_ = packet.timestamp; last_output_timestamp_ = packet.timestamp;
} #endif
last_output_time_ = std::chrono::steady_clock::now(); last_output_time_ = std::chrono::steady_clock::now();
}); });
} }