Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-12 08:24:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Allocate speaker buffer in psram

Browse source
This commit is contained in:
Jesse Hills 2024-01-16 14:16:17 +09:00
parent dd7f56e502
commit 14bc9b64bd
No known key found for this signature in database
GPG key ID: BEAAE804EFD8E83A
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
esphome/components/esp_adf/speaker/esp_adf_speaker.cpp
View file

@ -23,12 +23,19 @@ static const char *const TAG = "esp_adf.speaker";
void ESPADFSpeaker::setup() { void ESPADFSpeaker::setup() {
ESP_LOGCONFIG(TAG, "Setting up ESP ADF Speaker..."); ESP_LOGCONFIG(TAG, "Setting up ESP ADF Speaker...");
this->buffer_queue_ = xQueueCreate(BUFFER_COUNT, sizeof(DataEvent)); ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
if (this->buffer_queue_ == nullptr) {
ESP_LOGW(TAG, "Could not allocate buffer queue."); this->buffer_queue_.storage = allocator.allocate(sizeof(StaticQueue_t) + (BUFFER_COUNT * sizeof(DataEvent)));
if (this->buffer_queue_.storage == nullptr) {
ESP_LOGE(TAG, "Failed to allocate buffer queue!");
this->mark_failed(); this->mark_failed();
return; return;
} }
this->buffer_queue_.handle =
xQueueCreateStatic(BUFFER_COUNT, sizeof(DataEvent), this->buffer_queue_.storage + sizeof(StaticQueue_t),
(StaticQueue_t *) (this->buffer_queue_.storage));
this->event_queue_ = xQueueCreate(20, sizeof(TaskEvent)); this->event_queue_ = xQueueCreate(20, sizeof(TaskEvent));
if (this->event_queue_ == nullptr) { if (this->event_queue_ == nullptr) {
ESP_LOGW(TAG, "Could not allocate event queue."); ESP_LOGW(TAG, "Could not allocate event queue.");
@ -141,7 +148,7 @@ void ESPADFSpeaker::player_task(void *params) {
uint32_t last_received = millis(); uint32_t last_received = millis();
while (true) { while (true) {
if (xQueueReceive(this_speaker->buffer_queue_, &data_event, 0) != pdTRUE) { if (xQueueReceive(this_speaker->buffer_queue_.handle, &data_event, 0) != pdTRUE) {
if (millis() - last_received > 500) { if (millis() - last_received > 500) {
// No audio for 500ms, stop // No audio for 500ms, stop
break; break;
@ -151,7 +158,7 @@ void ESPADFSpeaker::player_task(void *params) {
} }
if (data_event.stop) { if (data_event.stop) {
// Stop signal from main thread // Stop signal from main thread
while (xQueueReceive(this_speaker->buffer_queue_, &data_event, 0) == pdTRUE) { while (xQueueReceive(this_speaker->buffer_queue_.handle, &data_event, 0) == pdTRUE) {
// Flush queue // Flush queue
} }
break; break;
@ -212,7 +219,7 @@ void ESPADFSpeaker::stop() {
this->state_ = speaker::STATE_STOPPING; this->state_ = speaker::STATE_STOPPING;
DataEvent data; DataEvent data;
data.stop = true; data.stop = true;
xQueueSendToFront(this->buffer_queue_, &data, portMAX_DELAY); xQueueSendToFront(this->buffer_queue_.handle, &data, portMAX_DELAY);
} }
void ESPADFSpeaker::watch_() { void ESPADFSpeaker::watch_() {
@ -271,7 +278,7 @@ size_t ESPADFSpeaker::play(const uint8_t *data, size_t length) {
size_t to_send_length = std::min(remaining, BUFFER_SIZE); size_t to_send_length = std::min(remaining, BUFFER_SIZE);
event.len = to_send_length; event.len = to_send_length;
memcpy(event.data, data + index, to_send_length); memcpy(event.data, data + index, to_send_length);
if (xQueueSend(this->buffer_queue_, &event, 0) != pdTRUE) { if (xQueueSend(this->buffer_queue_.handle, &event, 0) != pdTRUE) {
return index; // Queue full return index; // Queue full
} }
remaining -= to_send_length; remaining -= to_send_length;
@ -280,7 +287,7 @@ size_t ESPADFSpeaker::play(const uint8_t *data, size_t length) {
return index; return index;
} }
bool ESPADFSpeaker::has_buffered_data() const { return uxQueueMessagesWaiting(this->buffer_queue_) > 0; } bool ESPADFSpeaker::has_buffered_data() const { return uxQueueMessagesWaiting(this->buffer_queue_.handle) > 0; }
} // namespace esp_adf } // namespace esp_adf
} // namespace esphome } // namespace esphome

5
esphome/components/esp_adf/speaker/esp_adf_speaker.h
View file

@ -38,7 +38,10 @@ class ESPADFSpeaker : public ESPADFPipeline, public speaker::Speaker, public Com
static void player_task(void *params); static void player_task(void *params);
TaskHandle_t player_task_handle_{nullptr}; TaskHandle_t player_task_handle_{nullptr};
QueueHandle_t buffer_queue_; struct {
QueueHandle_t handle;
uint8_t *storage;
} buffer_queue_;
QueueHandle_t event_queue_; QueueHandle_t event_queue_;
}; };