summaryrefslogtreecommitdiff
path: root/src/buffer
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2024-12-27 15:24:00 -0500
committerAndrew Opalach <andrew@akon.city> 2024-12-27 15:24:00 -0500
commit20003fd25404ee5fc4cd068fbc4fae1ad6f6ae99 (patch)
tree70078930432a353df7223e18eaad3f617e220c1b /src/buffer
parent4af2d16c06a8a67ab225caa61ccd94df3c572bdc (diff)
downloadcamu-20003fd25404ee5fc4cd068fbc4fae1ad6f6ae99.tar.gz
camu-20003fd25404ee5fc4cd068fbc4fae1ad6f6ae99.tar.bz2
camu-20003fd25404ee5fc4cd068fbc4fae1ad6f6ae99.zip
Finish server reuse connection, move loop to list
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.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/buffer/audio.c b/src/buffer/audio.c
index c0556e2..7bb2c4c 100644
--- a/src/buffer/audio.c
+++ b/src/buffer/audio.c
@@ -343,11 +343,11 @@ size_t camu_audio_buffer_read(struct camu_audio_buffer *buf, u8 *data, size_t re
// Only signal EOF if what, if any, data from the peak buffer
// still isn't enough for this request.
if (have < req) {
+ signal = have;
+ al_log_debug("audio_buffer", "Flushed (signal: %zu).", signal);
buf->callback(buf->userdata, CAMU_BUFFER_EOF);
flow = SIGNALED;
al_atomic_store(u8)(&buf->flow, SIGNALED, AL_ATOMIC_RELEASE);
- signal = have;
- al_log_debug("audio_buffer", "Flushed (signal: %zu).", signal);
}
} else {
// Silence remainder of the request.
diff --git a/src/buffer/video.c b/src/buffer/video.c
index 245f3d2..fefb307 100644
--- a/src/buffer/video.c
+++ b/src/buffer/video.c
@@ -242,9 +242,9 @@ bool camu_video_buffer_read(struct camu_video_buffer *buf, void *out)
return false;
}
if (flow == FLUSHED && (ret == CAMU_QUEUE_EOF || (buf->single_frame && ret == CAMU_QUEUE_OK))) {
+ al_log_debug("video_buffer", "Flushed.");
buf->callback(buf->userdata, CAMU_BUFFER_EOF);
al_atomic_store(u8)(&buf->flow, SIGNALED, AL_ATOMIC_RELEASE);
- al_log_debug("video_buffer", "Flushed.");
} else if (flow == FLOWING) {
f64 have = buf->queue->count(buf->queue) * buf->avg_frame_duration;
if (have <= BUFFER_MARK_LOW) {