From 4a518365494662b4a56124dc3d087cedbb1454ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Mon, 1 Jan 2024 21:50:44 +0100 Subject: [PATCH] ci --- .github/workflows/build.yml | 2 +- ci/build-freebsd.sh | 1 + sub/ass_mp.c | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ddbfd90b776db..b800f542bd393 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -217,7 +217,7 @@ jobs: vulkan-headers \ wayland-protocols ./ci/build-freebsd.sh - meson test -C build + meson test -v -C build msys2: runs-on: windows-latest diff --git a/ci/build-freebsd.sh b/ci/build-freebsd.sh index c393fb25fee32..5168b67c183d3 100755 --- a/ci/build-freebsd.sh +++ b/ci/build-freebsd.sh @@ -10,6 +10,7 @@ export LDFLAGS="$LDFLAGS -L/usr/local/lib" meson setup build \ --werror \ -Dc_args="-Wno-error=deprecated -Wno-error=deprecated-declarations" \ + -Db_sanitize=address \ -Diconv=disabled \ -Dlibmpv=true \ -Dlua=enabled \ diff --git a/sub/ass_mp.c b/sub/ass_mp.c index 634681f2ec68c..9c6e2322d263a 100644 --- a/sub/ass_mp.c +++ b/sub/ass_mp.c @@ -40,6 +40,8 @@ #include "video/out/bitmap_packer.h" #include "video/mp_image.h" +#include + // res_y should be track->PlayResY // It determines scaling of font sizes and more. void mp_ass_set_style(ASS_Style *style, double res_y, @@ -63,6 +65,7 @@ void mp_ass_set_style(ASS_Style *style, double res_y, style->PrimaryColour = MP_ASS_COLOR(opts->color); style->SecondaryColour = style->PrimaryColour; style->OutlineColour = MP_ASS_COLOR(opts->border_color); + if (opts->back_color.a) { style->BackColour = MP_ASS_COLOR(opts->back_color); style->BorderStyle = 4; // opaque box @@ -70,12 +73,26 @@ void mp_ass_set_style(ASS_Style *style, double res_y, style->BackColour = MP_ASS_COLOR(opts->shadow_color); style->BorderStyle = 1; // outline } + printf("1\n"); + fflush(stdout); style->Outline = opts->border_size * scale; + printf("2\n"); + fflush(stdout); style->Shadow = opts->shadow_offset * scale; + printf("3\n"); + fflush(stdout); style->Spacing = opts->spacing * scale; + printf("4\n"); + fflush(stdout); style->MarginL = opts->margin_x * scale; + printf("5\n"); + fflush(stdout); style->MarginR = style->MarginL; + printf("6\n"); + fflush(stdout); style->MarginV = opts->margin_y * scale; + printf("7\n"); + fflush(stdout); style->ScaleX = 1.; style->ScaleY = 1.; style->Alignment = 1 + (opts->align_x + 1) + (opts->align_y + 2) % 3 * 4;