fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 00:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

meson: add vp9 and av1 codec support options

Browse source 
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26223>
This commit is contained in:
Sil Vilerino 2023-10-28 11:07:32 -04:00 • committed by Marge Bot
parent 870570ee66
commit 7b22dd8bfd
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci/meson/build.sh
View file

@ -87,7 +87,7 @@ meson setup _build \
-D gallium-opencl=disabled \ -D gallium-opencl=disabled \
-D gallium-drivers=${GALLIUM_DRIVERS:-[]} \ -D gallium-drivers=${GALLIUM_DRIVERS:-[]} \
-D vulkan-drivers=${VULKAN_DRIVERS:-[]} \ -D vulkan-drivers=${VULKAN_DRIVERS:-[]} \
-D video-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec \ -D video-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec,av1dec,av1enc,vp9dec \
-D werror=true \ -D werror=true \
${EXTRA_OPTION} ${EXTRA_OPTION}
cd _build cd _build

2
.gitlab-ci/windows/mesa_build.ps1
View file

@ -50,7 +50,7 @@ meson setup `
-Dvulkan-drivers="swrast,amd,microsoft-experimental" ` -Dvulkan-drivers="swrast,amd,microsoft-experimental" `
-Dgallium-drivers="swrast,d3d12,zink" ` -Dgallium-drivers="swrast,d3d12,zink" `
-Dgallium-va=enabled ` -Dgallium-va=enabled `
-Dvideo-codecs="h264dec,h264enc,h265dec,h265enc,vc1dec" ` -Dvideo-codecs="h264dec,h264enc,h265dec,h265enc,vc1dec,av1dec,av1enc,vp9dec" `
-Dshared-glapi=enabled ` -Dshared-glapi=enabled `
-Dgles1=enabled ` -Dgles1=enabled `
-Dgles2=enabled ` -Dgles2=enabled `

2
meson.build
View file

@ -338,7 +338,7 @@ if with_vulkan_beta
endif endif
_codecs = get_option('video-codecs') _codecs = get_option('video-codecs')
foreach c : ['vc1dec', 'h264dec', 'h264enc', 'h265dec', 'h265enc'] foreach c : ['vc1dec', 'h264dec', 'h264enc', 'h265dec', 'h265enc', 'av1dec', 'av1enc', 'vp9dec']
pre_args += '-DVIDEO_CODEC_@0@=@1@'.format(c.to_upper(), _codecs.contains(c).to_int()) pre_args += '-DVIDEO_CODEC_@0@=@1@'.format(c.to_upper(), _codecs.contains(c).to_int())
endforeach endforeach

2
meson_options.txt
View file

@ -631,7 +631,7 @@ option(
type : 'array', type : 'array',
value : [], value : [],
choices: [ choices: [
'vc1dec', 'h264dec', 'h264enc', 'h265dec', 'h265enc' 'vc1dec', 'h264dec', 'h264enc', 'h265dec', 'h265enc', 'av1dec', 'av1enc', 'vp9dec'
], ],
description : 'List of patent encumbered codecs to build support for. ' + description : 'List of patent encumbered codecs to build support for. ' +
'Distros might want to consult their legal department before ' + 'Distros might want to consult their legal department before ' +