Skip to content

Video: GStreamer source-factory extraction, thread-safety, iOS xcframework-only #14350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HTRamsey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Video: GStreamer source-factory extraction, thread-safety, iOS xcframework-only #14350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 51 additions & 23 deletions .github/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,65 @@
"android_min_sdk": "28",
"android_platform": "35",
"cmake_minimum_version": "3.25",
"gstreamer_android_version": "1.28.1",
"gstreamer_ios_version": "1.28.1",
"gstreamer_macos_version": "1.28.1",
"gstreamer_minimum_version": "1.20.0",
"gstreamer_default_version": "1.28.1",
"gstreamer_windows_version": "1.28.1",
"gstreamer": {
"version": {
"default": "1.28.2",
"minimum": "1.20.0",
"android": "1.28.2",
"ios": "1.28.2",
"macos": "1.28.2",
"windows": "1.28.2"
},
"plugins": {
"common": [
"app",
"coreelements",
"isomp4",
"libav",
"matroska",
"mpegtsdemux",
"opengl",
"openh264",
"playback",
"rtp",
"rtpmanager",
"rtsp",
"sdpelem",
"tcp",
"typefindfunctions",
"udp",
"videoparsersbad",
"vpx",
"videoconvertscale",
"videoconvert",
"videoscale"
],
"android": ["androidmedia", "dav1d"],
"apple": ["applemedia", "dav1d", "vulkan"],
"windows": ["d3d", "d3d11", "dav1d", "nvcodec"],
"linux": ["nvcodec", "qsv", "va", "vulkan"]
},
"checksums": {
"1.28.2": {
"android": "ba9f1c6e10f0736fbf48cd741634fa90e49d50c961a4454230040b2517490d2a",
"windows_msvc_x64": "6dd72c370efa0dc4e1098940da36a4d591fd687579faf77a3c055d3aa30e6752",
"windows_msvc_arm64": "5ac10e24f8b6d56e12aba2881c4383eb64b7e24c02800998dc7513ed555ed90e",
"macos": "964ff693002aaa69b2908f79967609b424ddc61210849e1afe5e8d8810f68b91",
"macos_devel": "810ad1b7fb25cb90aab00d1c0469a46119f5ede9d7df2b746a102895832b27d6",
"ios": "e85fe53521ff5b5be3cfa6294befa77f21058c259c52dab5ba212e35af469d8b"
}
}
},
"ios_deployment_target": "14.0",
"java_version": "17",
"macos_deployment_target": "13.0",
"ndk_full_version": "27.2.12479018",
"platform_workflows": "Linux,Windows,MacOS,Android",
"ndk_version": "r27c",
"platform_workflows": "Linux,Windows,MacOS,Android",
"qt_minimum_version": "6.10.0",
"qt_modules": "qtgraphs qtlocation qtpositioning qtspeech qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml qtwebsockets qthttpserver",
"qt_version": "6.10.3",
"vulkan_sdk_version": "1.4.304.1",
"xcode_ios_version": "latest-stable",
"xcode_version": "16.x",
"gstreamer_checksums": {
"1.28.1": {
"android": "7b3f7cfd289aa1ac237899220b3d8fbfa722337c23175c047e06ec881c505481",
"windows_msvc_x64": "2ec50356d2d0937a9ead0f99d322f81d8413b9514c9d58ed41ca58fbcf25bfde",
"windows_msvc_arm64": "0a1938b7a8568ee5695c4c1755743cacc4a1643538cacdfc5be3c82426c0e193",
"macos": "02803f73435daabe8fb12b79c38c6775d0efb83af001474558ba25c4f874d305",
"macos_devel": "df167b41559afbcd743276c6b068cba2ada8f5b69eb68095415a7a5a7515e52c",
"ios": "3255cd01f8c4d92322be0c5825a192b998fef05989a161dcae3cef22c517ae71",
"good_plugins": "738e26aee41b7a62050e40b81adc017a110a7f32d1ec49fa6a0300846c44368d"
},
"1.22.12": {
"android": "be92cf477d140c270b480bd8ba0e26b1e01c8db042c46b9e234d87352112e485",
"windows_msvc_x64": "e5cbc6fb9f40fc2850806163df4b9d92012f967c842dc000a2b254cbcd7901d6"
}
}
"xcode_version": "16.x"
}
70 changes: 39 additions & 31 deletions .github/build-config.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"android_min_sdk",
"android_build_tools",
"java_version",
"gstreamer_default_version",
"gstreamer_minimum_version",
"gstreamer",
"platform_workflows"
],
"properties": {
Expand Down Expand Up @@ -76,38 +75,47 @@
"pattern": "^[0-9]+$",
"description": "Java version for Android builds"
},
"gstreamer_default_version": {
"type": "string",
"pattern": "^[0-9]+\\.[0-9]+\\.[0-9]+$"
},
"gstreamer_minimum_version": {
"type": "string",
"pattern": "^[0-9]+\\.[0-9]+\\.[0-9]+$"
},
"gstreamer_android_version": {
"type": "string",
"pattern": "^[0-9]+\\.[0-9]+\\.[0-9]+$"
},
"gstreamer_ios_version": {
"type": "string",
"pattern": "^[0-9]+\\.[0-9]+\\.[0-9]+$"
},
"gstreamer_macos_version": {
"type": "string",
"pattern": "^[0-9]+\\.[0-9]+\\.[0-9]+$"
},
"gstreamer_windows_version": {
"type": "string",
"pattern": "^[0-9]+\\.[0-9]+\\.[0-9]+$"
},
"gstreamer_checksums": {
"gstreamer": {
"type": "object",
"description": "Per-version checksums for GStreamer SDK downloads",
"patternProperties": {
"^[0-9]+\\.[0-9]+\\.[0-9]+$": {
"required": ["version"],
"additionalProperties": false,
"properties": {
"version": {
"type": "object",
"required": ["default", "minimum"],
"additionalProperties": false,
"properties": {
"default": { "type": "string", "pattern": "^[0-9]+\\.[0-9]+\\.[0-9]+$" },
"minimum": { "type": "string", "pattern": "^[0-9]+\\.[0-9]+\\.[0-9]+$" },
"android": { "type": "string", "pattern": "^[0-9]+\\.[0-9]+\\.[0-9]+$" },
"ios": { "type": "string", "pattern": "^[0-9]+\\.[0-9]+\\.[0-9]+$" },
"macos": { "type": "string", "pattern": "^[0-9]+\\.[0-9]+\\.[0-9]+$" },
"windows": { "type": "string", "pattern": "^[0-9]+\\.[0-9]+\\.[0-9]+$" }
}
},
"plugins": {
"type": "object",
"description": "GStreamer plugin allow-list. 'common' applies to every platform; per-platform keys are appended.",
"required": ["common"],
"additionalProperties": false,
"properties": {
"common": { "type": "array", "items": { "type": "string", "pattern": "^[a-z0-9_]+$" } },
"android": { "type": "array", "items": { "type": "string", "pattern": "^[a-z0-9_]+$" } },
"apple": { "type": "array", "items": { "type": "string", "pattern": "^[a-z0-9_]+$" } },
"windows": { "type": "array", "items": { "type": "string", "pattern": "^[a-z0-9_]+$" } },
"linux": { "type": "array", "items": { "type": "string", "pattern": "^[a-z0-9_]+$" } }
}
},
"checksums": {
"type": "object",
"description": "Per-version SHA256 checksums for SDK downloads",
"patternProperties": {
".*": { "type": "string", "pattern": "^[a-f0-9]{64}$" }
"^[0-9]+\\.[0-9]+\\.[0-9]+$": {
"type": "object",
"patternProperties": {
".*": { "type": "string", "pattern": "^[a-f0-9]{64}$" }
}
}
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions .github/scripts/resolve_gstreamer_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
from common.gh_actions import write_github_output

VERSION_KEYS = {
"macos": "gstreamer_macos_version",
"windows": "gstreamer_windows_version",
"android": "gstreamer_android_version",
"ios": "gstreamer_ios_version",
"macos": "gstreamer.version.macos",
"windows": "gstreamer.version.windows",
"android": "gstreamer.version.android",
"ios": "gstreamer.version.ios",
}


def resolve_version(platform_name: str, requested_version: str) -> str:
"""Return explicit version override or platform-specific config version."""
if requested_version:
return requested_version
version_key = VERSION_KEYS.get(platform_name, "gstreamer_default_version")
version_key = VERSION_KEYS.get(platform_name, "gstreamer.version.default")
return get_build_config_value(version_key)


Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,9 @@ jobs:
build-type: ${{ matrix.build_type }}
stable: ${{ env.IS_STABLE_BUILD }}
extra-args: >-
-DQGC_ENABLE_GST_VIDEOSTREAMING=${{ matrix.arch != 'win64_msvc2022_arm64_cross_compiled' && 'ON' || 'OFF' }}
${{ matrix.arch == 'win64_msvc2022_arm64_cross_compiled' && format('-DQT_HOST_PATH={0}', steps.qt-host.outputs.qt_root_dir) || '' }}

- name: Add GStreamer to PATH
if: matrix.arch != 'win64_msvc2022_arm64_cross_compiled'
shell: pwsh
run: |
$cacheFile = "${{ runner.temp }}\build\CMakeCache.txt"
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,8 @@ if(QGC_BUILD_TESTING)
add_subdirectory(test)
# Exclude test directory from translation scanning
set_property(DIRECTORY test PROPERTY QT_EXCLUDE_FROM_TRANSLATION ON)
# Pure-CMake unit tests for cmake/GStreamer helpers (no project build needed).
add_subdirectory(cmake/GStreamer/tests)
endif()

# ----------------------------------------------------------------------------
Expand Down
83 changes: 0 additions & 83 deletions android/src/org/freedesktop/gstreamer/GStreamer.java
View file
Open in desktop

This file was deleted.

60 changes: 0 additions & 60 deletions android/src/org/freedesktop/gstreamer/androidmedia/GstAhcCallback.java
View file
Open in desktop

This file was deleted.

Loading
Loading