diff options
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/meson.build | 2 | ||||
| -rw-r--r-- | src/render/queue_libplacebo.c | 4 | ||||
| -rw-r--r-- | src/render/renderer_libplacebo.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/render/meson.build b/src/render/meson.build index 9aee7af..d342312 100644 --- a/src/render/meson.build +++ b/src/render/meson.build @@ -56,7 +56,7 @@ elif get_option('renderer') == 'libplacebo' shaderc_opts.add_cmake_defines({ 'ENABLE_EXCEPTIONS_ON_MSVC': false }) shaderc_proj = cmake.subproject('shaderc', options: shaderc_opts) shaderc = shaderc_proj.dependency('shaderc') - meson.override_dependency('shaderc', declare_dependency(dependencies: shaderc, version: '2026.1')) + meson.override_dependency('shaderc', declare_dependency(dependencies: shaderc, version: '2026.2')) render_deps += [ shaderc_proj.dependency('shaderc_util'), shaderc_proj.dependency('glslang'), diff --git a/src/render/queue_libplacebo.c b/src/render/queue_libplacebo.c index 57d60f6..f666560 100644 --- a/src/render/queue_libplacebo.c +++ b/src/render/queue_libplacebo.c @@ -39,7 +39,7 @@ static bool queue_lp_configure_subtitles(struct camu_frame_queue *queue, u32 wid } const AVCodec *codec = avcodec_find_decoder(codecpar->codec_id); if (!codec) { - log_error("Failed to find subtitle decoder."); + log_error("Failed to find subtitle transcoder."); return false; } if (!(lq->subs.converter = camu_ff_alloc_codec_context(codec, codecpar))) { @@ -51,7 +51,7 @@ static bool queue_lp_configure_subtitles(struct camu_frame_queue *queue, u32 wid return false; } const AVCodecDescriptor *ass_desc = avcodec_descriptor_get(AV_CODEC_ID_ASS); - log_info("Subtitle conversion: %s -> %s.", desc->long_name, ass_desc->long_name); + log_info("Subtitle conversion: %s -> %s.", camu_ff_longest_name(desc), camu_ff_longest_name(ass_desc)); // https://github.com/mpv-player/mpv/blob/266cb79f38fd1a5fd448b453dee5971795a145ca/sub/sd_ass.c#L634 #define MP_ASS_FONT_PLAYRESX 384.0 track->PlayResX = track->PlayResY * (f64)width / MAX(height, (u32)1); diff --git a/src/render/renderer_libplacebo.c b/src/render/renderer_libplacebo.c index 2bcbd64..6ddb972 100644 --- a/src/render/renderer_libplacebo.c +++ b/src/render/renderer_libplacebo.c @@ -429,7 +429,7 @@ static bool renderer_lp_render(struct camu_renderer *renderer, struct camu_scree lr->params.num_hooks = 1; lr->params.hooks[0]->parameters[0].data->f = (f32)mouse_x; lr->params.hooks[0]->parameters[1].data->f = (f32)mouse_y; - lr->params.hooks[0]->parameters[3].data->f = (scr->vr_emulation == CAMU_VR_360) ? 2.0 : 1.0 - (f32)scr->vr_left_eye; + lr->params.hooks[0]->parameters[3].data->f = (scr->vr_emulation == CAMU_VR_360) ? 2.f : (scr->vr_left_eye ? 0.f : 1.f); } enum { |