From fb0ab77cd593c318ba0b3a941864342553df9301 Mon Sep 17 00:00:00 2001 From: dvdli Date: Mon, 2 Nov 2020 15:56:45 +0800 Subject: modify the buffer size to the period size to avoid underrun --- utils/tinyplay.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/utils/tinyplay.c b/utils/tinyplay.c index f6762a0..4f603ee 100644 --- a/utils/tinyplay.c +++ b/utils/tinyplay.c @@ -389,11 +389,18 @@ int sample_is_playable(const struct cmd *cmd) int play_sample(struct ctx *ctx) { char *buffer; - size_t buffer_size = pcm_frames_to_bytes(ctx->pcm, pcm_get_buffer_size(ctx->pcm)); + size_t buffer_size = 0; size_t num_read = 0; size_t remaining_data_size = ctx->chunk_header.sz; size_t read_size = 0; + const struct pcm_config *config = pcm_get_config(ctx->pcm); + if (config == NULL) { + fprintf(stderr, "unable to get pcm config\n"); + return -1; + } + + buffer_size = pcm_frames_to_bytes(ctx->pcm, config->period_size); buffer = malloc(buffer_size); if (!buffer) { fprintf(stderr, "unable to allocate %zu bytes\n", buffer_size); -- cgit v1.2.3 From 16fee33d046103db96a4e2f5492ee38dfbc2b551 Mon Sep 17 00:00:00 2001 From: dvdli Date: Mon, 2 Nov 2020 16:42:37 +0800 Subject: calcuate the thresholds after options parsing The period size and count may be changed after options parsing. We need to set proper threshoulds. --- utils/tinyplay.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/utils/tinyplay.c b/utils/tinyplay.c index 4f603ee..2689158 100644 --- a/utils/tinyplay.c +++ b/utils/tinyplay.c @@ -58,10 +58,10 @@ void cmd_init(struct cmd *cmd) cmd->config.channels = 2; cmd->config.rate = 48000; cmd->config.format = PCM_FORMAT_S16_LE; - cmd->config.silence_threshold = 1024 * 2; + cmd->config.silence_threshold = cmd->config.period_size * cmd->config.period_count; cmd->config.silence_size = 0; - cmd->config.stop_threshold = 1024 * 2; - cmd->config.start_threshold = 1024; + cmd->config.stop_threshold = cmd->config.period_size * cmd->config.period_count; + cmd->config.start_threshold = cmd->config.period_size; cmd->bits = 16; } @@ -318,6 +318,10 @@ int main(int argc, char **argv) cmd.filetype++; } + cmd.config.silence_threshold = cmd.config.period_size * cmd.config.period_count; + cmd.config.stop_threshold = cmd.config.period_size * cmd.config.period_count; + cmd.config.start_threshold = cmd.config.period_size; + if (ctx_init(&ctx, &cmd) < 0) { return EXIT_FAILURE; } -- cgit v1.2.3