summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2024-01-21 18:53:13 -0500
committerAndrew Opalach <andrew@akon.city> 2024-01-21 18:53:13 -0500
commitdd2036e23a1f800f13b821eaa862403de1aa17f0 (patch)
tree85f241c30364319e8cf41114c8ff361046a51567 /src
parent88ea5bdca85fc0954d1dd64309a308199c1af4a8 (diff)
downloadcamu-dd2036e23a1f800f13b821eaa862403de1aa17f0.tar.gz
camu-dd2036e23a1f800f13b821eaa862403de1aa17f0.tar.bz2
camu-dd2036e23a1f800f13b821eaa862403de1aa17f0.zip
Add files for wsl environment, small fixes
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src')
-rw-r--r--src/bimu/vcr.c10
-rw-r--r--src/buffer/audio.c1
-rw-r--r--src/libsink/sink.c2
-rw-r--r--src/render/meson.build5
-rw-r--r--src/screen/meson.build3
-rw-r--r--src/tree/common.h4
6 files changed, 13 insertions, 12 deletions
diff --git a/src/bimu/vcr.c b/src/bimu/vcr.c
index 6c39d86..c5bb0e8 100644
--- a/src/bimu/vcr.c
+++ b/src/bimu/vcr.c
@@ -3,6 +3,10 @@
#include "vcr.h"
#include "handler.h"
+#define VCR_BUFFER_HIGH 1024
+#define VCR_BUFFER_BUFFERED (VCR_BUFFER_HIGH - 64)
+#define VCR_BUFFER_LOW (VCR_BUFFER_HIGH - 256)
+
static void signal_callback(void *userdata)
{
struct bmu_vcr *vcr = (struct bmu_vcr *)userdata;
@@ -29,7 +33,7 @@ static aki_thread_result AKI_THREADCALL vcr_stream_thread(void *userdata)
stream->client->handle_eof(stream->client);
break;
}
- if (al_atomic_u64_sub(&vcr->count, 1, AL_ATOMIC_RELAXED) < 128 && stream->buffered) {
+ if (al_atomic_u64_sub(&vcr->count, 1, AL_ATOMIC_RELAXED) < VCR_BUFFER_LOW && stream->buffered) {
aki_signal_send(&vcr->signal);
}
if (al_atomic_s32_load(&stream->state, AL_ATOMIC_RELAXED) == BIMU_STREAM_STOPPED) {
@@ -52,7 +56,7 @@ void bmu_vcr_add_stream(struct bmu_vcr *vcr, struct bmu_vcr_stream *stream)
stream->vcr = vcr;
aki_cond_init(&stream->cond);
aki_mutex_init(&stream->mutex);
- aki_packet_cache_init(&stream->cache, 256);
+ aki_packet_cache_init(&stream->cache, VCR_BUFFER_HIGH);
stream->buffered = false;
al_array_push(vcr->streams, stream);
al_atomic_s32_store(&stream->state, BIMU_STREAM_RUNNING, AL_ATOMIC_RELAXED);
@@ -80,7 +84,7 @@ bool bmu_vcr_push_packet(struct bmu_vcr *vcr, struct aki_packet *packet)
}
if (!aki_packet_cache_send_packet(&stream->cache, packet)) {
aki_packet_free(packet);
- } else if (al_atomic_u64_add(&vcr->count, 1, AL_ATOMIC_RELAXED) >= 196) {
+ } else if (al_atomic_u64_add(&vcr->count, 1, AL_ATOMIC_RELAXED) >= VCR_BUFFER_BUFFERED) {
aki_packet_stream_cork(vcr->data, true);
al_array_foreach(vcr->streams, i, stream) {
stream->buffered = true;
diff --git a/src/buffer/audio.c b/src/buffer/audio.c
index 3daeee2..a1a109e 100644
--- a/src/buffer/audio.c
+++ b/src/buffer/audio.c
@@ -63,7 +63,6 @@ static bool setup_optimal_resampler(struct camu_audio_buffer *buf, struct camu_l
fmt->req_sample_rate = fmt->in_sample_rate;
*/
- //buf->fade_rate = buf->fmt.req_sample_rate / 10;
buf->fade_rate = buf->fmt.req_sample_rate / 10;
buf->bytes_per_sample = (s32)camu_lav_resample_fmt_bytes_per_sample(fmt);
diff --git a/src/libsink/sink.c b/src/libsink/sink.c
index 343275b..3eecf5f 100644
--- a/src/libsink/sink.c
+++ b/src/libsink/sink.c
@@ -388,7 +388,7 @@ static void client_callback(void *userdata, u8 op, struct bmu_vcr_stream *stream
case BIMU_CLIENT_SET: {
u64 ts = aki_get_timestamp();
struct bmu_seek_req *req = (struct bmu_seek_req *)opaque;
- //req->delay = 0; // Ignore delay.
+ req->delay = 0; // Ignore delay.
req->ts -= req->delay;
bool late = ts <= req->ts;
if (late) {}
diff --git a/src/render/meson.build b/src/render/meson.build
index 2d9c02f..20f68c3 100644
--- a/src/render/meson.build
+++ b/src/render/meson.build
@@ -16,16 +16,15 @@ libplacebo_opts = [
'bench=false',
'fuzz=false',
'glslang=disabled',
- 'd3d11=disabled',
'gl-proc-addr=disabled',
'vk-proc-addr=disabled',
+ 'd3d11=disabled',
'lcms=disabled',
'dovi=disabled',
'libdovi=disabled'
]
-use_vulkan = false
-if use_vulkan
+if sink_use_vulkan
shaderc_opts = cmake.subproject_options()
shaderc_opts.add_cmake_defines({ 'CMAKE_BUILD_TYPE': is_debug ? 'Debug' : 'Release' })
shaderc_opts.add_cmake_defines({ 'SHADERC_SKIP_INSTALL': false })
diff --git a/src/screen/meson.build b/src/screen/meson.build
index 063b11a..7f9738c 100644
--- a/src/screen/meson.build
+++ b/src/screen/meson.build
@@ -1,8 +1,7 @@
screen_src = ['screen.c', 'view.c']
-use_vulkan = false
sekihi = subproject('sekihi',
default_options: [
- use_vulkan ? 'api=vulkan' : 'api=opengl',
+ sink_use_vulkan ? 'api=vulkan' : 'api=opengl',
'window=glfw',
'poll=inline',
'event-buffer=false',
diff --git a/src/tree/common.h b/src/tree/common.h
index d4d4836..59c713d 100644
--- a/src/tree/common.h
+++ b/src/tree/common.h
@@ -6,8 +6,8 @@
#define TREE_RESOURCE_PORT 14357
#define TREE_STREAM_PORT 14358
-#define TREE_SERVER_IP al_str_c("127.0.0.1")
-//#define TREE_SERVER_IP al_str_c("108.52.160.112")
+//#define TREE_SERVER_IP al_str_c("127.0.0.1")
+#define TREE_SERVER_IP al_str_c("108.52.160.112")
enum {
TREE_NODE = 0,