diff mbox

[FFmpeg-devel,2/8] build: treat crystalhd like other hwaccels

Message ID 20170728115145.23169-3-u@pkh.me
State Accepted
Commit 55fdfc88b844aa31af58bb4cdae7b071c76869a9
Headers show

Commit Message

Clément Bœsch July 28, 2017, 11:51 a.m. UTC 
From: Clément Bœsch <cboesch@gopro.com>

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

Comments

Philip Langdale July 28, 2017, 11:59 a.m. UTC | #1 
On 2017-07-28 11:51, Clément Bœsch wrote:
> From: Clément Bœsch <cboesch@gopro.com>
> 
> ---
>  configure | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/configure b/configure
> index a80f9cb2eb..a2ad72f7f4 100755
> --- a/configure
> +++ b/configure
> @@ -1529,7 +1529,6 @@ EXTERNAL_LIBRARY_LIST="
>      $EXTERNAL_LIBRARY_VERSION3_LIST
>      $EXTERNAL_LIBRARY_GPLV3_LIST
>      chromaprint
> -    crystalhd
>      gcrypt
>      gnutls
>      jni
> @@ -1586,6 +1585,7 @@ EXTERNAL_LIBRARY_LIST="
>  "
>  HWACCEL_AUTODETECT_LIBRARY_LIST="
>      audiotoolbox
> +    crystalhd
>      cuda
>      cuvid
>      d3d11va
> @@ -3588,7 +3588,7 @@ done
>  enable_weak audiotoolbox
> 
>  # Enable hwaccels by default.
> -enable_weak d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
> +enable_weak crystalhd d3d11va dxva2 vaapi vda vdpau 
> videotoolbox_hwaccel xvmc
>  enable_weak xlib
> 
>  enable_weak cuda cuvid nvenc vda_framework videotoolbox 
> videotoolbox_encoder
> @@ -5797,7 +5797,6 @@ enabled bzlib && check_lib bzlib bzlib.h
> BZ2_bzlibVersion    -lbz2
>  enabled  lzma && check_lib lzma   lzma.h lzma_version_number -llzma
> 
>  check_lib libm math.h sin -lm && LIBM="-lm"
> -disabled crystalhd || check_lib crystalhd "stdint.h
> libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
> 
>  atan2f_args=2
>  copysign_args=2
> @@ -6157,6 +6156,8 @@ enabled vdpau &&
>  enabled vdpau &&
>      check_lib vdpau_x11 "vdpau/vdpau.h vdpau/vdpau_x11.h"
> vdp_device_create_x11 -lvdpau -lX11
> 
> +enabled crystalhd && check_lib crystalhd "stdint.h
> libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
> +
>  if enabled x86; then
>      case $target_os in
>          mingw32*|mingw64*|win32|win64|linux|cygwin*)

Looks fine to me.

--phil
Philip Langdale Aug. 5, 2017, 4:21 p.m. UTC | #2 
On Fri, 28 Jul 2017 11:59:13 +0000
Philip Langdale <philipl@overt.org> wrote:

> On 2017-07-28 11:51, Clément Bœsch wrote:
> > From: Clément Bœsch <cboesch@gopro.com>
> > 
> > ---
> >  configure | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> > 
> > diff --git a/configure b/configure
> > index a80f9cb2eb..a2ad72f7f4 100755
> > --- a/configure
> > +++ b/configure
> > @@ -1529,7 +1529,6 @@ EXTERNAL_LIBRARY_LIST="
> >      $EXTERNAL_LIBRARY_VERSION3_LIST
> >      $EXTERNAL_LIBRARY_GPLV3_LIST
> >      chromaprint
> > -    crystalhd
> >      gcrypt
> >      gnutls
> >      jni
> > @@ -1586,6 +1585,7 @@ EXTERNAL_LIBRARY_LIST="
> >  "
> >  HWACCEL_AUTODETECT_LIBRARY_LIST="
> >      audiotoolbox
> > +    crystalhd
> >      cuda
> >      cuvid
> >      d3d11va
> > @@ -3588,7 +3588,7 @@ done
> >  enable_weak audiotoolbox
> > 
> >  # Enable hwaccels by default.
> > -enable_weak d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
> > +enable_weak crystalhd d3d11va dxva2 vaapi vda vdpau 
> > videotoolbox_hwaccel xvmc
> >  enable_weak xlib
> > 
> >  enable_weak cuda cuvid nvenc vda_framework videotoolbox 
> > videotoolbox_encoder
> > @@ -5797,7 +5797,6 @@ enabled bzlib && check_lib bzlib bzlib.h
> > BZ2_bzlibVersion    -lbz2
> >  enabled  lzma && check_lib lzma   lzma.h lzma_version_number -llzma
> > 
> >  check_lib libm math.h sin -lm && LIBM="-lm"
> > -disabled crystalhd || check_lib crystalhd "stdint.h
> > libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
> > 
> >  atan2f_args=2
> >  copysign_args=2
> > @@ -6157,6 +6156,8 @@ enabled vdpau &&
> >  enabled vdpau &&
> >      check_lib vdpau_x11 "vdpau/vdpau.h vdpau/vdpau_x11.h"
> > vdp_device_create_x11 -lvdpau -lX11
> > 
> > +enabled crystalhd && check_lib crystalhd "stdint.h
> > libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
> > +
> >  if enabled x86; then
> >      case $target_os in
> >          mingw32*|mingw64*|win32|win64|linux|cygwin*)  
> 
> Looks fine to me.

You asked me to actually check it with the hardware, so I did and it's
working correctly.

--phil
diff mbox

Patch

diff --git a/configure b/configure
index a80f9cb2eb..a2ad72f7f4 100755
--- a/configure
+++ b/configure
@@ -1529,7 +1529,6 @@  EXTERNAL_LIBRARY_LIST="
     $EXTERNAL_LIBRARY_VERSION3_LIST
     $EXTERNAL_LIBRARY_GPLV3_LIST
     chromaprint
-    crystalhd
     gcrypt
     gnutls
     jni
@@ -1586,6 +1585,7 @@  EXTERNAL_LIBRARY_LIST="
 "
 HWACCEL_AUTODETECT_LIBRARY_LIST="
     audiotoolbox
+    crystalhd
     cuda
     cuvid
     d3d11va
@@ -3588,7 +3588,7 @@  done
 enable_weak audiotoolbox
 
 # Enable hwaccels by default.
-enable_weak d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
+enable_weak crystalhd d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
 enable_weak xlib
 
 enable_weak cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder
@@ -5797,7 +5797,6 @@  enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion    -lbz2
 enabled  lzma && check_lib lzma   lzma.h lzma_version_number -llzma
 
 check_lib libm math.h sin -lm && LIBM="-lm"
-disabled crystalhd || check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
 
 atan2f_args=2
 copysign_args=2
@@ -6157,6 +6156,8 @@  enabled vdpau &&
 enabled vdpau &&
     check_lib vdpau_x11 "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau -lX11
 
+enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
+
 if enabled x86; then
     case $target_os in
         mingw32*|mingw64*|win32|win64|linux|cygwin*)