[ptxdist] [PATCH] mesalib: allow enabling patent encumbered video codecs

[ptxdist] [PATCH] mesalib: allow enabling patent encumbered video codecs

[Philipp Zabel]

Add a menu with options to enable the VC-1, H.264, and H.265 codecs
when VA-API support is enabled.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/mesalib.in   | 28 ++++++++++++++++++++++++++++
 rules/mesalib.make |  8 +++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/rules/mesalib.in b/rules/mesalib.in
index 1f505b9dcc90..5e89907ed955 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -156,6 +156,34 @@ config MESALIB_VA
 	depends on MESALIB_DRI_RADEONSI || MESALIB_DRI_R600 || MESALIB_DRI_NOUVEAU
 	prompt "VA"
 
+if MESALIB_VA
+
+menu "Patent encumbered video codecs"
+
+config MESALIB_VIDEO_VC1DEC
+	bool
+	prompt "VC-1 decoding"
+
+config MESALIB_VIDEO_H264DEC
+	bool
+	prompt "H.264 decoding"
+
+config MESALIB_VIDEO_H264ENC
+	bool
+	prompt "H.264 encoding"
+
+config MESALIB_VIDEO_H265DEC
+	bool
+	prompt "H.265 decoding"
+
+config MESALIB_VIDEO_H265ENC
+	bool
+	prompt "H.265 encoding"
+
+endmenu
+
+endif
+
 comment "Platforms"
 
 config MESALIB_EGL_X11
diff --git a/rules/mesalib.make b/rules/mesalib.make
index dfbb0d11ae73..6395e1384261 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -92,6 +92,12 @@ MESALIB_DRI_GALLIUM_LIBS-y = \
 	,$(MESALIB_GALLIUM_DRIVERS-y) \
 	))))
 
+MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_VC1DEC)	+= vc1dec
+MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H264DEC)	+= h264dec
+MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H264ENC)	+= h264enc
+MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H265DEC)	+= h265dec
+MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H265ENC)	+= h265enc
+
 ifdef PTXCONF_ARCH_X86
 MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_AMD)		+= amd
 MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL)		+= intel
@@ -203,7 +209,7 @@ MESALIB_CONF_OPT	:= \
 	-Dva-libs-path=/usr/lib/dri \
 	-Dvalgrind=disabled \
 	-Dvdpau-libs-path=/usr/lib/vdpau \
-	-Dvideo-codecs=[] \
+	-Dvideo-codecs=$(subst $(space),$(comma),$(MESALIB_VIDEO_CODECS-y)) \
 	-Dvmware-mks-stats=false \
 	-Dvulkan-beta=false \
 	-Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) \
-- 
2.30.2

Re: [ptxdist] [APPLIED] mesalib: allow enabling patent encumbered video codecs

[Michael Olbrich]

Thanks, applied as 9244d1961690c8738c53d8c0647cd0f67d92bd2c.

Michael

[sent from post-receive hook]

On Fri, 11 Nov 2022 15:31:07 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Add a menu with options to enable the VC-1, H.264, and H.265 codecs
> when VA-API support is enabled.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20221024134505.2041999-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/mesalib.in b/rules/mesalib.in
> index 1f505b9dcc90..5e89907ed955 100644
> --- a/rules/mesalib.in
> +++ b/rules/mesalib.in
> @@ -156,6 +156,34 @@ config MESALIB_VA
>  	depends on MESALIB_DRI_RADEONSI || MESALIB_DRI_R600 || MESALIB_DRI_NOUVEAU
>  	prompt "VA"
>  
> +if MESALIB_VA
> +
> +menu "Patent encumbered video codecs"
> +
> +config MESALIB_VIDEO_VC1DEC
> +	bool
> +	prompt "VC-1 decoding"
> +
> +config MESALIB_VIDEO_H264DEC
> +	bool
> +	prompt "H.264 decoding"
> +
> +config MESALIB_VIDEO_H264ENC
> +	bool
> +	prompt "H.264 encoding"
> +
> +config MESALIB_VIDEO_H265DEC
> +	bool
> +	prompt "H.265 decoding"
> +
> +config MESALIB_VIDEO_H265ENC
> +	bool
> +	prompt "H.265 encoding"
> +
> +endmenu
> +
> +endif
> +
>  comment "Platforms"
>  
>  config MESALIB_EGL_X11
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index dfbb0d11ae73..6395e1384261 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -92,6 +92,12 @@ MESALIB_DRI_GALLIUM_LIBS-y = \
>  	,$(MESALIB_GALLIUM_DRIVERS-y) \
>  	))))
>  
> +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_VC1DEC)	+= vc1dec
> +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H264DEC)	+= h264dec
> +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H264ENC)	+= h264enc
> +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H265DEC)	+= h265dec
> +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H265ENC)	+= h265enc
> +
>  ifdef PTXCONF_ARCH_X86
>  MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_AMD)		+= amd
>  MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL)		+= intel
> @@ -203,7 +209,7 @@ MESALIB_CONF_OPT	:= \
>  	-Dva-libs-path=/usr/lib/dri \
>  	-Dvalgrind=disabled \
>  	-Dvdpau-libs-path=/usr/lib/vdpau \
> -	-Dvideo-codecs=[] \
> +	-Dvideo-codecs=$(subst $(space),$(comma),$(MESALIB_VIDEO_CODECS-y)) \
>  	-Dvmware-mks-stats=false \
>  	-Dvulkan-beta=false \
>  	-Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) \