diff options
Diffstat (limited to 'src/buffer')
| -rw-r--r-- | src/buffer/audio.c | 8 | ||||
| -rw-r--r-- | src/buffer/audio.h | 2 | ||||
| -rw-r--r-- | src/buffer/video.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/buffer/audio.c b/src/buffer/audio.c index 8e0d428..e9ba16c 100644 --- a/src/buffer/audio.c +++ b/src/buffer/audio.c @@ -150,7 +150,7 @@ static bool push_internal(struct camu_audio_buffer *buf, f64 pts, u8 **data, s32 // The maximum space is buf->size - 1. ptrdiff_t space = al_ring_buffer_space(&buf->rb); if (!buf->buffered && (buf->size - 1) - space >= buf->mark.buffered) { - al_log_debug("audio_buffer", "Buffered (mark: %.1fkb).", buf->mark.buffered / 1024.0); + al_log_debug("audio_buffer", "Buffered (mark: %.1fKB).", buf->mark.buffered / 1024.0); buf->callback(buf->userdata, CAMU_BUFFER_BUFFERED); buf->buffered = true; } @@ -248,13 +248,11 @@ void camu_audio_buffer_reset(struct camu_audio_buffer *buf) } } -void camu_audio_buffer_unpause(struct camu_audio_buffer *buf) +void camu_audio_buffer_resync(struct camu_audio_buffer *buf) { al_atomic_add(u32)(&buf->unpause, 1, AL_ATOMIC_RELAXED); } -// PAUSE_PAUSED signifies that the last read was silence. -// This means we can skip around in the buffer without worrying about pops. ptrdiff_t camu_audio_buffer_read(struct camu_audio_buffer *buf, u8 *data, ptrdiff_t req) { struct camu_audio_format *fmt = &buf->fmt.req; @@ -331,6 +329,8 @@ ptrdiff_t camu_audio_buffer_read(struct camu_audio_buffer *buf, u8 *data, ptrdif #endif // Unpause and possibly attempt syncing to the clock. + // PAUSE_PAUSED signifies that the last read was silence, meaning we + // can skip around in the buffer without worrying about pops. if (UNLIKELY(buf->pause == PAUSE_PAUSED)) { if (!buf->ignore_desync) { pts -= base_pts; diff --git a/src/buffer/audio.h b/src/buffer/audio.h index 5fa2473..78a12dc 100644 --- a/src/buffer/audio.h +++ b/src/buffer/audio.h @@ -70,6 +70,6 @@ void camu_audio_buffer_set_no_video(struct camu_audio_buffer *buf, bool no_video void camu_audio_buffer_push(struct camu_audio_buffer *buf, struct camu_codec_frame *frame); void camu_audio_buffer_flush(struct camu_audio_buffer *buf); void camu_audio_buffer_reset(struct camu_audio_buffer *buf); -void camu_audio_buffer_unpause(struct camu_audio_buffer *buf); +void camu_audio_buffer_resync(struct camu_audio_buffer *buf); ptrdiff_t camu_audio_buffer_read(struct camu_audio_buffer *buf, u8 *data, ptrdiff_t req); void camu_audio_buffer_free(struct camu_audio_buffer *buf); diff --git a/src/buffer/video.c b/src/buffer/video.c index 34672fb..1f2aa3c 100644 --- a/src/buffer/video.c +++ b/src/buffer/video.c @@ -12,9 +12,9 @@ #include "../codec/ffmpeg/scaler.h" #endif -#define BUFFER_MARK_LOW ((1.0 / 30.0) * 8) -#define BUFFER_MARK_BUFFERED ((1.0 / 30.0) * 4) // Must be >1. -#define BUFFER_MARK_HIGH ((1.0 / 30.0) * 12) +#define BUFFER_MARK_LOW ((1.0 / 30.0) * 4) +#define BUFFER_MARK_BUFFERED ((1.0 / 30.0) * 6) // Must be >1. +#define BUFFER_MARK_HIGH ((1.0 / 30.0) * 8) #define BUFFER_MARK_RESET (BUFFER_MARK_HIGH * 2.0) bool camu_video_buffer_init(struct camu_video_buffer *buf, struct camu_clock *clock) |