10 files changed, 19 insertions, 62 deletions
diff --git a/configure.ac b/configure.ac
index 3497d67ff..0fc71540d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1058,7 +1058,9 @@ AG_GST_CHECK_FEATURE(MSDK, [Intel MediaSDK], msdk, [
     CPPFLAGS="$LIBMFX_CFLAGS $save_CPPFLAGS"
     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
-      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
     CPPFLAGS="$save_CPPFLAGS"
   ], [
@@ -1070,7 +1072,7 @@ AG_GST_CHECK_FEATURE(MSDK, [Intel MediaSDK], msdk, [
             [AS_IF([test "x$MFX_HOME" != "x"],
                    [MSDK_PREFIX="$MFX_HOME"],
                    [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"
     AC_SUBST(MSDK_CFLAGS)
     AC_SUBST(MSDK_LIBS)
@@ -1113,21 +1115,12 @@ AG_GST_CHECK_FEATURE(MSDK, [Intel MediaSDK], msdk, [
   [
     #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 \
-    -o $HAVE_MFX_MFXVP9_H -eq 1; then
+  if test $HAVE_MFXVP9_H -eq 1; then
       USE_MSDK_VP9_DEC=1
       AC_DEFINE(USE_MSDK_VP9_DEC, 1, [Define if MediaSDK VP9 decoder api is available])
   fi
-  ], [USE_MSDK_VP9_DEC=0])
+], [USE_MSDK_VP9_DEC=0])
 AM_CONDITIONAL(USE_MSDK_LIBVA,
     test "x$HAVE_MSDK" = "xyes" -a "x$HAVE_LIBVA_DRM" = "xyes")
 AM_CONDITIONAL([USE_MSDK_VP9_DEC],
diff --git a/sys/msdk/gstmsdkh265dec.c b/sys/msdk/gstmsdkh265dec.c
index d37094835..fd7e27f5a 100644
--- a/sys/msdk/gstmsdkh265dec.c
+++ b/sys/msdk/gstmsdkh265dec.c
@@ -33,11 +33,7 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_MFX_MFXDEFS_H
-#  include <mfx/mfxplugin.h>
-#else
-#  include "mfxplugin.h"
-#endif
+#include <mfxplugin.h>
 
 #include "gstmsdkh265dec.h"
 #include "gstmsdkvideomemory.h"
diff --git a/sys/msdk/gstmsdkh265enc.c b/sys/msdk/gstmsdkh265enc.c
index c45bd6572..842fe6d70 100644
--- a/sys/msdk/gstmsdkh265enc.c
+++ b/sys/msdk/gstmsdkh265enc.c
@@ -33,11 +33,7 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_MFX_MFXDEFS_H
-#  include <mfx/mfxplugin.h>
-#else
-#  include "mfxplugin.h"
-#endif
+#include <mfxplugin.h>
 
 #include <gst/allocators/gstdmabuf.h>
 
diff --git a/sys/msdk/gstmsdkmjpegdec.c b/sys/msdk/gstmsdkmjpegdec.c
index 84e00ef3b..b8f5d903a 100644
--- a/sys/msdk/gstmsdkmjpegdec.c
+++ b/sys/msdk/gstmsdkmjpegdec.c
@@ -33,13 +33,8 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_MFX_MFXDEFS_H
-#  include <mfx/mfxstructures.h>
-#  include <mfx/mfxjpeg.h>
-#else
-#  include "mfxstructures.h"
-#  include "mfxjpeg.h"
-#endif
+#include <mfxstructures.h>
+#include <mfxjpeg.h>
 
 #include "gstmsdkmjpegdec.h"
 
diff --git a/sys/msdk/gstmsdkvp8dec.c b/sys/msdk/gstmsdkvp8dec.c
index 893ba6275..92f05af5b 100644
--- a/sys/msdk/gstmsdkvp8dec.c
+++ b/sys/msdk/gstmsdkvp8dec.c
@@ -34,13 +34,8 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_MFX_MFXDEFS_H
-#  include <mfx/mfxplugin.h>
-#  include <mfx/mfxvp8.h>
-#else
-#  include "mfxplugin.h"
-#  include "mfxvp8.h"
-#endif
+#include <mfxplugin.h>
+#include <mfxvp8.h>
 
 #include "gstmsdkvp8dec.h"
 
diff --git a/sys/msdk/gstmsdkvp8enc.c b/sys/msdk/gstmsdkvp8enc.c
index bc51ab59e..6e6551abe 100644
--- a/sys/msdk/gstmsdkvp8enc.c
+++ b/sys/msdk/gstmsdkvp8enc.c
@@ -33,13 +33,8 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_MFX_MFXDEFS_H
-#  include <mfx/mfxplugin.h>
-#  include <mfx/mfxvp8.h>
-#else
-#  include "mfxplugin.h"
-#  include "mfxvp8.h"
-#endif
+#include <mfxplugin.h>
+#include <mfxvp8.h>
 
 #include "gstmsdkvp8enc.h"
 
diff --git a/sys/msdk/gstmsdkvp9dec.c b/sys/msdk/gstmsdkvp9dec.c
index 07df89323..61a6a05df 100644
--- a/sys/msdk/gstmsdkvp9dec.c
+++ b/sys/msdk/gstmsdkvp9dec.c
@@ -35,13 +35,8 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_MFX_MFXVP9_H
-#  include <mfx/mfxplugin.h>
-#  include <mfx/mfxvp9.h>
-#else
-#  include "mfxplugin.h"
-#  include "mfxvp9.h"
-#endif
+#include <mfxplugin.h>
+#include <mfxvp9.h>
 
 #include "gstmsdkvp9dec.h"
 
diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build
index b9f9425c3..363c15574 100644
--- a/sys/msdk/meson.build
+++ b/sys/msdk/meson.build
@@ -61,7 +61,7 @@ endif
 
 # Old versions of MediaSDK don't have the 'mfx' directory prefix
 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
 
 if host_machine.system() == 'windows'
diff --git a/sys/msdk/msdk.h b/sys/msdk/msdk.h
index a2775a65b..12b5d5adf 100644
--- a/sys/msdk/msdk.h
+++ b/sys/msdk/msdk.h
@@ -41,11 +41,7 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 
-#ifdef HAVE_MFX_MFXDEFS_H
-#  include <mfx/mfxvideo.h>
-#else
-#  include "mfxvideo.h"
-#endif
+#include <mfxvideo.h>
 
 G_BEGIN_DECLS
 
diff --git a/sys/msdk/msdk_libva.h b/sys/msdk/msdk_libva.h
index 691ea25a0..4155ebbdb 100644
--- a/sys/msdk/msdk_libva.h
+++ b/sys/msdk/msdk_libva.h
@@ -40,11 +40,7 @@
 #include <gst/gst.h>
 #include <va/va.h>
 
-#ifdef HAVE_MFX_MFXDEFS_H
-#  include <mfx/mfxvideo.h>
-#else
-#  include "mfxvideo.h"
-#endif
+#include <mfxvideo.h>
 
 G_BEGIN_DECLS