ci

.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

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 \

player/lua/console.lua

@@ -347,10 +347,10 @@ function update()
 
     -- Unlike vo-configured, current-vo doesn't become falsy while switching VO,
     -- which would print the log to the OSD.
-    if not mp.get_property('current-vo') then
-        print_to_terminal()
-        return
-    end
+    -- if not mp.get_property('current-vo') then
+        -- print_to_terminal()
+        -- return
+    -- end
 
     local dpi_scale = mp.get_property_native("display-hidpi-scale", 1.0)
 
@@ -384,8 +384,7 @@ function update()
     -- horizontal borders.
     local cheight = opts.font_size * 8
     local cglyph = '{\\r' ..
-                   (mp.get_property_native('focused') == false
-                    and '\\alpha&HFF&' or '\\1a&H44&\\3a&H44&\\4a&H99&') ..
+                   '\\1a&H44&\\3a&H44&\\4a&H99&' ..
                    '\\1c&Heeeeee&\\3c&Heeeeee&\\4c&H000000&' ..
                    '\\xbord0.5\\ybord0\\xshad0\\yshad1\\p4\\pbo24}' ..
                    'm 0 0 l 1 0 l 1 ' .. cheight .. ' l 0 ' .. cheight ..

player/video.c

@@ -129,9 +129,9 @@ void uninit_video_out(struct MPContext *mpctx)
     uninit_video_chain(mpctx);
     if (mpctx->video_out) {
         vo_destroy(mpctx->video_out);
+        mpctx->video_out = NULL;
         mp_notify(mpctx, MPV_EVENT_VIDEO_RECONFIG, NULL);
     }
-    mpctx->video_out = NULL;
 }
 
 static void vo_chain_uninit(struct vo_chain *vo_c)

sub/ass_mp.h

@@ -25,6 +25,7 @@
 
 #include <ass/ass.h>
 #include <ass/ass_types.h>
+#include <libmpv/client.h>
 
 // These PlayResX and PlayResY values are arbitrary and taken from lavc.
 // lavc assumes these values when converting to ass generally. Moreover, these
@@ -45,6 +46,7 @@ struct osd_style_opts;
 struct mp_log;
 
 void mp_ass_flush_old_events(ASS_Track *track, long long ts);
+MPV_EXPORT
 void mp_ass_set_style(ASS_Style *style, double res_y,
                       const struct osd_style_opts *opts);
 

sub/osd.c

@@ -72,6 +72,7 @@ static const m_option_t style_opts[] = {
     {0}
 };
 
+__attribute__((visibility("default")))
 const struct m_sub_options osd_style_conf = {
     .opts = style_opts,
     .size = sizeof(struct osd_style_opts),
@@ -91,6 +92,7 @@ const struct m_sub_options osd_style_conf = {
     .change_flags = UPDATE_OSD,
 };
 
+__attribute__((visibility("default")))
 const struct m_sub_options sub_style_conf = {
     .opts = style_opts,
     .size = sizeof(struct osd_style_opts),

test/libmpv_test.c

@@ -15,257 +15,30 @@
  * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <inttypes.h>
-#include <libmpv/client.h>
-#include <stdarg.h>
-#include <stdio.h>
+#include <stdbool.h>
 #include <stdlib.h>
-#include <string.h>
+#include <ass/ass.h>
 
-// Stolen from osdep/compiler.h
-#ifdef __GNUC__
-#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format(printf, a1, a2)))
-#define MP_NORETURN __attribute__((noreturn))
-#else
-#define PRINTF_ATTRIBUTE(a1, a2)
-#define MP_NORETURN
-#endif
+struct osd_style_opts {
+    char *font;
+    float border_size;
+    float shadow_offset;
+};
 
-// Broken crap with __USE_MINGW_ANSI_STDIO
-#if defined(__MINGW32__) && defined(__GNUC__) && !defined(__clang__)
-#undef PRINTF_ATTRIBUTE
-#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (gnu_printf, a1, a2)))
-#endif
-
-// Dummy values for test_options_and_properties
-static const char *str = "string";
-static int flag = 1;
-static int64_t int_ = 20;
-static double double_ = 1.5;
-
-// Global handle.
-static mpv_handle *ctx;
-
-
-MP_NORETURN PRINTF_ATTRIBUTE(1, 2)
-static void fail(const char *fmt, ...)
-{
-	if (fmt) {
-		va_list va;
-		va_start(va, fmt);
-		vfprintf(stderr, fmt, va);
-		va_end(va);
-	}
-	mpv_destroy(ctx);
-    exit(1);
-}
-
-static void check_api_error(int status)
-{
-    if (status < 0)
-        fail("mpv API error: %s\n", mpv_error_string(status));
-}
-
-static void check_double(const char *property, double expect)
+__attribute__((noinline))
+void mp_ass_set_style2(ASS_Style *style, double res_y,
+                      const struct osd_style_opts *opts)
 {
-    double result_double;
-    check_api_error(mpv_get_property(ctx, property, MPV_FORMAT_DOUBLE, &result_double));
-    if (expect != result_double)
-        fail("Double: expected '%f' but got '%f'!\n", expect, result_double);
-}
-
-static void check_flag(const char *property, int expect)
-{
-    int result_flag;
-    check_api_error(mpv_get_property(ctx, property, MPV_FORMAT_FLAG, &result_flag));
-    if (expect != result_flag)
-        fail("Flag: expected '%d' but got '%d'!\n", expect, result_flag);
-}
-
-static void check_int(const char *property, int64_t expect)
-{
-    int64_t result_int;
-    check_api_error(mpv_get_property(ctx, property, MPV_FORMAT_INT64, &result_int));
-    if (expect != result_int)
-        fail("Int: expected '%" PRId64 "' but got '%" PRId64 "'!\n", expect, result_int);
-}
-
-static void check_string(const char *property, const char *expect)
-{
-    char *result_string;
-    check_api_error(mpv_get_property(ctx, property, MPV_FORMAT_STRING, &result_string));
-    if (strcmp(expect, result_string) != 0)
-        fail("String: expected '%s' but got '%s'!\n", expect, result_string);
-    mpv_free(result_string);
-}
-
-static void check_results(const char *properties[], enum mpv_format formats[])
-{
-    for (int i = 0; properties[i]; i++) {
-        switch (formats[i]) {
-        case MPV_FORMAT_STRING:
-            check_string(properties[i], str);
-            break;
-        case MPV_FORMAT_FLAG:
-            check_flag(properties[i], flag);
-            break;
-        case MPV_FORMAT_INT64:
-            check_int(properties[i], int_);
-            break;
-        case MPV_FORMAT_DOUBLE:
-            check_double(properties[i], double_);
-            break;
-        }
-    }
-}
-
-static void set_options_and_properties(const char *options[], const char *properties[],
-                                              enum mpv_format formats[])
-{
-    for (int i = 0; options[i]; i++) {
-        switch (formats[i]) {
-        case MPV_FORMAT_STRING:
-            check_api_error(mpv_set_option(ctx, options[i], formats[i], &str));
-            check_api_error(mpv_set_property(ctx, properties[i], formats[i], &str));
-            break;
-        case MPV_FORMAT_FLAG:
-            check_api_error(mpv_set_option(ctx, options[i], formats[i], &flag));
-            check_api_error(mpv_set_property(ctx, properties[i], formats[i], &flag));
-            break;
-        case MPV_FORMAT_INT64:
-            check_api_error(mpv_set_option(ctx, options[i], formats[i], &int_));
-            check_api_error(mpv_set_property(ctx, properties[i], formats[i], &int_));
-            break;
-        case MPV_FORMAT_DOUBLE:
-            check_api_error(mpv_set_option(ctx, options[i], formats[i], &double_));
-            check_api_error(mpv_set_property(ctx, properties[i], formats[i], &double_));
-            break;
-        }
-    }
-}
-
-static void test_file_loading(char *file)
-{
-    const char *cmd[] = {"loadfile", file, NULL};
-    check_api_error(mpv_command(ctx, cmd));
-    int loaded = 0;
-    int finished = 0;
-    while (!finished) {
-        mpv_event *event = mpv_wait_event(ctx, 0);
-        switch (event->event_id) {
-        case MPV_EVENT_FILE_LOADED:
-            // make sure it loads before exiting
-            loaded = 1;
-            break;
-        case MPV_EVENT_END_FILE:
-            if (loaded)
-                finished = 1;
-            break;
-        }
-    }
-    if (!finished)
-        fail("Unable to load test file!\n");
-}
-
-static void test_lavfi_complex(char *file)
-{
-    const char *cmd[] = {"loadfile", file, NULL};
-    check_api_error(mpv_command(ctx, cmd));
-    int finished = 0;
-    int loaded = 0;
-    while (!finished) {
-        mpv_event *event = mpv_wait_event(ctx, 0);
-        switch (event->event_id) {
-        case MPV_EVENT_FILE_LOADED:
-            // Add file as external and toggle lavfi-complex on.
-            if (!loaded) {
-                check_api_error(mpv_set_property_string(ctx, "external-files", file));
-                const char *add_cmd[] = {"video-add", file, "auto", NULL};
-                check_api_error(mpv_command(ctx, add_cmd));
-                check_api_error(mpv_set_property_string(ctx, "lavfi-complex", "[vid1] [vid2] vstack [vo]"));
-            }
-            loaded = 1;
-            break;
-        case MPV_EVENT_END_FILE:
-            if (loaded)
-                finished = 1;
-            break;
-        }
-    }
-    if (!finished)
-        fail("Lavfi complex failed!\n");
-}
-
-// Ensure that setting options/properties work correctly and
-// have the expected values.
-static void test_options_and_properties(void)
-{
-    // Order matters. string -> flag -> int -> double (repeat)
-    // One for set_option the other for set_property
-    const char *options[] = {
-        "screen-name",
-        "save-position-on-quit",
-        "cursor-autohide",
-        "speed",
-        NULL
-    };
-
-    const char *properties[] = {
-        "fs-screen-name",
-        "shuffle",
-        "sub-pos",
-        "window-scale",
-        NULL
-    };
-
-    // Must match above ordering.
-    enum mpv_format formats[] = {
-        MPV_FORMAT_STRING,
-        MPV_FORMAT_FLAG,
-        MPV_FORMAT_INT64,
-        MPV_FORMAT_DOUBLE,
-    };
-
-    set_options_and_properties(options, properties, formats);
-
-    check_api_error(mpv_initialize(ctx));
-
-    check_results(options, formats);
-    check_results(properties, formats);
-
-    // Ensure the format is still MPV_FORMAT_FLAG for these property types.
-    mpv_node result_node;
-    check_api_error(mpv_get_property(ctx, "idle-active", MPV_FORMAT_NODE, &result_node));
-    if (result_node.format != MPV_FORMAT_FLAG)
-        fail("Node: expected mpv format '%d' but got '%d'!\n", MPV_FORMAT_FLAG, result_node.format);
-
-    // Always should be true.
-    if (result_node.u.flag != 1)
-        fail("Node: expected 1 but got %d'!\n", result_node.u.flag);
+    style->Outline = opts->border_size;
+    style->Shadow = opts->shadow_offset;
 }
 
 int main(int argc, char *argv[])
 {
-    if (argc != 2)
-        return 1;
-
-    ctx = mpv_create();
-    if (!ctx)
-        return 1;
-
-    check_api_error(mpv_set_option_string(ctx, "vo", "null"));
-    check_api_error(mpv_set_option_string(ctx, "terminal", "yes"));
-    check_api_error(mpv_set_option_string(ctx, "msg-level", "all=debug"));
-
-    const char *fmt = "================ TEST: %s ================\n";
-
-    printf(fmt, "test_options_and_properties");
-    test_options_and_properties();
-    printf(fmt, "test_file_loading");
-    test_file_loading(argv[1]);
-    printf(fmt, "test_lavfi_complex");
-    test_lavfi_complex(argv[1]);
+    ASS_Style a = {0};
+    struct osd_style_opts def = {0};
+    // const struct osd_style_opts *def = sub_style_conf.defaults;
+    mp_ass_set_style2(&a, 540, &def);
 
-    mpv_destroy(ctx);
     return 0;
 }

test/meson.build

@@ -111,7 +111,7 @@ test('paths', paths)
 
 if get_option('libmpv')
     libmpv_test = executable('libmpv-test', 'libmpv_test.c',
-                             include_directories: incdir, link_with: libmpv)
+                             include_directories: incdir, link_with: libmpv, dependencies: [libass])
     file = join_paths(source_root, 'etc', 'mpv-icon-8bit-16x16.png')
     test('libmpv', libmpv_test, args: file, timeout: 60)
 endif

video/out/vo_null.c

@@ -73,12 +73,11 @@ static int preinit(struct vo *vo)
 
 static int control(struct vo *vo, uint32_t request, void *data)
 {
-    struct priv *p = vo->priv;
     switch (request) {
     case VOCTRL_GET_DISPLAY_FPS:
-        if (!p->cfg_fps)
+        if (!((struct priv*)vo->priv)->cfg_fps)
             break;
-        *(double *)data = p->cfg_fps;
+        *(double *)data = ((struct priv*)vo->priv)->cfg_fps;
         return VO_TRUE;
     }
     return VO_NOTIMPL;