From 98e55e20cec8b6794c79b6c236d622316e56e29d Mon Sep 17 00:00:00 2001
From: Green Sky <Green-Sky@users.noreply.github.com>
Date: Sat, 29 Mar 2025 18:36:04 +0100
Subject: [PATCH] use android 23 triplet overlays

---
 .github/workflows/cd.yml | 14 +++++++++-----
 .github/workflows/ci.yml | 13 +++++++++----
 src/debug_video_tap.cpp  |  2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 6ef88c0..25badde 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -64,11 +64,11 @@ jobs:
     strategy:
       matrix:
         platform:
-          - vcpkg_toolkit: arm-neon-android
+          - vcpkg_toolkit: arm-neon-android-23
             ndk_abi: armeabi-v7a
-          - vcpkg_toolkit: arm64-android
+          - vcpkg_toolkit: arm64-android-23
             ndk_abi: arm64-v8a
-          - vcpkg_toolkit: x64-android
+          - vcpkg_toolkit: x64-android-23
             ndk_abi: x86_64
 
     steps:
@@ -76,6 +76,11 @@ jobs:
       with:
         submodules: recursive
 
+    - uses: actions/checkout@v4
+      with:
+        repository: 'Green-Sky/vcpkg_android_triplets'
+        path: 'vcpkg_android_triplets'
+
     - uses: nttld/setup-ndk@v1
       id: setup_ndk
       with:
@@ -101,8 +106,7 @@ jobs:
       env:
         ANDROID_NDK_HOME: ${{steps.setup_ndk.outputs.ndk-path}}
         VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-      #run: vcpkg install --triplet ${{matrix.platform.vcpkg_toolkit}} --overlay-ports=vcpkg/ports libsodium opus libvpx libpng libjpeg-turbo
-      run: vcpkg install --triplet ${{matrix.platform.vcpkg_toolkit}} libsodium opus libvpx libpng libjpeg-turbo freetype
+      run: vcpkg install --overlay-triplets=vcpkg_android_triplets --triplet ${{matrix.platform.vcpkg_toolkit}} libsodium opus libvpx libpng libjpeg-turbo freetype
 
     # vcpkg scripts root /usr/local/share/vcpkg/scripts
     - name: Configure CMake
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b204baa..2af01ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,11 +43,11 @@ jobs:
     strategy:
       matrix:
         platform:
-          - vcpkg_toolkit: arm-neon-android
+          - vcpkg_toolkit: arm-neon-android-23
             ndk_abi: armeabi-v7a
-          - vcpkg_toolkit: arm64-android
+          - vcpkg_toolkit: arm64-android-23
             ndk_abi: arm64-v8a
-          - vcpkg_toolkit: x64-android
+          - vcpkg_toolkit: x64-android-23
             ndk_abi: x86_64
 
     steps:
@@ -55,6 +55,11 @@ jobs:
       with:
         submodules: recursive
 
+    - uses: actions/checkout@v4
+      with:
+        repository: 'Green-Sky/vcpkg_android_triplets'
+        path: 'vcpkg_android_triplets'
+
     - uses: nttld/setup-ndk@v1
       id: setup_ndk
       with:
@@ -80,7 +85,7 @@ jobs:
       env:
         ANDROID_NDK_HOME: ${{steps.setup_ndk.outputs.ndk-path}}
         VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-      run: vcpkg install --triplet ${{matrix.platform.vcpkg_toolkit}} libsodium opus libvpx libpng libjpeg-turbo freetype
+      run: vcpkg install --overlay-triplets=vcpkg_android_triplets --triplet ${{matrix.platform.vcpkg_toolkit}} libsodium opus libvpx libpng libjpeg-turbo freetype
 
     # vcpkg scripts root /usr/local/share/vcpkg/scripts
     - name: Configure CMake
diff --git a/src/debug_video_tap.cpp b/src/debug_video_tap.cpp
index 8e3bc48..84f59e4 100644
--- a/src/debug_video_tap.cpp
+++ b/src/debug_video_tap.cpp
@@ -45,7 +45,7 @@ struct DebugVideoTapSink : public FrameStream2SinkI<SDLVideoFrame> {
 			float _v_interval_avg {0.f}; // s
 		} view;
 
-		std::shared_ptr<PushConversionVideoStream<LockedFrameStream2<SDLVideoFrame>>> stream;
+		std::shared_ptr<FrameStream2I<SDLVideoFrame>> stream;
 	};
 	std::vector<Writer> _writers;