diff mbox

[FFmpeg-devel] configure: Change the configure check for tonemap_vaapi

Message ID 20191224063253.26796-1-xinpeng.sun@intel.com
State New
Headers show

Commit Message

Sun, Xinpeng Dec. 24, 2019, 6:32 a.m. UTC
"VAProcFilterParameterBufferHDRToneMapping" was defined in libva 2.4.1, which will lead to
build failure for the filter tonemap_vaapi for libva 2.3.0 with current check. This patch
is to fix this build error.

Signed-off-by: Xinpeng Sun <xinpeng.sun@intel.com>
---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Marton Balint Dec. 25, 2019, 9:40 p.m. UTC | #1
On Tue, 24 Dec 2019, Xinpeng Sun wrote:

> "VAProcFilterParameterBufferHDRToneMapping" was defined in libva 2.4.1, which will lead to
> build failure for the filter tonemap_vaapi for libva 2.3.0 with current check. This patch
> is to fix this build error.

Thanks, it fixes the issue indeed.

Regards,
Marton

>
> Signed-off-by: Xinpeng Sun <xinpeng.sun@intel.com>
> ---
> configure | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index eec43c3b06..157dc30132 100755
> --- a/configure
> +++ b/configure
> @@ -3580,7 +3580,7 @@ tinterlace_filter_deps="gpl"
> tinterlace_merge_test_deps="tinterlace_filter"
> tinterlace_pad_test_deps="tinterlace_filter"
> tonemap_filter_deps="const_nan"
> -tonemap_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer_output_hdr_metadata"
> +tonemap_vaapi_filter_deps="vaapi VAProcFilterParameterBufferHDRToneMapping_type"
> tonemap_opencl_filter_deps="opencl const_nan"
> transpose_opencl_filter_deps="opencl"
> transpose_vaapi_filter_deps="vaapi VAProcPipelineCaps_rotation_flags"
> @@ -6585,7 +6585,7 @@ if enabled vaapi; then
>
>     check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC"
>     check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth
> -    check_struct "va/va.h va/va_vpp.h" "VAProcPipelineParameterBuffer" output_hdr_metadata
> +    check_struct "va/va.h va/va_vpp.h" "VAProcFilterParameterBufferHDRToneMapping" type
>     check_struct "va/va.h va/va_vpp.h" "VAProcPipelineCaps" rotation_flags
>     check_type "va/va.h va/va_enc_hevc.h" "VAEncPictureParameterBufferHEVC"
>     check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG"
> -- 
> 2.17.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Mark Thompson Dec. 27, 2019, 11:57 p.m. UTC | #2
On 24/12/2019 06:32, Xinpeng Sun wrote:
> "VAProcFilterParameterBufferHDRToneMapping" was defined in libva 2.4.1, which will lead to
> build failure for the filter tonemap_vaapi for libva 2.3.0 with current check. This patch
> is to fix this build error.
> 
> Signed-off-by: Xinpeng Sun <xinpeng.sun@intel.com>
> ---
>  configure | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/configure b/configure
> index eec43c3b06..157dc30132 100755
> --- a/configure
> +++ b/configure
> @@ -3580,7 +3580,7 @@ tinterlace_filter_deps="gpl"
>  tinterlace_merge_test_deps="tinterlace_filter"
>  tinterlace_pad_test_deps="tinterlace_filter"
>  tonemap_filter_deps="const_nan"
> -tonemap_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer_output_hdr_metadata"
> +tonemap_vaapi_filter_deps="vaapi VAProcFilterParameterBufferHDRToneMapping_type"

This is out of order, you could fix that at the same time.

>  tonemap_opencl_filter_deps="opencl const_nan"
>  transpose_opencl_filter_deps="opencl"
>  transpose_vaapi_filter_deps="vaapi VAProcPipelineCaps_rotation_flags"
> @@ -6585,7 +6585,7 @@ if enabled vaapi; then
>  
>      check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC"
>      check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth
> -    check_struct "va/va.h va/va_vpp.h" "VAProcPipelineParameterBuffer" output_hdr_metadata
> +    check_struct "va/va.h va/va_vpp.h" "VAProcFilterParameterBufferHDRToneMapping" type

You only want the structure itself rather than any particular member of it, right?  I think that means you want check_type rather than check_struct.

>      check_struct "va/va.h va/va_vpp.h" "VAProcPipelineCaps" rotation_flags
>      check_type "va/va.h va/va_enc_hevc.h" "VAEncPictureParameterBufferHEVC"
>      check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG"
> 

- Mark
Sun, Xinpeng Dec. 30, 2019, 7:38 a.m. UTC | #3
> -----Original Message-----

> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Mark

> Thompson

> Sent: Saturday, December 28, 2019 7:57 AM

> To: ffmpeg-devel@ffmpeg.org

> Subject: Re: [FFmpeg-devel] [PATCH] configure: Change the configure check for

> tonemap_vaapi

> 

> On 24/12/2019 06:32, Xinpeng Sun wrote:

> > "VAProcFilterParameterBufferHDRToneMapping" was defined in libva

> > 2.4.1, which will lead to build failure for the filter tonemap_vaapi

> > for libva 2.3.0 with current check. This patch is to fix this build error.

> >

> > Signed-off-by: Xinpeng Sun <xinpeng.sun@intel.com>

> > ---

> >  configure | 4 ++--

> >  1 file changed, 2 insertions(+), 2 deletions(-)

> >

> > diff --git a/configure b/configure

> > index eec43c3b06..157dc30132 100755

> > --- a/configure

> > +++ b/configure

> > @@ -3580,7 +3580,7 @@ tinterlace_filter_deps="gpl"

> >  tinterlace_merge_test_deps="tinterlace_filter"

> >  tinterlace_pad_test_deps="tinterlace_filter"

> >  tonemap_filter_deps="const_nan"

> > -tonemap_vaapi_filter_deps="vaapi

> VAProcPipelineParameterBuffer_output_hdr_metadata"

> > +tonemap_vaapi_filter_deps="vaapi

> VAProcFilterParameterBufferHDRToneMapping_type"

> 

> This is out of order, you could fix that at the same time.


Fixed together in the v2 version.

> 

> >  tonemap_opencl_filter_deps="opencl const_nan"

> >  transpose_opencl_filter_deps="opencl"

> >  transpose_vaapi_filter_deps="vaapi VAProcPipelineCaps_rotation_flags"

> > @@ -6585,7 +6585,7 @@ if enabled vaapi; then

> >

> >      check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC"

> >      check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth

> > -    check_struct "va/va.h va/va_vpp.h" "VAProcPipelineParameterBuffer"

> output_hdr_metadata

> > +    check_struct "va/va.h va/va_vpp.h"

> > + "VAProcFilterParameterBufferHDRToneMapping" type

> 

> You only want the structure itself rather than any particular member of it, right?

> I think that means you want check_type rather than check_struct.


Exactly so. Changed in the v2 version.

Thanks,
Xinpeng

> 

> >      check_struct "va/va.h va/va_vpp.h" "VAProcPipelineCaps" rotation_flags

> >      check_type "va/va.h va/va_enc_hevc.h"

> "VAEncPictureParameterBufferHEVC"

> >      check_type "va/va.h va/va_enc_jpeg.h"

> "VAEncPictureParameterBufferJPEG"

> >

> 

> - Mark

> _______________________________________________

> ffmpeg-devel mailing list

> ffmpeg-devel@ffmpeg.org

> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

> 

> To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org

> with subject "unsubscribe".
diff mbox

Patch

diff --git a/configure b/configure
index eec43c3b06..157dc30132 100755
--- a/configure
+++ b/configure
@@ -3580,7 +3580,7 @@  tinterlace_filter_deps="gpl"
 tinterlace_merge_test_deps="tinterlace_filter"
 tinterlace_pad_test_deps="tinterlace_filter"
 tonemap_filter_deps="const_nan"
-tonemap_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer_output_hdr_metadata"
+tonemap_vaapi_filter_deps="vaapi VAProcFilterParameterBufferHDRToneMapping_type"
 tonemap_opencl_filter_deps="opencl const_nan"
 transpose_opencl_filter_deps="opencl"
 transpose_vaapi_filter_deps="vaapi VAProcPipelineCaps_rotation_flags"
@@ -6585,7 +6585,7 @@  if enabled vaapi; then
 
     check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC"
     check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth
-    check_struct "va/va.h va/va_vpp.h" "VAProcPipelineParameterBuffer" output_hdr_metadata
+    check_struct "va/va.h va/va_vpp.h" "VAProcFilterParameterBufferHDRToneMapping" type
     check_struct "va/va.h va/va_vpp.h" "VAProcPipelineCaps" rotation_flags
     check_type "va/va.h va/va_enc_hevc.h" "VAEncPictureParameterBufferHEVC"
     check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG"