summaryrefslogtreecommitdiff
path: root/src/buffer
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2024-04-09 19:54:27 -0400
committerAndrew Opalach <andrew@akon.city> 2024-04-09 19:54:27 -0400
commit90e0930d820972802d1bb2fb27d7dded304483d6 (patch)
treee41652b48315f11f73654d857ce2a0d1184c4fbd /src/buffer
parent02f3d3565602146bbbfce85b2719246f24036cb9 (diff)
downloadcamu-90e0930d820972802d1bb2fb27d7dded304483d6.tar.gz
camu-90e0930d820972802d1bb2fb27d7dded304483d6.tar.bz2
camu-90e0930d820972802d1bb2fb27d7dded304483d6.zip
Cleanup
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src/buffer')
-rw-r--r--src/buffer/audio.c4
-rw-r--r--src/buffer/video.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/buffer/audio.c b/src/buffer/audio.c
index bfefed7..644be42 100644
--- a/src/buffer/audio.c
+++ b/src/buffer/audio.c
@@ -116,7 +116,7 @@ bool camu_audio_buffer_configure(struct camu_audio_buffer *buf, struct camu_stre
#ifdef _DEBUG_
#define BUFFER_OCCUPIED_DEBUG(buf) \
- camu_ff_resample_fmt_bytes_to_sec(&buf->fmt, buf->size - al_ring_buffer_space(&buf->rb))
+ camu_ff_resample_fmt_bytes_to_sec(&buf->fmt, al_ring_buffer_occupied(&buf->rb))
#else
#define BUFFER_OCCUPIED_DEBUG(buf) 0
#endif
@@ -203,7 +203,7 @@ void camu_audio_buffer_unpause(struct camu_audio_buffer *buf)
buf->pause = PAUSE_PRE;
}
-// Not thread-safe, must be called while the buffer is not be read or written to.
+// Not thread-safe, must be called while the buffer is not being read from or written to.
void camu_audio_buffer_reset(struct camu_audio_buffer *buf)
{
al_atomic_size_t_store(&buf->continue_mark, 0, AL_ATOMIC_RELAXED);
diff --git a/src/buffer/video.c b/src/buffer/video.c
index ca8baab..390b181 100644
--- a/src/buffer/video.c
+++ b/src/buffer/video.c
@@ -77,7 +77,7 @@ static void after_push_internal(struct camu_video_buffer *buf)
{
s32 count = buf->queue->count(buf->queue);
if (!buf->buffered && (buf->single_frame || count >= BUFFER_WATERMARK_BUFFERED)) {
- // Preserve order of, flush -> callback -> set flow, for single frames.
+ // Preserve order of: flush -> callback -> set flow, for single frames.
if (buf->single_frame) buf->queue->flush(buf->queue);
buf->callback(buf->userdata, CAMU_BUFFER_BUFFERED);
buf->buffered = true;
@@ -135,7 +135,7 @@ void camu_video_buffer_push(struct camu_video_buffer *buf, struct camu_frame *fr
after_push_internal(buf);
}
-// Not thread-safe, must be called while the buffer is not be read or written to.
+// Not thread-safe, must be called while the buffer is not being read from or written to.
void camu_video_buffer_reset(struct camu_video_buffer *buf)
{
buf->queue->reset(buf->queue);