Permalink
Browse files

xvba: add decoder

  • Loading branch information...
1 parent 09b2b7b commit d1b59e7d1773d734e728c4b1205f6d604b938825 @FernetMenta committed Apr 12, 2012
View
@@ -124,6 +124,8 @@ vaapi_not_found="== Could not find libva. VAAPI support disabled. =="
vaapi_disabled="== VAAPI support manually disabled. =="
crystalhd_not_found="== Could not find libcrystalhd. CrystalHD support disabled. =="
crystalhd_disabled="== CrystalHD support manually disabled. =="
+xvba_not_found="== Could not find amdxvba.h. XVBA support disabled. =="
+xvba_disabled="== XVBA support manually disabled. =="
vdadecoder_enabled="== VDADecoder support enabled. =="
vdadecoder_disabled="== VDADecoder support manually disabled. =="
vtbdecoder_enabled="== VTBDecoder support enabled. =="
@@ -247,6 +249,12 @@ AC_ARG_ENABLE([crystalhd],
[enable CrystalHD decoding (default is auto)])],
[use_crystalhd=$enableval],
[use_crystalhd=auto])
+
+AC_ARG_ENABLE([xvba],
+ [AS_HELP_STRING([--enable-xvba],
+ [enable XVBA decoding (default is auto)])],
+ [use_xvba=$enableval],
+ [use_xvba=auto])
AC_ARG_ENABLE([vdadecoder],
[AS_HELP_STRING([--enable-vdadecoder],
@@ -1759,6 +1767,38 @@ else
USE_CRYSTALHD=0
fi
+# XVBA
+if test "x$use_xvba" != "xno"; then
+ if test "$host_vendor" = "apple" ; then
+ if test "x$use_xvba" = "xyes"; then
+ AC_MSG_ERROR([XVBA not supported on this platform])
+ else
+ use_xvba="no"
+ AC_MSG_NOTICE($xvba_disabled)
+ fi
+ USE_XVBA=0
+ else
+ initial_val=$use_xvba
+ AC_CHECK_HEADER([amd/amdxvba.h],, use_xvba=no, [#include <X11/Xlib.h>])
+
+ if test "x$use_xvba" = "xno"; then
+ if test "x$initial_val" = "xyes"; then
+ AC_MSG_ERROR($xvba_not_found)
+ else
+ AC_MSG_RESULT($xvba_not_found)
+ fi
+ USE_XVBA=0
+ else
+ AC_DEFINE([HAVE_LIBXVBA], [1], [Define to 1 if you have the 'xvba' header (amdxvba.h)])
+ USE_XVBA=1
+ fi
+ fi
+else
+ AC_MSG_NOTICE($xvba_disabled)
+ USE_XVBA=0
+fi
+
+
# VDADecoder
if test "x$use_vdadecoder" != "xno"; then
if test "$host_vendor" = "apple" ; then
@@ -1970,6 +2010,12 @@ else
final_message="$final_message\n CrystalHD:\tNo"
fi
+if test "x$use_xvba" != "xno"; then
+ final_message="$final_message\n XVBA:\t\tYes"
+else
+ final_message="$final_message\n XVBA:\t\tNo"
+fi
+
if test "x$use_vdadecoder" != "xno"; then
final_message="$final_message\n VDADecoder:\tYes"
else
@@ -2443,6 +2489,7 @@ AC_SUBST(USE_OPENGLES)
AC_SUBST(USE_VDPAU)
AC_SUBST(USE_VAAPI)
AC_SUBST(USE_CRYSTALHD)
+AC_SUBST(USE_XVBA)
AC_SUBST(USE_LIBSMBCLIENT)
AC_SUBST(USE_LIBNFS)
AC_SUBST(USE_LIBAFPCLIENT)
@@ -2626,6 +2673,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
`if test "x$use_vdpau" != "xno"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \
`if test "x$use_vaapi" != "xno"; then echo --enable-vaapi; else echo --disable-vaapi; fi` \
`if test "$use_optimizations" != "no"; then echo --enable-optimizations; else echo --disable-optimizations; fi` \
+ `if test "x$use_xvba" != "xno"; then echo --enable-xvba; else echo --disable-xvba; fi` \
--enable-protocol=http \
--enable-pthreads \
--enable-runtime-cpudetect \
@@ -5124,7 +5124,11 @@ msgctxt "#13436"
msgid "Allow Vdpau OpenGL interop YUV"
msgstr ""
-#empty strings from id 13437 to 13499
+msgctxt "#13437"
+msgid "Allow hardware acceleration (XVBA)"
+msgstr ""
+
+#empty strings from id 13438 to 13499
msgctxt "#13500"
msgid "A/V sync method"
@@ -6346,7 +6350,11 @@ msgctxt "#16325"
msgid "VDPAU - Bob"
msgstr ""
-#empty strings from id 16326 to 16399
+msgctxt "#16326"
+msgid "XVBA"
+msgstr ""
+
+#empty strings from id 16327 to 16399
msgctxt "#16400"
msgid "Post-processing"
Oops, something went wrong.

0 comments on commit d1b59e7

Please sign in to comment.