summaryrefslogtreecommitdiff
path: root/src/liana
diff options
context:
space:
mode:
Diffstat (limited to 'src/liana')
-rw-r--r--src/liana/handlers/codec_client.c2
-rw-r--r--src/liana/meson.build2
-rw-r--r--src/liana/server.h14
-rw-r--r--src/liana/vcr.c3
4 files changed, 3 insertions, 18 deletions
diff --git a/src/liana/handlers/codec_client.c b/src/liana/handlers/codec_client.c
index a412b5c..39bb2d1 100644
--- a/src/liana/handlers/codec_client.c
+++ b/src/liana/handlers/codec_client.c
@@ -124,7 +124,7 @@ static bool codec_client_handle_packet(struct lia_client_handler *handler, struc
}
#ifdef VCR_BUFFER_WHOLE_FILE
struct camu_codec_stream *stream = codec->handler.stream;
- AVRational time_base = stream->av.stream->time;
+ AVRational time_base = stream->av.stream->time_base;
pkt->pts += av_rescale_q(stream->duration, AV_TIME_BASE_Q, time_base);
#else
av_packet_free_side_data(pkt);
diff --git a/src/liana/meson.build b/src/liana/meson.build
index 12345c9..5c1cc42 100644
--- a/src/liana/meson.build
+++ b/src/liana/meson.build
@@ -11,7 +11,7 @@ liana_client_src = [
'handlers/codec_client.c',
'handlers.c'
]
-liana_server_deps = [cache, codecs_server]
+liana_server_deps = [cache, codecs_server, codecs_client] # codecs_client for transcode.
liana_client_deps = [codecs_client]
liana_args = []
diff --git a/src/liana/server.h b/src/liana/server.h
index 13f4a6e..55a581e 100644
--- a/src/liana/server.h
+++ b/src/liana/server.h
@@ -9,20 +9,6 @@
//#define LIANA_SERVER_LOOP
-// OLD: cache entry -> [connection handler -> connection]
-// NEW: cache entry -> node handler -> [connection handler -> connection]
-// [] = list of
-
-// liana supported server resources:
-// - file
-// - http
-// - hls
-// - cd
-// - dvd
-// - bluray
-// - archive
-// - live source (radio)
-
struct lia_node_connection {
u32 id;
struct nn_packet *packet;
diff --git a/src/liana/vcr.c b/src/liana/vcr.c
index c3adddf..4e176e7 100644
--- a/src/liana/vcr.c
+++ b/src/liana/vcr.c
@@ -337,8 +337,7 @@ void lia_vcr_uncork(struct lia_vcr_track *track)
static void vcr_track_close_internal(struct lia_vcr_track *track)
{
struct lia_vcr *vcr = track->vcr;
- // Calling packet_cache_disable() while holding the track mutex can
- // very possibly deadlock.
+ // Calling packet_cache_disable() while holding the track mutex can very possibly deadlock.
nn_packet_cache_disable(&track->cache);
nn_mutex_lock(&track->mutex);
al_atomic_store(s32)(&track->state, VCR_TRACK_CLOSED, AL_ATOMIC_RELAXED);