summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodeo <[email protected]>2015-06-27 21:57:28 +0000
committerRodeo <[email protected]>2015-06-27 21:57:28 +0000
commit41fb0a2658824e99b534dcde867c59413c0108b7 (patch)
treeaae6386cfcdfe2ec7bac21dbad534475e5f43b85
parent4571f84097a038415baa35ea358d750718438c39 (diff)
QSV: B-pyramid support is codec-specific.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7324 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--libhb/qsv_common.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/libhb/qsv_common.c b/libhb/qsv_common.c
index a54f20afc..8a808b80c 100644
--- a/libhb/qsv_common.c
+++ b/libhb/qsv_common.c
@@ -244,18 +244,21 @@ static int query_capabilities(mfxSession session, mfxVersion version, hb_qsv_inf
else
{
/* Implementation-specific features that can't be queried */
- if (qsv_implementation_is_hardware(info->implementation))
+ if (info->codec_id == MFX_CODEC_AVC || info->codec_id == MFX_CODEC_HEVC)
{
- if (qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G3)
+ if (qsv_implementation_is_hardware(info->implementation))
{
- info->capabilities |= HB_QSV_CAP_B_REF_PYRAMID;
+ if (qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G3)
+ {
+ info->capabilities |= HB_QSV_CAP_B_REF_PYRAMID;
+ }
}
- }
- else
- {
- if (HB_CHECK_MFX_VERSION(version, 1, 6))
+ else
{
- info->capabilities |= HB_QSV_CAP_B_REF_PYRAMID;
+ if (HB_CHECK_MFX_VERSION(version, 1, 6))
+ {
+ info->capabilities |= HB_QSV_CAP_B_REF_PYRAMID;
+ }
}
}