On 01/06/15 7:54 AM, Martin Storsjö wrote:
> This fixes dxva2 detection (i.e. correctly realizes that it isn't
> available) for WinRT, where dxva2api.h does exist, but these definitions
> are omitted (when targeting the API subsets).
> 
> Ideally we should rather check for e.g. DXVA2_ConfigPictureDecode,
> but configure might fail to find that definition due to _WIN32_WINNT
> not being set to the right value during configure. (libavcodec/dxva2.h
> manually overrides the _WIN32_WINNT define.)

Something like

enabled dxva2api_h && check_type "dxva2api.h" DXVA2_ConfigPictureDecode 
-D_WIN32_WINNT=0x0600 || disable dxva2api_h

Should work then. You can put it above the d3d11_cobj check (Which IMO should 
be removed alongside the d3d11va_lib
check until actual d3d11 support is added to avconv, for that matter).

I see this patch was committed already, so up to you if you prefer the above 
solution or not.

> 
> This allows removing hardcoded --disable-dxva2 from such build
> configurations.
> ---
>  configure | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index cdc5a8d..4c4783c 100755
> --- a/configure
> +++ b/configure
> @@ -1985,7 +1985,7 @@ zmbv_encoder_deps="zlib"
>  
>  # hardware accelerators
>  d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder"
> -dxva2_deps="dxva2api_h"
> +dxva2_deps="dxva2api_h LPDIRECT3DSURFACE9"
>  vaapi_deps="va_va_h"
>  vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
>  vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration 
> -framework QuartzCore"
> @@ -4235,6 +4235,7 @@ check_struct "sys/time.h sys/resource.h" "struct 
> rusage" ru_maxrss
>  
>  check_type "windows.h dxva.h" "DXVA_PicParams_HEVC"
>  check_type "windows.h d3d11.h" "ID3D11VideoDecoder"
> +check_type d3d9.h LPDIRECT3DSURFACE9
>  
>  if ! disabled w32threads && ! enabled pthreads; then
>      check_func_headers "windows.h process.h" _beginthreadex &&
> 

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to