Dreaded_X/car-stereo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Audio data now goes through a ringbuffer first so we can hopefully smooth out the sequence number errors

Browse Source
This commit is contained in:
Dreaded_X 2022-07-05 00:26:55 +02:00
parent b338fbcca2
commit 2bbc3673b6
Signed by: Dreaded_X
GPG Key ID: 76BDEC4E165D8AD9
3 changed files with 69 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
software/main/include/i2s.h
View File

@ -9,4 +9,6 @@ namespace i2s {
uint32_t get_sample_rate(); uint32_t get_sample_rate();
void set_sample_rate(uint32_t sample_rate); void set_sample_rate(uint32_t sample_rate);
void write(const uint8_t* data, size_t length);
} }

27
software/main/src/a2dp.cpp
View File

@ -122,21 +122,22 @@ struct __attribute__((packed)) Frame {
}; };
static void audio_data_callback(const uint8_t* data, uint32_t len) { static void audio_data_callback(const uint8_t* data, uint32_t len) {
Frame* frame = (Frame*)data; i2s::write(data, len);
for (int i = 0; i < len/4; i++) { /* Frame* frame = (Frame*)data; */
int16_t temp = frame[i].channel1; /* for (int i = 0; i < len/4; i++) { */
frame[i].channel1 = frame[i].channel2; /* int16_t temp = frame[i].channel1; */
frame[i].channel2 = temp; /* frame[i].channel1 = frame[i].channel2; */
} /* frame[i].channel2 = temp; */
/* } */
size_t bytes_written; /* size_t bytes_written; */
if (i2s_write(I2S_PORT, data, len, &bytes_written, portMAX_DELAY) != ESP_OK) { /* if (i2s_write(I2S_PORT, data, len, &bytes_written, portMAX_DELAY) != ESP_OK) { */
ESP_LOGE(A2DP_TAG, "i2s_write has failed"); /* ESP_LOGE(A2DP_TAG, "i2s_write has failed"); */
} /* } */
if (bytes_written < len) { /* if (bytes_written < len) { */
ESP_LOGE(A2DP_TAG, "Timeout: not all bytes were written to I2S"); /* ESP_LOGE(A2DP_TAG, "Timeout: not all bytes were written to I2S"); */
} /* } */
} }
void a2dp::init() { void a2dp::init() {

53
software/main/src/i2s.cpp
View File

@ -1,3 +1,6 @@
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include "freertos/ringbuf.h"
#include "esp_log.h" #include "esp_log.h"
#include "driver/i2s.h" #include "driver/i2s.h"
@ -5,6 +8,33 @@
#define I2S_TAG "APP_I2S" #define I2S_TAG "APP_I2S"
#define RINGBUF_SIZE (16 * 1024)
#define AUDIO_SAMPLE_SIZE (16 * 2 / 8) // 16bit, 2ch, 8bit/byte
static RingbufHandle_t ringbuffer = nullptr;
static void task(void*) {
ESP_LOGI(I2S_TAG, "Starting i2s task");
for (;;) {
size_t length = 0;
uint8_t* data = (uint8_t*)xRingbufferReceive(ringbuffer, &length, portMAX_DELAY);
// @TODO Swap channels
if (length) {
size_t bytes_written;
if (i2s_write(I2S_PORT, data, length, &bytes_written, portMAX_DELAY) != ESP_OK) {
ESP_LOGE(I2S_TAG, "i2s_write has failed");
}
if (bytes_written < length) {
ESP_LOGE(I2S_TAG, "Timeout: not all bytes were written to I2S");
}
vRingbufferReturnItem(ringbuffer, data);
}
}
}
void i2s::init() { void i2s::init() {
ESP_LOGI(I2S_TAG, "Initializing i2s"); ESP_LOGI(I2S_TAG, "Initializing i2s");
@ -41,6 +71,14 @@ void i2s::init() {
if (i2s_set_pin(i2s_port, &pin_config) != ESP_OK) { if (i2s_set_pin(i2s_port, &pin_config) != ESP_OK) {
ESP_LOGE(I2S_TAG, "i2s_set_pin failed"); ESP_LOGE(I2S_TAG, "i2s_set_pin failed");
} }
ringbuffer = xRingbufferCreate(RINGBUF_SIZE, RINGBUF_TYPE_BYTEBUF);
if (!ringbuffer) {
ESP_LOGE(I2S_TAG, "Failed to create ringbuffer");
return;
}
xTaskCreate(task, "I2S Task", 2048, nullptr, 0, nullptr);
} }
static uint32_t sample_rate = 44100; static uint32_t sample_rate = 44100;
@ -57,3 +95,18 @@ void i2s::set_sample_rate(uint32_t sp) {
uint32_t i2s::get_sample_rate() { uint32_t i2s::get_sample_rate() {
return sample_rate; return sample_rate;
} }
void i2s::write(const uint8_t* data, size_t length) {
UBaseType_t items;
vRingbufferGetInfo(ringbuffer, nullptr, nullptr, nullptr, nullptr, &items);
if (items < RINGBUF_SIZE * 3/8) {
xRingbufferSend(ringbuffer, data, AUDIO_SAMPLE_SIZE, portMAX_DELAY);
} else if (items > RINGBUF_SIZE * 5/8) {
length -= AUDIO_SAMPLE_SIZE;
}
if (!xRingbufferSend(ringbuffer, data, length, portMAX_DELAY)) {
ESP_LOGE(I2S_TAG, "Failed to write to ringbuffer");
}
}