Browse Source

mfx: switch from retired mfx to vpl

Media Framework SDK is retired in favor of Video Processing Library for intel hardware encoding.

Changing the included header and pkgconfig is enough.

Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
pull/175/head
Nicolas Chauvet 3 years ago
committed by Steve Lhomme
parent
commit
779170a4fa
  1. 4
      configure.ac
  2. 4
      meson_options.txt
  3. 4
      modules/codec/Makefile.am
  4. 2
      modules/codec/meson.build
  5. 2
      modules/codec/qsv.c

4
configure.ac

@ -3124,9 +3124,9 @@ fi
dnl
dnl Intel QuickSync (aka MediaSDK) H264/H262 encoder
dnl Intel Video Processing Library
dnl
PKG_ENABLE_MODULES_VLC([MFX], [qsv], [libmfx], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto])
PKG_ENABLE_MODULES_VLC([VPL], [qsv], [vpl], [Intel Video Processing Library encoder], [auto])
dnl

4
meson_options.txt

@ -339,10 +339,10 @@ option('twolame',
value : 'auto',
description : 'Enable/disable twolame support')
option('mfx',
option('vpl',
type : 'feature',
value : 'auto',
description : 'Enable/disable libmfx support')
description : 'Enable/disable libvpl support')
option('spatialaudio',
type : 'feature',

4
modules/codec/Makefile.am

@ -617,9 +617,9 @@ codec_LTLIBRARIES += $(LTLIBdav1d)
### Hardware encoders ###
libqsv_plugin_la_SOURCES = codec/qsv.c demux/mpeg/timestamps.h
libqsv_plugin_la_CFLAGS = $(AM_CFLAGS) $(MFX_CFLAGS)
libqsv_plugin_la_CFLAGS = $(AM_CFLAGS) $(VPL_CFLAGS)
libqsv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
libqsv_plugin_la_LIBADD = $(MFX_LIBS)
libqsv_plugin_la_LIBADD = $(VPL_LIBS)
EXTRA_LTLIBRARIES += libqsv_plugin.la
codec_LTLIBRARIES += $(LTLIBqsv)

2
modules/codec/meson.build

@ -886,7 +886,7 @@ vlc_modules += {
## Hardware encoders
# QSV encoder
qsv_dep = dependency('libmfx', required: get_option('mfx'))
qsv_dep = dependency('vpl', required: get_option('vpl'))
vlc_modules += {
'name' : 'qsv',
'sources' : files('qsv.c'),

2
modules/codec/qsv.c

@ -36,7 +36,7 @@
#include <vlc_list.h>
#include <mfx/mfxvideo.h>
#include <vpl/mfxvideo.h>
#include "../demux/mpeg/timestamps.h"
#define SOUT_CFG_PREFIX "sout-qsv-"

Loading…
Cancel
Save