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

fix streaming channel ring buffer chunck management #494

Closed
wants to merge 1 commit into from
Closed

fix streaming channel ring buffer chunck management #494

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
10 changes: 5 additions & 5 deletions engine/core/src/streaming.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ uint32_t Streaming_PutSample(streaming_channel_t *stream, const void *data, uint
if (((size * stream->data_size) + (uintptr_t)stream->data_ptr) >= (uintptr_t)stream->end_ring_buffer)
{
// our data exceeds ring buffer end, cut it and copy.
uint32_t chunk1 = (uintptr_t)stream->end_ring_buffer - (uintptr_t)stream->data_ptr;
uint32_t chunk1 = (uintptr_t)stream->end_ring_buffer - (uintptr_t)stream->data_ptr + stream->data_size;
uint32_t chunk2 = (size * stream->data_size) - chunk1;
// Everything good copy datas.
memcpy(stream->data_ptr, data, chunk1);
Expand Down Expand Up @@ -97,8 +97,8 @@ uint32_t Streaming_GetSample(streaming_channel_t *stream, void *data, uint32_t s
if ((stream->sample_ptr + (size * stream->data_size)) > stream->end_ring_buffer)
{
// requested data exceeds ring buffer end, cut it and copy.
int chunk1 = stream->end_ring_buffer - stream->sample_ptr;
int chunk2 = (size * stream->data_size) - chunk1;
uint32_t chunk1 = stream->end_ring_buffer - stream->sample_ptr + stream->data_size;
uint32_t chunk2 = (size * stream->data_size) - chunk1;
memcpy(data, stream->sample_ptr, chunk1);
memcpy((char *)data + chunk1, stream->ring_buffer, chunk2);
// Set the new sample pointer
Expand Down Expand Up @@ -170,7 +170,7 @@ uint32_t Streaming_AddAvailableSampleNB(streaming_channel_t *stream, uint32_t si
LUOS_ASSERT((int32_t)(total_sample_capacity - Streaming_GetAvailableSampleNB(stream) - size) > 0);
if (((size * stream->data_size) + stream->data_ptr) >= stream->end_ring_buffer)
{
uint32_t chunk1 = (uintptr_t)stream->end_ring_buffer - (uintptr_t)stream->data_ptr;
uint32_t chunk1 = (uintptr_t)stream->end_ring_buffer - (uintptr_t)stream->data_ptr + stream->data_size;
uint32_t chunk2 = (size * stream->data_size) - chunk1;
stream->data_ptr = (void *)((uintptr_t)stream->ring_buffer + chunk2);
}
Expand All @@ -195,7 +195,7 @@ uint32_t Streaming_RmvAvailableSampleNB(streaming_channel_t *stream, uint32_t si
if (((size * stream->data_size) + stream->sample_ptr) > stream->end_ring_buffer)
{
// We exceed ring buffer end.
uint32_t chunk1 = (uintptr_t)stream->end_ring_buffer - (uintptr_t)stream->sample_ptr;
uint32_t chunk1 = (uintptr_t)stream->end_ring_buffer - (uintptr_t)stream->sample_ptr + stream->data_size;
uint32_t chunk2 = (size * stream->data_size) - chunk1;
stream->sample_ptr = (void *)((uintptr_t)stream->ring_buffer + chunk2);
}
Expand Down
Loading