diff mbox

[FFmpeg-devel] configure: Require bit_depth field for VAAPI VP9 decode hwaccel

Message ID 31492c0c-fce2-9841-a9df-a483519175a5@jkqxz.net
State Accepted
Commit db7271bff2a6ad1890c9fd95e8126082bbeab9c7
Headers show

Commit Message

Mark Thompson Dec. 8, 2016, 4:26 p.m. UTC 
libva versions from 1.6.0 to 1.6.2 do not include it, and therefore
cannot work with VP9 profile >= 2.
---
On 08/12/16 16:13, James Almer wrote:
> On 12/8/2016 12:55 PM, Mark Thompson wrote:
>> On 08/12/16 15:51, Mark Thompson wrote:
>>> Hacky fix enclosing, only compile tested.
>>>
>>> A configure test for this might be better, because we could then check it sensibly in the generic code and bail out earlier?  (Which would permit software decode, this will attempt hardware decode and fail.)
>>
>> Or maybe change the current configure test to drop support for VP9 in those versions entirely?  Newer versions of libva including the field already existed when the first hardware which could do VP9 at all through this was released.
>>
>> - Mark
> 
> Definitely make the first version with that field the minimum in that case.
> The least amount of ifdeffery the better.

Alternate version taking this approach.


 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Carl Eugen Hoyos Dec. 10, 2016, 12:39 p.m. UTC | #1 
2016-12-08 17:26 GMT+01:00 Mark Thompson <sw@jkqxz.net>:
> libva versions from 1.6.0 to 1.6.2 do not include it, and therefore
> cannot work with VP9 profile >= 2.

(I missed this, sorry.)

As said, please commit any of these patches soon.

Carl Eugen
diff mbox

Patch

diff --git a/configure b/configure
index 21ec552..810e7ab 100755
--- a/configure
+++ b/configure
@@ -2689,7 +2689,7 @@  vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9"
 vp9_dxva2_hwaccel_select="vp9_decoder"
 vp9_mediacodec_decoder_deps="mediacodec"
 vp9_mediacodec_hwaccel_deps="mediacodec"
-vp9_vaapi_hwaccel_deps="vaapi VADecPictureParameterBufferVP9"
+vp9_vaapi_hwaccel_deps="vaapi VADecPictureParameterBufferVP9_bit_depth"
 vp9_vaapi_hwaccel_select="vp9_decoder"
 wmv3_crystalhd_decoder_select="crystalhd"
 wmv3_d3d11va_hwaccel_select="vc1_d3d11va_hwaccel"
@@ -5610,7 +5610,7 @@  check_type "windows.h d3d11.h" "ID3D11VideoContext"
 check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602
 
 check_type "va/va.h" "VAPictureParameterBufferHEVC"
-check_type "va/va.h" "VADecPictureParameterBufferVP9"
+check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth
 check_type "va/va.h va/va_vpp.h" "VAProcPipelineParameterBuffer"
 check_type "va/va.h va/va_enc_h264.h" "VAEncPictureParameterBufferH264"
 check_type "va/va.h va/va_enc_hevc.h" "VAEncPictureParameterBufferHEVC"