| Message ID | 20200916064457.181230-2-haihao.xiang@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | qsv: Fix compiler errors when using libmfx 2.0 (oneVPL) | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
On 16/09/2020 07:44, Haihao Xiang wrote: > ${includedir}/mfx has been added to Cflags in libmfx.pc for the current > libmfx. We may add ${includedir}/mfx to the search path for olda > versions of libmfx so that we may include foo.h instead of mfx/foo.h > > After applying this change, we won't need to change #include to include > the right header files when the mfx header files are installed to a new > directory for a new version of libmfx. E.g. for libmfx 2.0 (oneVPL, > https://github.com/oneapi-src/oneVPL), the header files will be > installed in vpl directory > > If your libmfx comes without pkg-config support, this patch requires a > small change to your environment setting (e.g. adding > /opt/intel/mediasdk/include/mfx instead of /opt/intel/mediasdk/include > to CFLAGS) so that the build can find the headers > --- > configure | 15 ++++++++++++--- > fftools/ffmpeg_qsv.c | 2 +- > libavcodec/qsv.c | 8 ++++---- > libavcodec/qsv.h | 2 +- > libavcodec/qsv_internal.h | 2 +- > libavcodec/qsvdec.c | 2 +- > libavcodec/qsvdec.h | 2 +- > libavcodec/qsvdec_h2645.c | 2 +- > libavcodec/qsvdec_other.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 +- > 22 files changed, 36 insertions(+), 27 deletions(-) > > diff --git a/configure b/configure > index 5d68695192..767bc4ca69 100755 > --- a/configure > +++ b/configure > @@ -1458,6 +1458,14 @@ check_pkg_config(){ > eval add_cflags \$${name}_cflags > } > > +append_subdir_to_pkg_includedir(){ > + log append_subdir_to_pkg_includedir "$@" > + name="$1" > + subdir="$2" > + incdir=$($pkg_config --variable=includedir $name) > + add_cflags -I$incdir/$subdir > +} Adding this hack as a separate function makes it look like other people would not be insane to use it, which is probably bad. > + > test_exec(){ > test_ld "cc" "$@" && { enabled cross_compile || $TMPE >> $logfile 2>&1; } > } > @@ -6355,10 +6363,11 @@ 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 "mfx/mfxvideo.h" MFXInit || > - { require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } > +enabled libmfx && { check_pkg_config libmfx libmfx "mfxvideo.h" MFXInit || > + { check_pkg_config libmfx libmfx "mfx/mfxvideo.h" MFXInit && append_subdir_to_pkg_includedir libmfx mfx; } || > + { require libmfx "mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } Checks for different ways of installing the same thing are very frowned upon. Who actually breaks if you convert completely to the new style? (Also consider the comment immediately above. Is that still true?) > if enabled libmfx; then > - check_cc MFX_CODEC_VP9 "mfx/mfxvp9.h mfx/mfxstructures.h" "MFX_CODEC_VP9" > + check_cc MFX_CODEC_VP9 "mfxvp9.h mfxstructures.h" "MFX_CODEC_VP9" > fi > - Mark
On Tue, 2020-09-29 at 16:21 +0100, Mark Thompson wrote: > On 16/09/2020 07:44, Haihao Xiang wrote: > > ${includedir}/mfx has been added to Cflags in libmfx.pc for the current > > libmfx. We may add ${includedir}/mfx to the search path for olda > > versions of libmfx so that we may include foo.h instead of mfx/foo.h > > > > After applying this change, we won't need to change #include to include > > the right header files when the mfx header files are installed to a new > > directory for a new version of libmfx. E.g. for libmfx 2.0 (oneVPL, > > https://github.com/oneapi-src/oneVPL), the header files will be > > installed in vpl directory > > > > If your libmfx comes without pkg-config support, this patch requires a > > small change to your environment setting (e.g. adding > > /opt/intel/mediasdk/include/mfx instead of /opt/intel/mediasdk/include > > to CFLAGS) so that the build can find the headers > > --- > > configure | 15 ++++++++++++--- > > fftools/ffmpeg_qsv.c | 2 +- > > libavcodec/qsv.c | 8 ++++---- > > libavcodec/qsv.h | 2 +- > > libavcodec/qsv_internal.h | 2 +- > > libavcodec/qsvdec.c | 2 +- > > libavcodec/qsvdec.h | 2 +- > > libavcodec/qsvdec_h2645.c | 2 +- > > libavcodec/qsvdec_other.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 +- > > 22 files changed, 36 insertions(+), 27 deletions(-) > > > > diff --git a/configure b/configure > > index 5d68695192..767bc4ca69 100755 > > --- a/configure > > +++ b/configure > > @@ -1458,6 +1458,14 @@ check_pkg_config(){ > > eval add_cflags \$${name}_cflags > > } > > > > +append_subdir_to_pkg_includedir(){ > > + log append_subdir_to_pkg_includedir "$@" > > + name="$1" > > + subdir="$2" > > + incdir=$($pkg_config --variable=includedir $name) > > + add_cflags -I$incdir/$subdir > > +} > > Adding this hack as a separate function makes it look like other people would > not be insane to use it, which is probably bad. I was thinking that this function might be used in future if someone want to append a subdir to includedir. > > > + > > test_exec(){ > > test_ld "cc" "$@" && { enabled cross_compile || $TMPE >> $logfile > > 2>&1; } > > } > > @@ -6355,10 +6363,11 @@ 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 > > "mfx/mfxvideo.h" MFXInit || > > - { require libmfx "mfx/mfxvideo.h" MFXInit "- > > llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } > > +enabled libmfx && { check_pkg_config libmfx libmfx "mfxvideo.h" > > MFXInit || > > + { check_pkg_config libmfx libmfx > > "mfx/mfxvideo.h" MFXInit && append_subdir_to_pkg_includedir libmfx mfx; } || > > + { require libmfx "mfxvideo.h" MFXInit "- > > llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } > > Checks for different ways of installing the same thing are very frowned > upon. Who actually breaks if you convert completely to the new style? > > (Also consider the comment immediately above. Is that still true?) If I remembered correctly, some old versions of MSDK have the following settings in libmfx.pc: includedir=/usr/include Cflags: -I${includedir} But the header files are installed under /usr/include/mfx. The old style works because 'mfx/foo.h' is included in source files, but for the new style, it doesn't work if we don't add -I/usr/include/mfx to Cflags. Thanks Haihao > > > if enabled libmfx; then > > - check_cc MFX_CODEC_VP9 "mfx/mfxvp9.h mfx/mfxstructures.h" > > "MFX_CODEC_VP9" > > + check_cc MFX_CODEC_VP9 "mfxvp9.h mfxstructures.h" "MFX_CODEC_VP9" > > fi > > > > - Mark > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/configure b/configure index 5d68695192..767bc4ca69 100755 --- a/configure +++ b/configure @@ -1458,6 +1458,14 @@ check_pkg_config(){ eval add_cflags \$${name}_cflags } +append_subdir_to_pkg_includedir(){ + log append_subdir_to_pkg_includedir "$@" + name="$1" + subdir="$2" + incdir=$($pkg_config --variable=includedir $name) + add_cflags -I$incdir/$subdir +} + test_exec(){ test_ld "cc" "$@" && { enabled cross_compile || $TMPE >> $logfile 2>&1; } } @@ -6355,10 +6363,11 @@ 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 "mfx/mfxvideo.h" MFXInit || - { require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } +enabled libmfx && { check_pkg_config libmfx libmfx "mfxvideo.h" MFXInit || + { check_pkg_config libmfx libmfx "mfx/mfxvideo.h" MFXInit && append_subdir_to_pkg_includedir libmfx mfx; } || + { require libmfx "mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } if enabled libmfx; then - check_cc MFX_CODEC_VP9 "mfx/mfxvp9.h mfx/mfxstructures.h" "MFX_CODEC_VP9" + check_cc MFX_CODEC_VP9 "mfxvp9.h mfxstructures.h" "MFX_CODEC_VP9" fi enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load diff --git a/fftools/ffmpeg_qsv.c b/fftools/ffmpeg_qsv.c index 960c88b69d..0df0b5832c 100644 --- a/fftools/ffmpeg_qsv.c +++ b/fftools/ffmpeg_qsv.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <mfx/mfxvideo.h> +#include <mfxvideo.h> #include <stdlib.h> #include "libavutil/dict.h" diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 17720070f1..55184e075a 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> @@ -37,7 +37,7 @@ #include "qsv_internal.h" #if QSV_VERSION_ATLEAST(1, 12) -#include "mfx/mfxvp8.h" +#include "mfxvp8.h" #endif 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 6b2fbbe252..4609e7a53b 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 fc25dc73e5..9e319ae709 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -24,7 +24,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/qsvdec.h b/libavcodec/qsvdec.h index cb948f516d..435e8eae3e 100644 --- a/libavcodec/qsvdec.h +++ b/libavcodec/qsvdec.h @@ -26,7 +26,7 @@ #include <stdint.h> #include <sys/types.h> -#include <mfx/mfxvideo.h> +#include <mfxvideo.h> #include "libavutil/fifo.h" #include "libavutil/frame.h" diff --git a/libavcodec/qsvdec_h2645.c b/libavcodec/qsvdec_h2645.c index 02c41883b6..ad0fcae3e5 100644 --- a/libavcodec/qsvdec_h2645.c +++ b/libavcodec/qsvdec_h2645.c @@ -25,7 +25,7 @@ #include <stdint.h> #include <string.h> -#include <mfx/mfxvideo.h> +#include <mfxvideo.h> #include "libavutil/common.h" #include "libavutil/fifo.h" diff --git a/libavcodec/qsvdec_other.c b/libavcodec/qsvdec_other.c index b4df76739c..4c0abeb9f3 100644 --- a/libavcodec/qsvdec_other.c +++ b/libavcodec/qsvdec_other.c @@ -24,7 +24,7 @@ #include <stdint.h> #include <string.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 1ed8f5d973..3c66eed554 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -23,7 +23,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 4f579d1db1..77f886981c 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 ddafc45ec3..25b87a0506 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 347f30655e..a15b06bebb 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 f76af9486b..163608a725 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 0e34bb75dc..dd7b867ed6 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 ce44c09397..159f5cb983 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 c2bcce7548..cd3655b7a3 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" diff --git a/libavfilter/vf_deinterlace_qsv.c b/libavfilter/vf_deinterlace_qsv.c index 80217c8419..99257be433 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 5064dcbb60..b79ef75b0f 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 cd8638abbb..029be4034a 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 35a944f8f8..e36299896c 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -19,7 +19,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
${includedir}/mfx has been added to Cflags in libmfx.pc for the current libmfx. We may add ${includedir}/mfx to the search path for olda versions of libmfx so that we may include foo.h instead of mfx/foo.h After applying this change, we won't need to change #include to include the right header files when the mfx header files are installed to a new directory for a new version of libmfx. E.g. for libmfx 2.0 (oneVPL, https://github.com/oneapi-src/oneVPL), the header files will be installed in vpl directory If your libmfx comes without pkg-config support, this patch requires a small change to your environment setting (e.g. adding /opt/intel/mediasdk/include/mfx instead of /opt/intel/mediasdk/include to CFLAGS) so that the build can find the headers --- configure | 15 ++++++++++++--- fftools/ffmpeg_qsv.c | 2 +- libavcodec/qsv.c | 8 ++++---- libavcodec/qsv.h | 2 +- libavcodec/qsv_internal.h | 2 +- libavcodec/qsvdec.c | 2 +- libavcodec/qsvdec.h | 2 +- libavcodec/qsvdec_h2645.c | 2 +- libavcodec/qsvdec_other.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 +- 22 files changed, 36 insertions(+), 27 deletions(-)