Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Applications: Audio: Resolved wrapping calculation #18918

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Applications: Audio: Resolved wrapping calculation #18918

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions applications/nrf5340_audio/src/audio/audio_datapath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,20 @@ static struct {
} pres_comp;
} ctrl_blk;

/**
* @brief Get the current number of blocks in the output buffer.
*/
static int used_blocks_get(void)
{
if (ctrl_blk.out.cons_blk_idx < ctrl_blk.out.prod_blk_idx) {
return ctrl_blk.out.prod_blk_idx - ctrl_blk.out.cons_blk_idx;
} else if (ctrl_blk.out.cons_blk_idx > ctrl_blk.out.prod_blk_idx) {
return (FIFO_NUM_BLKS - ctrl_blk.out.cons_blk_idx) + ctrl_blk.out.prod_blk_idx;
} else {
return 0;
}
}

static bool tone_active;
/* Buffer which can hold max 1 period test tone at 100 Hz */
static uint16_t test_tone_buf[CONFIG_AUDIO_SAMPLE_RATE_HZ / 100];
Expand Down Expand Up @@ -433,6 +447,7 @@ static void audio_datapath_presentation_compensation(uint32_t recv_frame_ts_us,
return;
}

/* Operation to obtain nearest whole number in subsequent operations */
if (pres_adj_us >= 0) {
pres_adj_us += (BLK_PERIOD_US / 2);
} else {
Expand Down Expand Up @@ -961,8 +976,7 @@ void audio_datapath_stream_out(const uint8_t *buf, size_t size, uint32_t sdu_ref
}

/*** Add audio data to FIFO buffer ***/

int32_t num_blks_in_fifo = ctrl_blk.out.prod_blk_idx - ctrl_blk.out.cons_blk_idx;
uint32_t num_blks_in_fifo = used_blocks_get();

if ((num_blks_in_fifo + NUM_BLKS_IN_FRAME) > FIFO_NUM_BLKS) {
LOG_WRN("Output audio stream overrun - Discarding audio frame");
Expand Down
Loading