fix(audio): use audio-stream instead of direct I2S - fixes fast playback
Main / Build (BookPlayer) (push) Has been cancelled
Main / Build (Brainfuck) (push) Has been cancelled
Main / Build (Breakout) (push) Has been cancelled
Main / Build (Calculator) (push) Has been cancelled
Main / Build (Diceware) (push) Has been cancelled
Main / Build (EpubReader) (push) Has been cancelled
Main / Build (GPIO) (push) Has been cancelled
Main / Build (GraphicsDemo) (push) Has been cancelled
Main / Build (HelloWorld) (push) Has been cancelled
Main / Build (M5UnitTest) (push) Has been cancelled
Main / Build (Magic8Ball) (push) Has been cancelled
Main / Build (MediaKeys) (push) Has been cancelled
Main / Build (MystifyDemo) (push) Has been cancelled
Main / Build (SerialConsole) (push) Has been cancelled
Main / Build (Snake) (push) Has been cancelled
Main / Build (TamaTac) (push) Has been cancelled
Main / Build (TodoList) (push) Has been cancelled
Main / Build (TwoEleven) (push) Has been cancelled
Main / Bundle (push) Has been cancelled
Main / Build (BookPlayer) (push) Has been cancelled
Main / Build (Brainfuck) (push) Has been cancelled
Main / Build (Breakout) (push) Has been cancelled
Main / Build (Calculator) (push) Has been cancelled
Main / Build (Diceware) (push) Has been cancelled
Main / Build (EpubReader) (push) Has been cancelled
Main / Build (GPIO) (push) Has been cancelled
Main / Build (GraphicsDemo) (push) Has been cancelled
Main / Build (HelloWorld) (push) Has been cancelled
Main / Build (M5UnitTest) (push) Has been cancelled
Main / Build (Magic8Ball) (push) Has been cancelled
Main / Build (MediaKeys) (push) Has been cancelled
Main / Build (MystifyDemo) (push) Has been cancelled
Main / Build (SerialConsole) (push) Has been cancelled
Main / Build (Snake) (push) Has been cancelled
Main / Build (TamaTac) (push) Has been cancelled
Main / Build (TodoList) (push) Has been cancelled
Main / Build (TwoEleven) (push) Has been cancelled
Main / Bundle (push) Has been cancelled
- Mp3Player: sdk 0.7->0.8.0-dev, find audio-stream device, open_output with resampler (hz/ch), write via audio_stream_write, close on pause - BookPlayer: close/open per format change via AudioStreamConfig, write via stream - VoiceRecorder: input_handle open_input 16k/mono via audio_stream_read, output_handle open_output file rate via write/resampler - ES8311 native 44100, old direct I2S at 16k caused 4.096MHz MCLK vs 11.29MHz -> fast playback - Brick game correct because it uses audio-stream resampler path
This commit is contained in:
@@ -3,7 +3,8 @@
|
||||
#include <tt_lvgl_toolbar.h>
|
||||
|
||||
#include <tactility/device.h>
|
||||
#include <tactility/drivers/i2s_controller.h>
|
||||
#include <tactility/drivers/audio_stream.h>
|
||||
#include <tactility/drivers/audio_codec.h>
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
@@ -27,7 +28,8 @@ typedef enum {
|
||||
} PlaybackState;
|
||||
|
||||
typedef struct {
|
||||
struct Device* i2s_dev;
|
||||
struct Device* stream_dev;
|
||||
AudioStreamHandle stream_handle;
|
||||
char filepath[512];
|
||||
PlaybackState state;
|
||||
|
||||
@@ -119,17 +121,17 @@ static void mp3_playback_task(void* arg) {
|
||||
ctx->eof = false;
|
||||
ctx->sample_rate = 0;
|
||||
ctx->channels = 0;
|
||||
ctx->stream_handle = NULL;
|
||||
|
||||
ESP_LOGI(TAG, "Starting MP3 playback: %s (size: %d bytes)", ctx->filepath, ctx->file_size);
|
||||
|
||||
while (ctx->state != STATE_IDLE) {
|
||||
if (ctx->state == STATE_PAUSED) {
|
||||
if (ctx->sample_rate != 0) {
|
||||
// Reset I2S immediately on pause to stop DMA loops
|
||||
device_lock(ctx->i2s_dev);
|
||||
i2s_controller_reset(ctx->i2s_dev);
|
||||
device_unlock(ctx->i2s_dev);
|
||||
// Clear configuration cache to force reconfig on resume
|
||||
if (ctx->stream_handle != NULL) {
|
||||
// Close stream immediately on pause to stop DMA
|
||||
audio_stream_close(ctx->stream_handle);
|
||||
ctx->stream_handle = NULL;
|
||||
// Clear cached format to force re-open on resume
|
||||
ctx->sample_rate = 0;
|
||||
ctx->channels = 0;
|
||||
}
|
||||
@@ -172,30 +174,30 @@ static void mp3_playback_task(void* arg) {
|
||||
memmove(ctx->input_buf, ctx->input_buf + consumed, ctx->buffered_bytes);
|
||||
|
||||
if (samples > 0) {
|
||||
// Configure I2S if format changed
|
||||
// Configure audio-stream if format changed
|
||||
if (ctx->sample_rate != info.hz || ctx->channels != info.channels) {
|
||||
struct I2sConfig config = {
|
||||
.communication_format = I2S_FORMAT_STAND_I2S,
|
||||
if (ctx->stream_handle != NULL) {
|
||||
audio_stream_close(ctx->stream_handle);
|
||||
ctx->stream_handle = NULL;
|
||||
}
|
||||
|
||||
struct AudioStreamConfig config = {
|
||||
.sample_rate = (uint32_t)info.hz,
|
||||
.bits_per_sample = 16,
|
||||
.channel_left = 0,
|
||||
.channel_right = (info.channels == 2) ? 1 : I2S_CHANNEL_NONE
|
||||
.channels = (uint8_t)info.channels
|
||||
};
|
||||
|
||||
device_lock(ctx->i2s_dev);
|
||||
error_t err = i2s_controller_set_config(ctx->i2s_dev, &config);
|
||||
device_unlock(ctx->i2s_dev);
|
||||
|
||||
|
||||
error_t err = audio_stream_open_output(ctx->stream_dev, &config, &ctx->stream_handle);
|
||||
if (err != ERROR_NONE) {
|
||||
ESP_LOGE(TAG, "Failed to set config: %d", err);
|
||||
ESP_LOGE(TAG, "Failed to open audio stream: %d", err);
|
||||
break;
|
||||
}
|
||||
ctx->sample_rate = info.hz;
|
||||
ctx->channels = info.channels;
|
||||
ESP_LOGI(TAG, "I2S configured: %d Hz, %d channels", info.hz, info.channels);
|
||||
ESP_LOGI(TAG, "Audio stream opened: %d Hz, %d channels", info.hz, info.channels);
|
||||
}
|
||||
|
||||
// Adjust volume
|
||||
// Adjust volume (after resampler)
|
||||
int vol = ctx->volume;
|
||||
int16_t* samples_ptr = (int16_t*)ctx->pcm_buf;
|
||||
size_t sample_count = (size_t)samples * info.channels;
|
||||
@@ -204,15 +206,15 @@ static void mp3_playback_task(void* arg) {
|
||||
samples_ptr[i] = (int16_t)scaled;
|
||||
}
|
||||
|
||||
// Play audio to I2S
|
||||
// Play audio via audio-stream (resampled to native 44100)
|
||||
size_t offset = 0;
|
||||
size_t data_size = sample_count * sizeof(int16_t);
|
||||
bool write_err = false;
|
||||
while (offset < data_size && ctx->state == STATE_PLAYING) {
|
||||
size_t written = 0;
|
||||
error_t err = i2s_controller_write(ctx->i2s_dev, (uint8_t*)ctx->pcm_buf + offset, data_size - offset, &written, pdMS_TO_TICKS(250));
|
||||
error_t err = audio_stream_write(ctx->stream_handle, (uint8_t*)ctx->pcm_buf + offset, data_size - offset, &written, pdMS_TO_TICKS(500));
|
||||
if (err != ERROR_NONE || written == 0) {
|
||||
ESP_LOGE(TAG, "I2S write failed: %d", err);
|
||||
ESP_LOGE(TAG, "Audio stream write failed: %d", err);
|
||||
write_err = true;
|
||||
break;
|
||||
}
|
||||
@@ -232,18 +234,15 @@ static void mp3_playback_task(void* arg) {
|
||||
lv_bar_set_value(ctx->bar_progress, pct, LV_ANIM_OFF);
|
||||
tt_lvgl_unlock();
|
||||
}
|
||||
|
||||
// taskYIELD removed to avoid audio gaps - decoder loop is fast enough
|
||||
}
|
||||
|
||||
fclose(ctx->file);
|
||||
ctx->file = NULL;
|
||||
|
||||
// Reset I2S controller to clean up DMA channels and stop looping noise
|
||||
if (ctx->i2s_dev) {
|
||||
device_lock(ctx->i2s_dev);
|
||||
i2s_controller_reset(ctx->i2s_dev);
|
||||
device_unlock(ctx->i2s_dev);
|
||||
// Close audio stream to clean up DMA / resampler task
|
||||
if (ctx->stream_handle != NULL) {
|
||||
audio_stream_close(ctx->stream_handle);
|
||||
ctx->stream_handle = NULL;
|
||||
}
|
||||
|
||||
ESP_LOGI(TAG, "Playback task finished");
|
||||
@@ -292,10 +291,10 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
||||
g_ctx.input_buf = (uint8_t*)malloc(MP3_INPUT_BUFFER_SIZE);
|
||||
g_ctx.pcm_buf = (mp3d_sample_t*)malloc(MINIMP3_MAX_SAMPLES_PER_FRAME * sizeof(mp3d_sample_t));
|
||||
|
||||
// Find device
|
||||
g_ctx.i2s_dev = device_find_by_name("i2s0");
|
||||
if (!g_ctx.i2s_dev) {
|
||||
ESP_LOGE(TAG, "I2S device 'i2s0' not found!");
|
||||
// Find audio-stream device (resampling layer over ES8311 codec)
|
||||
g_ctx.stream_dev = device_find_by_name("audio-stream");
|
||||
if (!g_ctx.stream_dev) {
|
||||
ESP_LOGE(TAG, "Audio-stream device not found!");
|
||||
}
|
||||
|
||||
// Parse launch parameters
|
||||
@@ -393,8 +392,8 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
||||
lv_obj_center(lbl_stop);
|
||||
lv_obj_add_event_cb(g_ctx.btn_stop, on_stop_click, LV_EVENT_CLICKED, &g_ctx);
|
||||
|
||||
if (!g_ctx.i2s_dev) {
|
||||
lv_label_set_text(g_ctx.lbl_status, "Error: I2S Not Found");
|
||||
if (!g_ctx.stream_dev) {
|
||||
lv_label_set_text(g_ctx.lbl_status, "Error: Audio Not Found");
|
||||
lv_obj_add_state(g_ctx.btn_play_pause, LV_STATE_DISABLED);
|
||||
lv_obj_add_state(g_ctx.btn_stop, LV_STATE_DISABLED);
|
||||
} else if (!g_ctx.input_buf || !g_ctx.pcm_buf) {
|
||||
@@ -409,7 +408,7 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
||||
if (g_ctx.filepath[0] != '\0') {
|
||||
g_ctx.state = STATE_PLAYING;
|
||||
update_ui(&g_ctx);
|
||||
xTaskCreate(mp3_playback_task, "mp3_play", 4096, &g_ctx, 5, &g_ctx.playback_task_handle);
|
||||
xTaskCreate(mp3_playback_task, "mp3_play", 6144, &g_ctx, 6, &g_ctx.playback_task_handle);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -424,11 +423,10 @@ static void onHideApp(AppHandle app, void* data) {
|
||||
vTaskDelay(pdMS_TO_TICKS(10));
|
||||
}
|
||||
|
||||
// Reset I2S to ensure DMA channel is stopped
|
||||
if (g_ctx.i2s_dev) {
|
||||
device_lock(g_ctx.i2s_dev);
|
||||
i2s_controller_reset(g_ctx.i2s_dev);
|
||||
device_unlock(g_ctx.i2s_dev);
|
||||
// Close any open audio stream
|
||||
if (g_ctx.stream_handle != NULL) {
|
||||
audio_stream_close(g_ctx.stream_handle);
|
||||
g_ctx.stream_handle = NULL;
|
||||
}
|
||||
|
||||
if (g_ctx.input_buf) {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[manifest]
|
||||
version=0.1
|
||||
[target]
|
||||
sdk=0.7.0-dev
|
||||
sdk=0.8.0-dev
|
||||
platforms=esp32s3
|
||||
[app]
|
||||
id=one.tactility.mp3player
|
||||
|
||||
Reference in New Issue
Block a user