FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

msdk: add mfx in include path

Browse Source 
Thus removing the preprocessor's directives to included if found.
This commit is contained in:
Víctor Manuel Jáquez Leal 2019-01-08 13:36:09 +01:00
parent 604c8d5232
commit c22f92c799
10 changed files with 19 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@ -1058,7 +1058,9 @@ AG_GST_CHECK_FEATURE(MSDK, [Intel MediaSDK], msdk, [
CPPFLAGS="$LIBMFX_CFLAGS $save_CPPFLAGS" CPPFLAGS="$LIBMFX_CFLAGS $save_CPPFLAGS"
AC_CHECK_HEADER(mfx/mfxdefs.h, [HAVE_MFX_MFXDEFS_H=1], [HAVE_MFX_MFXDEFS_H=0]) AC_CHECK_HEADER(mfx/mfxdefs.h, [HAVE_MFX_MFXDEFS_H=1], [HAVE_MFX_MFXDEFS_H=0])
if test $HAVE_MFX_MFXDEFS_H -eq 1; then if test $HAVE_MFX_MFXDEFS_H -eq 1; then
AC_DEFINE(HAVE_MFX_MFXDEFS_H, 1, [Define if mfx/mfxdefs.h available]) MFX_INCDIR="`$PKG_CONFIG --variable=includedir libmfx`"
MSDK_CFLAGS="-I$MFX_INCDIR/mfx"
AC_SUBST(MSDK_CFLAGS)
fi fi
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"
], [ ], [
@ -1070,7 +1072,7 @@ AG_GST_CHECK_FEATURE(MSDK, [Intel MediaSDK], msdk, [
[AS_IF([test "x$MFX_HOME" != "x"], [AS_IF([test "x$MFX_HOME" != "x"],
[MSDK_PREFIX="$MFX_HOME"], [MSDK_PREFIX="$MFX_HOME"],
[MSDK_PREFIX="/opt/intel/media"])]) [MSDK_PREFIX="/opt/intel/media"])])
MSDK_CFLAGS="-I$MSDK_PREFIX/include" MSDK_CFLAGS="-I$MSDK_PREFIX/include -I$MSDK_PREFIX/include/mfx"
MSDK_LIBS="-L$MSDK_PREFIX/lib/lin_x64 -L$MSDK_PREFIX/lib/x64 -L$MSDK_PREFIX/lib64 -L$MSDK_PREFIX/lib -lmfx -ldl" MSDK_LIBS="-L$MSDK_PREFIX/lib/lin_x64 -L$MSDK_PREFIX/lib/x64 -L$MSDK_PREFIX/lib64 -L$MSDK_PREFIX/lib -lmfx -ldl"
AC_SUBST(MSDK_CFLAGS) AC_SUBST(MSDK_CFLAGS)
AC_SUBST(MSDK_LIBS) AC_SUBST(MSDK_LIBS)
@ -1113,21 +1115,12 @@ AG_GST_CHECK_FEATURE(MSDK, [Intel MediaSDK], msdk, [
[ [
#include <mfxplugin.h> #include <mfxplugin.h>
]) ])
dnl check the availability of vp9 apis in PREFIX/include/mfx
AC_CHECK_HEADER(mfx/mfxvp9.h, [HAVE_MFX_MFXVP9_H=1], [HAVE_MFX_MFXVP9_H=0],
[
#include <mfx/mfxplugin.h>
])
if test $HAVE_MFX_MFXVP9_H -eq 1; then
AC_DEFINE(HAVE_MFX_MFXVP9_H, 1, [Define if mfx/mfxdefs.h available])
fi
if test $HAVE_MFXVP9_H -eq 1 \ if test $HAVE_MFXVP9_H -eq 1; then
-o $HAVE_MFX_MFXVP9_H -eq 1; then
USE_MSDK_VP9_DEC=1 USE_MSDK_VP9_DEC=1
AC_DEFINE(USE_MSDK_VP9_DEC, 1, [Define if MediaSDK VP9 decoder api is available]) AC_DEFINE(USE_MSDK_VP9_DEC, 1, [Define if MediaSDK VP9 decoder api is available])
fi fi
], [USE_MSDK_VP9_DEC=0]) ], [USE_MSDK_VP9_DEC=0])
AM_CONDITIONAL(USE_MSDK_LIBVA, AM_CONDITIONAL(USE_MSDK_LIBVA,
test "x$HAVE_MSDK" = "xyes" -a "x$HAVE_LIBVA_DRM" = "xyes") test "x$HAVE_MSDK" = "xyes" -a "x$HAVE_LIBVA_DRM" = "xyes")
AM_CONDITIONAL([USE_MSDK_VP9_DEC], AM_CONDITIONAL([USE_MSDK_VP9_DEC],

6
sys/msdk/gstmsdkh265dec.c
View File

@ -33,11 +33,7 @@
# include <config.h> # include <config.h>
#endif #endif
#ifdef HAVE_MFX_MFXDEFS_H #include <mfxplugin.h>
# include <mfx/mfxplugin.h>
#else
# include "mfxplugin.h"
#endif
#include "gstmsdkh265dec.h" #include "gstmsdkh265dec.h"
#include "gstmsdkvideomemory.h" #include "gstmsdkvideomemory.h"

6
sys/msdk/gstmsdkh265enc.c
View File

@ -33,11 +33,7 @@
# include <config.h> # include <config.h>
#endif #endif
#ifdef HAVE_MFX_MFXDEFS_H #include <mfxplugin.h>
# include <mfx/mfxplugin.h>
#else
# include "mfxplugin.h"
#endif
#include <gst/allocators/gstdmabuf.h> #include <gst/allocators/gstdmabuf.h>

9
sys/msdk/gstmsdkmjpegdec.c
View File

@ -33,13 +33,8 @@
# include <config.h> # include <config.h>
#endif #endif
#ifdef HAVE_MFX_MFXDEFS_H #include <mfxstructures.h>
# include <mfx/mfxstructures.h> #include <mfxjpeg.h>
# include <mfx/mfxjpeg.h>
#else
# include "mfxstructures.h"
# include "mfxjpeg.h"
#endif
#include "gstmsdkmjpegdec.h" #include "gstmsdkmjpegdec.h"

9
sys/msdk/gstmsdkvp8dec.c
View File

@ -34,13 +34,8 @@
# include <config.h> # include <config.h>
#endif #endif
#ifdef HAVE_MFX_MFXDEFS_H #include <mfxplugin.h>
# include <mfx/mfxplugin.h> #include <mfxvp8.h>
# include <mfx/mfxvp8.h>
#else
# include "mfxplugin.h"
# include "mfxvp8.h"
#endif
#include "gstmsdkvp8dec.h" #include "gstmsdkvp8dec.h"

9
sys/msdk/gstmsdkvp8enc.c
View File

@ -33,13 +33,8 @@
# include <config.h> # include <config.h>
#endif #endif
#ifdef HAVE_MFX_MFXDEFS_H #include <mfxplugin.h>
# include <mfx/mfxplugin.h> #include <mfxvp8.h>
# include <mfx/mfxvp8.h>
#else
# include "mfxplugin.h"
# include "mfxvp8.h"
#endif
#include "gstmsdkvp8enc.h" #include "gstmsdkvp8enc.h"

9
sys/msdk/gstmsdkvp9dec.c
View File

@ -35,13 +35,8 @@
# include <config.h> # include <config.h>
#endif #endif
#ifdef HAVE_MFX_MFXVP9_H #include <mfxplugin.h>
# include <mfx/mfxplugin.h> #include <mfxvp9.h>
# include <mfx/mfxvp9.h>
#else
# include "mfxplugin.h"
# include "mfxvp9.h"
#endif
#include "gstmsdkvp9dec.h" #include "gstmsdkvp9dec.h"

2
sys/msdk/meson.build
View File

@ -61,7 +61,7 @@ endif
# Old versions of MediaSDK don't have the 'mfx' directory prefix # Old versions of MediaSDK don't have the 'mfx' directory prefix
if cxx.has_header('mfx/mfxdefs.h', args: '-I' + mfx_incdir) if cxx.has_header('mfx/mfxdefs.h', args: '-I' + mfx_incdir)
cdata.set('HAVE_MFX_MFXDEFS_H', 1) mfx_incdir = join_paths([mfx_incdir, 'mfx'])
endif endif
if host_machine.system() == 'windows' if host_machine.system() == 'windows'

6
sys/msdk/msdk.h
View File

@ -41,11 +41,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/video/video.h> #include <gst/video/video.h>
#ifdef HAVE_MFX_MFXDEFS_H #include <mfxvideo.h>
# include <mfx/mfxvideo.h>
#else
# include "mfxvideo.h"
#endif
G_BEGIN_DECLS G_BEGIN_DECLS

6
sys/msdk/msdk_libva.h
View File

@ -40,11 +40,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <va/va.h> #include <va/va.h>
#ifdef HAVE_MFX_MFXDEFS_H #include <mfxvideo.h>
# include <mfx/mfxvideo.h>
#else
# include "mfxvideo.h"
#endif
G_BEGIN_DECLS G_BEGIN_DECLS