mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

msdk: allow building against open sourced msdk

Browse source 
Building against mfx_dispatcher is used to search for
headers in PREFIX/include/mfx/ only (commit: 62f04e801b),
but it is just PREFIX/include with open source msdk version.

https://bugzilla.gnome.org/show_bug.cgi?id=796118
This commit is contained in:
Sreerenj Balachandran 2018-05-15 16:31:02 -08:00
parent 9956f22537
commit dec0953517
9 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -1088,6 +1088,14 @@ AG_GST_CHECK_FEATURE(MSDK, [Intel MediaSDK], msdk, [
[ [
AC_DEFINE(HAVE_LIBMFX, 1, [Define if mfx_dispatcher is available]) AC_DEFINE(HAVE_LIBMFX, 1, [Define if mfx_dispatcher is available])
HAVE_MSDK="yes" HAVE_MSDK="yes"
dnl external msdk dispatchers sometimes install headers into prefix/mfx/
save_CPPFLAGS="$CPPFLAGS"
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])
fi
CPPFLAGS="$save_CPPFLAGS"
], [ ], [
AC_ARG_WITH([msdk-prefix], AC_ARG_WITH([msdk-prefix],
AS_HELP_STRING([--with-msdk-prefix], AS_HELP_STRING([--with-msdk-prefix],

2
sys/msdk/gstmsdkh265dec.c
View file

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

2
sys/msdk/gstmsdkh265enc.c
View file

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

2
sys/msdk/gstmsdkmjpegdec.c
View file

@ -33,7 +33,7 @@
# include <config.h> # include <config.h>
#endif #endif
#ifdef HAVE_LIBMFX #ifdef HAVE_MFX_MFXDEFS_H
# include <mfx/mfxstructures.h> # include <mfx/mfxstructures.h>
# include <mfx/mfxjpeg.h> # include <mfx/mfxjpeg.h>
#else #else

2
sys/msdk/gstmsdkmjpegenc.c
View file

@ -33,7 +33,7 @@
# include <config.h> # include <config.h>
#endif #endif
#ifdef HAVE_LIBMFX #ifdef HAVE_MFX_MFXDEFS_H
# include <mfx/mfxstructures.h> # include <mfx/mfxstructures.h>
# include <mfx/mfxjpeg.h> # include <mfx/mfxjpeg.h>
#else #else

2
sys/msdk/gstmsdkvp8dec.c
View file

@ -34,7 +34,7 @@
# include <config.h> # include <config.h>
#endif #endif
#ifdef HAVE_LIBMFX #ifdef HAVE_MFX_MFXDEFS_H
# include <mfx/mfxplugin.h> # include <mfx/mfxplugin.h>
# include <mfx/mfxvp8.h> # include <mfx/mfxvp8.h>
#else #else

2
sys/msdk/gstmsdkvp8enc.c
View file

@ -33,7 +33,7 @@
# include <config.h> # include <config.h>
#endif #endif
#ifdef HAVE_LIBMFX #ifdef HAVE_MFX_MFXDEFS_H
# include <mfx/mfxplugin.h> # include <mfx/mfxplugin.h>
# include <mfx/mfxvp8.h> # include <mfx/mfxvp8.h>
#else #else

2
sys/msdk/msdk.h
View file

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

2
sys/msdk/msdk_libva.h
View file

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