Improve FFmpeg hwaccel fallback, VR emulation

 - Optimize sink seeking with single video frame.
 - Small cleanups.

Signed-off-by: Andrew Opalach <andrew@akon.city>

11 files changed, 51 insertions, 10 deletions

diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap
index 1993fdd..1604e96 100644
--- a/subprojects/freetype2.wrap
+++ b/subprojects/freetype2.wrap
@@ -1,5 +1,5 @@
 [wrap-git]
 directory = freetype-2.13.3
-url = https://github.com/freetype/freetype.git
+url = https://gitlab.freedesktop.org/freetype/freetype.git
 revision = VER-2-13-3
 depth = 1
diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap
index 81771ed..9a9cfc1 100644
--- a/subprojects/libalabaster.wrap
+++ b/subprojects/libalabaster.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 url = https://git.akon.city/libalabaster
-revision = b403770e7eb6e0a5a8ca14a24f91dbf214ffe917
+revision = 0470ca3416388e7e58b64f63bfe505d454f150b9
 depth = 1
diff --git a/subprojects/libass.wrap b/subprojects/libass.wrap
index f2aa71c..fa50802 100644
--- a/subprojects/libass.wrap
+++ b/subprojects/libass.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
-directory = libass-0.17.3
+directory = libass-0.17.4
 url = https://github.com/libass/libass.git
-revision = 0.17.3
+revision = 0.17.4
 clone-recursive = true
 depth = 1
diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap
index 8388a93..15dd478 100644
--- a/subprojects/libnaunet.wrap
+++ b/subprojects/libnaunet.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 url = https://git.akon.city/libnaunet
-revision = 393e266f6bfceb25a97cd1cf28dfc72cac9e9f81
+revision = 3ea974dd51b1f01483bad6a4d115189928bbf4db
 depth = 1
diff --git a/subprojects/libplacebo.wrap b/subprojects/libplacebo.wrap
index d9a2165..33e3323 100644
--- a/subprojects/libplacebo.wrap
+++ b/subprojects/libplacebo.wrap
@@ -1,7 +1,7 @@
 [wrap-git]
-directory = libplacebo-2bd627f
+directory = libplacebo-4ff55e0
 url = https://code.videolan.org/videolan/libplacebo.git
-revision = 2bd627f823ba1cedbc51a0ee6eb7a9fb433d912e
+revision = 4ff55e04264e8c650b9de097d91f17bcd820fb31
 clone-recursive = true
 depth = 1
 
diff --git a/subprojects/notcurses.wrap b/subprojects/notcurses.wrap
index 31ef4c4..bc58274 100644
--- a/subprojects/notcurses.wrap
+++ b/subprojects/notcurses.wrap
@@ -3,11 +3,10 @@ directory = notcurses-93a4890
 url = https://github.com/dankamongmen/notcurses.git
 revision = 93a4890f4c2b491cda62fea5110995c6a25691e2
 depth = 1
+method = cmake
 
 patch_directory = notcurses
 diff_files = notcurses/duration_and_ffmpeg_fix.diff
 
-method = cmake
-
 [provide]
 dependency_names = notcurses, notcurses-core
diff --git a/subprojects/packagefiles/ffmpeg-compat/meson_options.txt b/subprojects/packagefiles/ffmpeg-compat/meson_options.txt
new file mode 100644
index 0000000..eb4b08b
--- /dev/null
+++ b/subprojects/packagefiles/ffmpeg-compat/meson_options.txt
@@ -0,0 +1,4 @@
+# Copy-paste from top-level project.
+option('codec-hwaccel', type: 'feature', value: 'disabled', yield: true)
+option('renderer-api', type: 'combo', choices: ['vulkan', 'dx11', 'gl', 'gl-rpi'], value: 'vulkan', yield: true)
+option('sink-only', type: 'boolean', value: false, yield: true)
diff --git a/subprojects/packagefiles/ffmpeg-compat/meson_project.diff b/subprojects/packagefiles/ffmpeg-compat/meson_project.diff
new file mode 100644
index 0000000..5646fe1
--- /dev/null
+++ b/subprojects/packagefiles/ffmpeg-compat/meson_project.diff
@@ -0,0 +1,16 @@
+--- meson.build	2025-05-25 19:32:01.080982098 -0400
++++ meson.build	2025-05-25 19:32:01.080982098 -0400
+@@ -1,4 +1,4 @@
+-project('ffmpeg', 'c', version: '7.1.1', meson_version: '>=0.57.0')
++project('ffmpeg', 'c', version: '3.4.14', meson_version: '>=0.57.0')
+
+ ffmpeg_version_string = meson.project_version()
+
+@@ -39,6 +39,7 @@
+ endif
+
+ if is_windows
++  extra_options += ['--extra-cflags=-D_WIN32_WINNT=0x0502'] # Windows Server 2003 with SP1, Windows XP with SP2.
+   if is_64bit
+     extra_options += ['--target-os=win64']
+   else
diff --git a/subprojects/packagefiles/ffmpeg/meson_options.txt b/subprojects/packagefiles/ffmpeg/meson_options.txt
new file mode 100644
index 0000000..eb4b08b
--- /dev/null
+++ b/subprojects/packagefiles/ffmpeg/meson_options.txt
@@ -0,0 +1,4 @@
+# Copy-paste from top-level project.
+option('codec-hwaccel', type: 'feature', value: 'disabled', yield: true)
+option('renderer-api', type: 'combo', choices: ['vulkan', 'dx11', 'gl', 'gl-rpi'], value: 'vulkan', yield: true)
+option('sink-only', type: 'boolean', value: false, yield: true)
diff --git a/subprojects/packagefiles/libplacebo/oversample_testing.diff b/subprojects/packagefiles/libplacebo/oversample_testing.diff
new file mode 100644
index 0000000..2993809
--- /dev/null
+++ b/subprojects/packagefiles/libplacebo/oversample_testing.diff
@@ -0,0 +1,18 @@
+diff --git a/src/renderer.c b/src/renderer.c
+index 1f67bc3..7df525e 100644
+--- a/src/renderer.c
++++ b/src/renderer.c
+@@ -1761,6 +1761,13 @@ static bool pass_read_image(struct pass_state *pass)
+     ref_rounded.y0 = truncf(ref_rc.y0);
+     ref_rounded.x1 = ref_rounded.x0 + roundf(pl_rect_w(ref_rc));
+     ref_rounded.y1 = ref_rounded.y0 + roundf(pl_rect_h(ref_rc));
++    // Oversample to avoid distortion when really zoomed in.
++    // @TODO: Verbosely log offset/base/stretch/scale to try and understand what's happening here.
++    //const float oversample = 3;
++    //ref_rounded.x0 -= oversample;
++    //ref_rounded.y0 -= oversample;
++    //ref_rounded.x1 += oversample;
++    //ref_rounded.y1 += oversample;
+ 
+     PL_TRACE(rr, "Rounded reference rect: {%d %d %d %d}",
+              ref_rounded.x0, ref_rounded.y0,
diff --git a/subprojects/stela.wrap b/subprojects/stela.wrap
index 444d851..9f5c62b 100644
--- a/subprojects/stela.wrap
+++ b/subprojects/stela.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 url = https://git.akon.city/stela
-revision = 658e476c3d43718a2c9eb2884f16ac37cc3f1da2
+revision = 01637283b33d7fe4921e9347ada867e44b29edba
 depth = 1