summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodeo <[email protected]>2015-06-27 22:13:35 +0000
committerRodeo <[email protected]>2015-06-27 22:13:35 +0000
commitc56ae5803602026f2be8b2c2fb205362b2a7672a (patch)
treefb3151b9df4ff71526af6e5322f826cdf862cdd5
parentbd62cb066f87fa45a9d9c6c88a43d85c8cfe5f7b (diff)
QSV: check for Skylake hardware-accelerated HEVC encoder.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7328 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--libhb/qsv_common.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/libhb/qsv_common.c b/libhb/qsv_common.c
index a34eb67d8..8d2edce1f 100644
--- a/libhb/qsv_common.c
+++ b/libhb/qsv_common.c
@@ -798,7 +798,16 @@ hb_list_t* hb_qsv_load_plugins(hb_qsv_info_t *info, mfxSession session, mfxVersi
{
if (info->codec_id == MFX_CODEC_HEVC)
{
- if (HB_CHECK_MFX_VERSION(version, 1, 15))
+ if (HB_CHECK_MFX_VERSION(version, 1, 15) &&
+ qsv_implementation_is_hardware(info->implementation))
+ {
+ if (MFXVideoUSER_Load(session, &MFX_PLUGINID_HEVCE_HW, 0) < MFX_ERR_NONE)
+ {
+ goto fail;
+ }
+ hb_list_add(mfxPluginList, (void*)&MFX_PLUGINID_HEVCE_HW);
+ }
+ else if (HB_CHECK_MFX_VERSION(version, 1, 15))
{
if (MFXVideoUSER_Load(session, &MFX_PLUGINID_HEVCE_SW, 0) < MFX_ERR_NONE)
{