From: Haihao Xiang <haihao.xi...@intel.com>
The following Cflags has been added to libmfx.pc, so mfx/ prefix is no
longer needed when including mfx headers in FFmpeg.
Cflags: -I${includedir} -I${includedir}/mfx
Some old versions of libmfx have the following Cflags in libmfx.pc
Cflags: -I${includedir}
We may add -I${includedir}/mfx to CFLAGS when running 'configure
--enable-libmfx' for old versions of libmfx, if so, mfx headers without
mfx/ prefix can be included too.
If libmfx comes without pkg-config support, we may do a small change to
the settings of the environment(e.g. set -I/opt/intel/mediasdk/include/mfx
instead of -I/opt/intel/mediasdk/include to CFLAGS), then the build can
find the mfx headers without mfx/ prefix
After applying this change, we won't need to change #include for mfx
headers when mfx headers are installed under a new directory.
This is in preparation for oneVPL support (mfx headers in oneVPL are
installed under vpl directory)
---
configure | 19 ++++++++++++-------
libavcodec/qsv.c | 8 ++++----
libavcodec/qsv.h | 2 +-
libavcodec/qsv_internal.h | 2 +-
libavcodec/qsvdec.c | 2 +-
libavcodec/qsvenc.c | 2 +-
libavcodec/qsvenc.h | 2 +-
libavcodec/qsvenc_h264.c | 2 +-
libavcodec/qsvenc_hevc.c | 2 +-
libavcodec/qsvenc_jpeg.c | 2 +-
libavcodec/qsvenc_mpeg2.c | 2 +-
libavcodec/qsvenc_vp9.c | 2 +-
libavfilter/qsvvpp.h | 2 +-
libavfilter/vf_deinterlace_qsv.c | 2 +-
libavfilter/vf_scale_qsv.c | 2 +-
libavutil/hwcontext_opencl.c | 2 +-
libavutil/hwcontext_qsv.c | 2 +-
libavutil/hwcontext_qsv.h | 2 +-
18 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/configure b/configure
index 959526ec8f..7bf652a874 100755
--- a/configure
+++ b/configure
@@ -6573,15 +6573,20 @@ enabled liblensfun && require_pkg_config
liblensfun lensfun lensfun.h lf_
# Media SDK or Intel Media Server Studio, these don't come with
# pkg-config support. Instead, users should make sure that the build
# can find the libraries and headers through other means.
-enabled libmfx && { { check_pkg_config libmfx "libmfx >= 1.28
libmfx < 2.0" "mfx/mfxvideo.h" MFXInit ||
- { require libmfx "mfx/mfxvideo.h
mfx/mfxdefs.h" MFXInit "-llibmfx $advapi32_extralibs" &&
- { test_cpp_condition mfx/mfxdefs.h
"MFX_VERSION >= 1028 && MFX_VERSION < 2000" || die "ERROR: libmfx version must
be >= 1.28 and < 2.0"; } &&
- warn "using libmfx without pkg-config"; } }
&&
- warn "build FFmpeg against libmfx 1.x,
obsolete features of libmfx such as OPAQUE memory,\n"\
- "multi-frame encode, user plugins and
LA_EXT rate control mode are enabled"; }
+enabled libmfx && { { check_pkg_config libmfx "libmfx >= 1.28
libmfx < 2.0" "mfxvideo.h" MFXInit ||
+# Some old versions of libmfx have the following settings in libmfx.pc:
+# includedir=/usr/include
+# Cflags: -I${includedir}
+# So add -I${includedir}/mfx to CFLAGS
+ { check_pkg_config libmfx "libmfx >= 1.28
libmfx < 2.0" "mfx/mfxvideo.h" MFXInit && add_cflags -I${libmfx_incdir}/mfx; }
||
+ { require libmfx "mfxvideo.h mfxdefs.h"
MFXInit "-llibmfx $advapi32_extralibs" &&
+ { test_cpp_condition mfxdefs.h "MFX_VERSION
>= 1028 && MFX_VERSION < 2000" || die "ERROR: libmfx version must be >= 1.28
and < 2.0"; } &&
+ warn "using libmfx without pkg-config"; }
} &&
+ warn "build FFmpeg against libmfx 1.x, obsolete
features of libmfx such as OPAQUE memory,\n"\
+ "multi-frame encode, user plugins and
LA_EXT rate control mode are enabled"; }
if enabled libmfx; then
- check_cc MFX_CODEC_VP9 "mfx/mfxdefs.h mfx/mfxstructures.h" "MFX_CODEC_VP9"
+ check_cc MFX_CODEC_VP9 "mfxdefs.h mfxstructures.h" "MFX_CODEC_VP9"
fi
enabled libmodplug && require_pkg_config libmodplug libmodplug
libmodplug/modplug.h ModPlug_Load
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 385b43bb6c..25331ccce8 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <mfx/mfxvideo.h>
-#include <mfx/mfxplugin.h>
-#include <mfx/mfxjpeg.h>
+#include <mfxvideo.h>
+#include <mfxplugin.h>
+#include <mfxjpeg.h>
#include <stdio.h>
#include <string.h>
@@ -38,7 +38,7 @@
#define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
-#include "mfx/mfxvp8.h"
+#include "mfxvp8.h"
int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id)
{
diff --git a/libavcodec/qsv.h b/libavcodec/qsv.h
index b77158ec26..04ae0d6f34 100644
--- a/libavcodec/qsv.h
+++ b/libavcodec/qsv.h
@@ -21,7 +21,7 @@
#ifndef AVCODEC_QSV_H
#define AVCODEC_QSV_H
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
#include "libavutil/buffer.h"
diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
index 8131acdae9..cb1e55ae30 100644
--- a/libavcodec/qsv_internal.h
+++ b/libavcodec/qsv_internal.h
@@ -39,7 +39,7 @@
#include "libavutil/hwcontext_vaapi.h"
#endif
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
#include "libavutil/frame.h"
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index 5fc5bed4c8..b75559f083 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -27,7 +27,7 @@
#include <string.h>
#include <sys/types.h>
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
#include "libavutil/common.h"
#include "libavutil/fifo.h"
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 2382c2f5f7..0c699d3b04 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -25,7 +25,7 @@
#include <string.h>
#include <sys/types.h>
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
#include "libavutil/common.h"
#include "libavutil/hwcontext.h"
diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
index b754ac4b56..ad6ac70f72 100644
--- a/libavcodec/qsvenc.h
+++ b/libavcodec/qsvenc.h
@@ -26,7 +26,7 @@
#include <stdint.h>
#include <sys/types.h>
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
#include "libavutil/avutil.h"
#include "libavutil/fifo.h"
diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
index 87b09360cb..bc28589d10 100644
--- a/libavcodec/qsvenc_h264.c
+++ b/libavcodec/qsvenc_h264.c
@@ -24,7 +24,7 @@
#include <stdint.h>
#include <sys/types.h>
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
#include "libavutil/common.h"
#include "libavutil/opt.h"
diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c
index f6027f600b..6df4a1a136 100644
--- a/libavcodec/qsvenc_hevc.c
+++ b/libavcodec/qsvenc_hevc.c
@@ -22,7 +22,7 @@
#include <stdint.h>
#include <sys/types.h>
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
#include "libavutil/common.h"
#include "libavutil/opt.h"
diff --git a/libavcodec/qsvenc_jpeg.c b/libavcodec/qsvenc_jpeg.c
index 825eb8dc06..030b358d75 100644
--- a/libavcodec/qsvenc_jpeg.c
+++ b/libavcodec/qsvenc_jpeg.c
@@ -22,7 +22,7 @@
#include <stdint.h>
#include <sys/types.h>
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
#include "libavutil/common.h"
#include "libavutil/opt.h"
diff --git a/libavcodec/qsvenc_mpeg2.c b/libavcodec/qsvenc_mpeg2.c
index 5cb12a2582..c68bf64231 100644
--- a/libavcodec/qsvenc_mpeg2.c
+++ b/libavcodec/qsvenc_mpeg2.c
@@ -22,7 +22,7 @@
#include <stdint.h>
#include <sys/types.h>
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
#include "libavutil/common.h"
#include "libavutil/opt.h"
diff --git a/libavcodec/qsvenc_vp9.c b/libavcodec/qsvenc_vp9.c
index 4b2a6ce77f..9e96751828 100644
--- a/libavcodec/qsvenc_vp9.c
+++ b/libavcodec/qsvenc_vp9.c
@@ -22,7 +22,7 @@
#include <stdint.h>
#include <sys/types.h>
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
#include "libavutil/common.h"
#include "libavutil/opt.h"
diff --git a/libavfilter/qsvvpp.h b/libavfilter/qsvvpp.h
index 4fe07ab1f7..543c58a967 100644
--- a/libavfilter/qsvvpp.h
+++ b/libavfilter/qsvvpp.h
@@ -24,7 +24,7 @@
#ifndef AVFILTER_QSVVPP_H
#define AVFILTER_QSVVPP_H
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
#include "avfilter.h"
#include "libavutil/fifo.h"
diff --git a/libavfilter/vf_deinterlace_qsv.c b/libavfilter/vf_deinterlace_qsv.c
index fb54d179ed..b8ff3e8339 100644
--- a/libavfilter/vf_deinterlace_qsv.c
+++ b/libavfilter/vf_deinterlace_qsv.c
@@ -21,7 +21,7 @@
* deinterlace video filter - QSV
*/
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
#include <stdio.h>
#include <string.h>
diff --git a/libavfilter/vf_scale_qsv.c b/libavfilter/vf_scale_qsv.c
index da3c2eca86..af0e85bd03 100644
--- a/libavfilter/vf_scale_qsv.c
+++ b/libavfilter/vf_scale_qsv.c
@@ -21,7 +21,7 @@
* scale video filter - QSV
*/
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
#include <stdio.h>
#include <string.h>
diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c
index 32aec7d228..247834aaf6 100644
--- a/libavutil/hwcontext_opencl.c
+++ b/libavutil/hwcontext_opencl.c
@@ -47,7 +47,7 @@
#if HAVE_OPENCL_VAAPI_INTEL_MEDIA
#if CONFIG_LIBMFX
-#include <mfx/mfxstructures.h>
+#include <mfxstructures.h>
#endif
#include <va/va.h>
#include <CL/cl_va_api_media_sharing_intel.h>
diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
index 56dffa1f25..99735f5557 100644
--- a/libavutil/hwcontext_qsv.c
+++ b/libavutil/hwcontext_qsv.c
@@ -20,7 +20,7 @@
#include <stdint.h>
#include <string.h>
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
#include "config.h"
diff --git a/libavutil/hwcontext_qsv.h b/libavutil/hwcontext_qsv.h
index b98d611cfc..42e34d0dda 100644
--- a/libavutil/hwcontext_qsv.h
+++ b/libavutil/hwcontext_qsv.h
@@ -19,7 +19,7 @@
#ifndef AVUTIL_HWCONTEXT_QSV_H
#define AVUTIL_HWCONTEXT_QSV_H
-#include <mfx/mfxvideo.h>
+#include <mfxvideo.h>
/**
* @file
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
