From c66c7c64ebd16287b892f8a780cffcabafba3799 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 7 Sep 2026 15:06:14 -0400 Subject: Better OSD behavior, lots of build stuff Signed-off-by: Andrew Opalach --- src/liana/common.h | 4 ++++ src/liana/handlers/codec_server.c | 4 ++-- src/liana/list.h | 12 ------------ src/liana/vcr.c | 2 +- 4 files changed, 7 insertions(+), 15 deletions(-) (limited to 'src/liana') diff --git a/src/liana/common.h b/src/liana/common.h index ec6d50a..7776218 100644 --- a/src/liana/common.h +++ b/src/liana/common.h @@ -1,3 +1,7 @@ #pragma once #define LIANA_TIMESTAMP_INVALID ((u64)-1) + +#define LIANA_BASE_DELAY ((u64)1600000) // 1600ms +#define LIANA_BASE_PING ((u64)600000) // 600ms +#define LIANA_PAUSE_DELAY LIANA_BASE_PING diff --git a/src/liana/handlers/codec_server.c b/src/liana/handlers/codec_server.c index 31fbef8..ddba182 100644 --- a/src/liana/handlers/codec_server.c +++ b/src/liana/handlers/codec_server.c @@ -20,7 +20,7 @@ static bool codec_server_init(struct lia_server_handler *handler, struct cch_han log_warn("No codec for this format."); return false; } - log_info("Selected demuxer: %.*s.", al_str_x(&codec->codec_info->name)); + log_debug("Selected demuxer: %.*s.", al_str_x(&codec->codec_info->name)); codec->demux = codec->codec_info->create_demuxer(); if (!codec->demux->init(codec->demux, handle)) { return false; @@ -55,7 +55,7 @@ static void codec_server_write_info(struct lia_server_handler *handler, struct n nn_packet_write_u32(packet, codec->demux->streams.count); struct camu_codec_stream *stream; al_array_foreach_ptr(codec->demux->streams, i, stream) { - nn_packet_write_str(packet, &codec->codec_info->name); + nn_packet_write_str(packet, &codec->codec_info->id); nn_packet_write_u8(packet, stream->mode); nn_packet_write_u8(packet, stream->type); nn_packet_write_u64(packet, stream->duration); diff --git a/src/liana/list.h b/src/liana/list.h index 32715bd..580198f 100644 --- a/src/liana/list.h +++ b/src/liana/list.h @@ -8,20 +8,8 @@ #define LIANA_SEQUENCE_ANY -1 -#define LIANA_BASE_DELAY ((u64)2000000) // 2000ms -#define LIANA_BASE_PING ((u64)500000) // 500ms -#define LIANA_PAUSE_DELAY LIANA_BASE_PING -#define LIANA_DELAY_IGNORE ((u64)0) - -#define LIANA_BUFFER_AHEAD 2 - //#define LIANA_LIST_SCUFFED_LOOP -// @TODO: -// To handle an entry being queued right before a skip, keep a global -// "max time until all sinks buffered" and used that instead of LIANA_PAUSE_DELAY (if greater). -// Factor in LIANA_BASE_PING. - enum { LIANA_SINK_SET = 0, LIANA_SINK_UNSET, diff --git a/src/liana/vcr.c b/src/liana/vcr.c index 3a61e32..3b4866c 100644 --- a/src/liana/vcr.c +++ b/src/liana/vcr.c @@ -314,7 +314,7 @@ static void cork_if_buffered(struct lia_vcr *vcr, u64 buffer) if (vcr->expand == VCR_EXPAND_UNTOUCHED) { vcr->mark.buffered = buffer * VCR_BUFFER_GROW_FACTOR; vcr->expand = VCR_EXPAND_GROWN; - log_info("Expanded buffer to size %.2fMB.", vcr->mark.buffered / (f32)MB(1)); + log_debug("Expanded buffer to size %.2fMB.", vcr->mark.buffered / (f32)MB(1)); return; } if (!vcr->corked) { -- cgit v1.2.3-101-g0448