Skip to content

Commit b5bd4f4

Browse files
yunowoyunowo
authored
Remove libva dependency on Windows (#539)
1 parent 3bcae5d commit b5bd4f4

File tree

15 files changed

+22
-87
lines changed

15 files changed

+22
-87
lines changed

‎docker/windows/windows_builder.Dockerfile‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# escape=`
22

33
# ==============================================================================
4-
# Copyright (C) 2025 Intel Corporation
4+
# Copyright (C) 2026 Intel Corporation
55
#
66
# SPDX-License-Identifier: MIT
77
# ==============================================================================
@@ -81,14 +81,6 @@ RUN `
8181
&& echo.set(VCPKG_BUILD_TYPE release)>> %VCPKG_ROOT%\triplets\x64-windows.cmake `
8282
&& vcpkg install --triplet x64-windows
8383

84-
# Install libva
85-
RUN `
86-
curl -SL --output nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe `
87-
&& nuget install Microsoft.Direct3D.VideoAccelerationCompatibilityPack `
88-
&& setx PKG_CONFIG_PATH "%PKG_CONFIG_PATH%;C:\Microsoft.Direct3D.VideoAccelerationCompatibilityPack.1.0.2\build\native\x64\lib\pkgconfig" `
89-
&& setx LIBVA_DRIVER_NAME "vaon12" `
90-
&& setx LIBVA_DRIVERS_PATH "C:\Microsoft.Direct3D.VideoAccelerationCompatibilityPack.1.0.2\build\native\x64\bin"
91-
9284
# Build dlstreamer
9385
RUN `
9486
cd C:\dlstreamer\build `

‎docs/source/dev_guide/advanced_install/advanced_install_on_windows.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,11 @@ cd ./dlstreamer/
3636
| Git | \%programfiles\%\\Git |
3737
| vcpkg | C:\\vcpkg |
3838
| Python | \%programfiles\%\\Python |
39-
| NuGet | C:\\libva |
40-
| Microsoft.Direct3D.VideoAccelerationCompatibilityPack (libva) | C:\\libva |
4139
| DL Streamer | C:\\dlstreamer_tmp\\build |
4240

4341
- The script will create or modify following environmental variables:
4442
- VCPKG_ROOT
4543
- PATH
4644
- PKG_CONFIG_PATH
47-
- LIBVA_DRIVER_NAME
48-
- LIBVA_DRIVERS_PATH
4945

5046
- The script assumes that the proxy is properly configured

‎scripts/build_dlstreamer_dlls.ps1‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,7 @@ if (-Not ${env:PATH_SETUP_DONE}) {
227227
setx path "${env:VCPKG_ROOT};${env:VCPKG_ROOT}\downloads\tools\cmake-3.30.1-windows\cmake-3.30.1-windows-i386\bin;${env:VCPKG_ROOT}\downloads\tools\python\python-3.12.7-x64-1"
228228
${env:PATH_SETUP_DONE} = 1
229229
}
230-
setx PKG_CONFIG_PATH "C:\gstreamer\1.0\msvc_x86_64\lib\pkgconfig;C:\libva\Microsoft.Direct3D.VideoAccelerationCompatibilityPack.1.0.2\build\native\x64\lib\pkgconfig"
231-
setx LIBVA_DRIVER_NAME "vaon12"
232-
setx LIBVA_DRIVERS_PATH "C:\libva\Microsoft.Direct3D.VideoAccelerationCompatibilityPack.1.0.2\build\native\x64\bin"
230+
setx PKG_CONFIG_PATH "C:\gstreamer\1.0\msvc_x86_64\lib\pkgconfig"
233231
C:\BuildTools\Common7\Tools\Launch-VsDevShell.ps1
234232
$DLSTREAMER_SRC_LOCATION = $PWD.Path
235233
Write-Host "############################################ DONE ###########################################"
@@ -259,19 +257,6 @@ if (-Not (Get-Command py -errorAction SilentlyContinue)) {
259257
py --version
260258
}
261259

262-
if (-Not (Get-ChildItem -Path "C:\libva" -Filter "Microsoft.Direct3D.VideoAccelerationCompatibilityPack*" -ErrorAction SilentlyContinue)) {
263-
Write-Host "####################################### Installing LIBVA #######################################"
264-
if (-Not (Test-Path "C:\\libva")) {
265-
mkdir C:\libva
266-
}
267-
Set-Location -Path "C:\libva"
268-
Invoke-WebRequest -OutFile "nuget.exe" -Uri https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
269-
Start-Process -Wait -FilePath ".\nuget.exe" -ArgumentList "install", "Microsoft.Direct3D.VideoAccelerationCompatibilityPack" -NoNewWindow
270-
Write-Host "############################################ Done ###############################################"
271-
} else {
272-
Write-Host "################################## LIBVA already installed #####################################"
273-
}
274-
275260
Write-Host "#################################### Preparing build directory #####################################"
276261
if (Test-Path "${DLSTREAMER_TMP}\\build") {
277262
Remove-Item -LiteralPath "${DLSTREAMER_TMP}\\build" -Recurse

‎scripts/setup_dls_env.ps1‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -168,16 +168,6 @@ if ($OPENVINO_NEEDS_INSTALL) {
168168
Write-Host "################################# OpenVINO GenAI ${OPENVINO_VERSION} already correctly installed ##################################"
169169
}
170170

171-
Write-Host 'Setting variables: LIBVA_DRIVER_NAME, LIBVA_DRIVERS_PATH, Path (for LIBVA)'
172-
[Environment]::SetEnvironmentVariable('LIBVA_DRIVER_NAME', 'vaon12', [System.EnvironmentVariableTarget]::User)
173-
[Environment]::SetEnvironmentVariable('LIBVA_DRIVERS_PATH', (Get-Item .).FullName + '\Microsoft.Direct3D.VideoAccelerationCompatibilityPack.1.0.2\build\native\x64\bin\', [System.EnvironmentVariableTarget]::User)
174-
$USER_PATH = [Environment]::GetEnvironmentVariable('Path', 'User')
175-
$pathEntries = $USER_PATH -split ';'
176-
if (-Not ($pathEntries -contains [Environment]::GetEnvironmentVariable('LIBVA_DRIVERS_PATH', 'User'))) {
177-
[Environment]::SetEnvironmentVariable('Path', $USER_PATH + ';' + [Environment]::GetEnvironmentVariable('LIBVA_DRIVERS_PATH', 'User'), [System.EnvironmentVariableTarget]::User)
178-
Write-Host 'Added LIBVA drivers path to User Path variable'
179-
}
180-
181171
Write-Host 'Setting variables: GST_PLUGIN_PATH, Path (for DLLs)'
182172
$CURRENT_DIR = (Get-Item .).FullName
183173
[Environment]::SetEnvironmentVariable('GST_PLUGIN_PATH', "C:\gstreamer\1.0\msvc_x86_64\bin;C:\gstreamer\1.0\msvc_x86_64\lib\gstreamer-1.0;$CURRENT_DIR", [System.EnvironmentVariableTarget]::User)
@@ -217,8 +207,6 @@ if (-Not (($pathEntries -contains $OPENVINO_TBB_DIR) -and ($pathEntries -contain
217207
$env:Path = [System.Environment]::GetEnvironmentVariable('Path','Machine') + ';' + [System.Environment]::GetEnvironmentVariable('Path','User')
218208
$env:GST_PLUGIN_PATH = [System.Environment]::GetEnvironmentVariable('GST_PLUGIN_PATH','User')
219209
$env:GST_PLUGIN_SCANNER = [System.Environment]::GetEnvironmentVariable('GST_PLUGIN_SCANNER','User')
220-
$env:LIBVA_DRIVER_NAME = [System.Environment]::GetEnvironmentVariable('LIBVA_DRIVER_NAME','User')
221-
$env:LIBVA_DRIVERS_PATH = [System.Environment]::GetEnvironmentVariable('LIBVA_DRIVERS_PATH','User')
222210
$env:OpenVINO_DIR = [System.Environment]::GetEnvironmentVariable('OpenVINO_DIR','User')
223211
$env:OPENVINO_LIB_PATHS = [System.Environment]::GetEnvironmentVariable('OPENVINO_LIB_PATHS','User')
224212

@@ -229,10 +217,6 @@ Write-Host "GST_PLUGIN_PATH:"
229217
$env:GST_PLUGIN_PATH
230218
Write-Host "GST_PLUGIN_SCANNER:"
231219
$env:GST_PLUGIN_SCANNER
232-
Write-Host "LIBVA_DRIVER_NAME:"
233-
$env:LIBVA_DRIVER_NAME
234-
Write-Host "LIBVA_DRIVERS_PATH:"
235-
$env:LIBVA_DRIVERS_PATH
236220
Write-Host "OpenVINO_DIR:"
237221
$env:OpenVINO_DIR
238222
Write-Host "OPENVINO_LIB_PATHS:"

‎src/CMakeLists.txt‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ==============================================================================
2-
# Copyright (C) 2021-2025 Intel Corporation
2+
# Copyright (C) 2021-2026 Intel Corporation
33
#
44
# SPDX-License-Identifier: MIT
55
# ==============================================================================
@@ -8,9 +8,12 @@ add_subdirectory(base)
88
add_subdirectory(cpu)
99
#add_subdirectory(ffmpeg)
1010
add_subdirectory(gst)
11-
add_subdirectory(opencl)
12-
add_subdirectory(opencv)
13-
add_subdirectory(openvino)
14-
add_subdirectory(sycl)
1511
add_subdirectory(utils)
16-
add_subdirectory(vaapi)
12+
13+
if(NOT WIN32)
14+
add_subdirectory(opencl)
15+
add_subdirectory(opencv)
16+
add_subdirectory(openvino)
17+
add_subdirectory(sycl)
18+
add_subdirectory(vaapi)
19+
endif()

‎src/base/openvino_inference_backend/CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
# ==============================================================================
2-
# Copyright (C) 2022-2025 Intel Corporation
2+
# Copyright (C) 2022-2026 Intel Corporation
33
#
44
# SPDX-License-Identifier: MIT
55
# ==============================================================================
66

77
set(TARGET_NAME "openvino_inference_backend")
88

99
find_package(OpenVINO REQUIRED Runtime)
10-
pkg_search_module(VA va libva REQUIRED)
1110
if(WIN32)
1211
pkg_check_modules(GSTD3D11 gstreamer-d3d11-1.0>=1.16 REQUIRED)
1312
endif()
@@ -16,7 +15,7 @@ find_package(OpenCL REQUIRED)
1615
add_library(${TARGET_NAME} OBJECT openvino.cpp openvino.hpp)
1716
set_compile_flags(${TARGET_NAME})
1817

19-
target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${VA_INCLUDE_DIRS} ${OpenCL_INCLUDE_DIRS})
18+
target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${OpenCL_INCLUDE_DIRS})
2019

2120
if(WIN32)
2221
target_include_directories(${TARGET_NAME} PUBLIC ${GSTD3D11_INCLUDE_DIRS})

‎src/gst/elements/CMakeLists.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ==============================================================================
2-
# Copyright (C) 2022-2025 Intel Corporation
2+
# Copyright (C) 2022-2026 Intel Corporation
33
#
44
# SPDX-License-Identifier: MIT
55
# ==============================================================================
@@ -8,8 +8,6 @@ set(TARGET_NAME "gstdlstreamer_elements")
88

99
include_directories(${DLSTREAMER_BASE_DIR}/src/cpu/_plugin/)
1010

11-
pkg_search_module(VA va libva REQUIRED)
12-
1311
add_subdirectory(batch_create)
1412
add_subdirectory(batch_split)
1513
add_subdirectory(capsrelax)
@@ -36,8 +34,6 @@ file(GLOB MAIN_HEADERS
3634
add_library(${TARGET_NAME} SHARED ${MAIN_SRC} ${MAIN_HEADERS})
3735
set_compile_flags(${TARGET_NAME})
3836

39-
target_link_directories(${TARGET_NAME} PUBLIC ${VA_LIBRARY_DIRS})
40-
4137
target_link_libraries(${TARGET_NAME}
4238
PRIVATE
4339
batch_create

‎src/gst/elements/batch_create/CMakeLists.txt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
# ==============================================================================
2-
# Copyright (C) 2022-2025 Intel Corporation
2+
# Copyright (C) 2022-2026 Intel Corporation
33
#
44
# SPDX-License-Identifier: MIT
55
# ==============================================================================
66

77
set(TARGET_NAME "batch_create")
88

9-
pkg_search_module(VA va libva REQUIRED)
10-
119
if(WIN32)
1210
find_package(PkgConfig REQUIRED)
1311
pkg_check_modules(GSTD3D11 gstreamer-d3d11-1.0)
@@ -27,7 +25,6 @@ set_compile_flags(${TARGET_NAME})
2725
target_include_directories(${TARGET_NAME}
2826
PUBLIC
2927
${CMAKE_CURRENT_SOURCE_DIR}
30-
${VA_INCLUDE_DIRS}
3128
)
3229

3330
if(WIN32)

‎src/gst/elements/gvainference/CMakeLists.txt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ==============================================================================
2-
# Copyright (C) 2022-2025 Intel Corporation
2+
# Copyright (C) 2022-2026 Intel Corporation
33
#
44
# SPDX-License-Identifier: MIT
55
# ==============================================================================
@@ -8,15 +8,12 @@ cmake_minimum_required(VERSION 3.20)
88

99
set(TARGET_NAME "gvainference")
1010

11-
pkg_search_module(VA va libva REQUIRED)
12-
1311
add_library(${TARGET_NAME} STATIC gvainference.cpp gvainference.h)
1412
set_compile_flags(${TARGET_NAME})
1513

1614
target_include_directories(${TARGET_NAME}
1715
PUBLIC
1816
${CMAKE_CURRENT_SOURCE_DIR}
19-
${VA_INCLUDE_DIRS}
2017
)
2118

2219
target_link_libraries(${TARGET_NAME}

‎src/gst/lib/CMakeLists.txt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
# ==============================================================================
2-
# Copyright (C) 2018-2025 Intel Corporation
2+
# Copyright (C) 2018-2026 Intel Corporation
33
#
44
# SPDX-License-Identifier: MIT
55
# ==============================================================================
66

77
set (TARGET_NAME "dlstreamer_gst")
88

9-
pkg_search_module(VA va libva REQUIRED)
10-
119
if(WIN32)
1210
pkg_check_modules(GSTD3D11 gstreamer-d3d11-1.0>=1.16 REQUIRED)
1311
endif()
@@ -22,7 +20,6 @@ PUBLIC
2220
${GLIB2_INCLUDE_DIRS}
2321
PRIVATE
2422
${GSTALLOC_INCLUDE_DIRS}
25-
${VA_INCLUDE_DIRS}
2623
)
2724

2825
if(WIN32)

0 commit comments

Comments
 (0)