summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodeo <[email protected]>2013-09-25 00:21:21 +0000
committerRodeo <[email protected]>2013-09-25 00:21:21 +0000
commit5060ac05b42561f5689e0aa543331f1308fa3597 (patch)
treebefe551f5866e924dfcf18351846b8a33fcb5631
parentd9897313ea70197e7c5fd8c247436839d013e087 (diff)
QSV: move LookAheadDepth miminum to commmon code.
Unlike the maximum limit, which is HandBrake-specific, this is not our bug, and we can't fix it, short of dropping support for all old Haswell drivers. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5813 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--libhb/enc_qsv.c3
-rw-r--r--libhb/qsv_common.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/libhb/enc_qsv.c b/libhb/enc_qsv.c
index b04be1590..82ea553c6 100644
--- a/libhb/enc_qsv.c
+++ b/libhb/enc_qsv.c
@@ -681,9 +681,6 @@ int encqsvInit(hb_work_object_t *w, hb_job_t *job)
}
pv->param.videoParam->mfx.GopPicSize = pv->param.gop.gop_pic_size;
- // LookAheadDepth 10 will cause a hang with some driver versions
- pv->param.codingOption2.LookAheadDepth = FFMAX(pv->param.codingOption2.LookAheadDepth, 11);
-
// sanitize some settings that affect memory consumption
if (!pv->is_sys_mem)
{
diff --git a/libhb/qsv_common.c b/libhb/qsv_common.c
index eade262d9..d191fadf1 100644
--- a/libhb/qsv_common.c
+++ b/libhb/qsv_common.c
@@ -645,7 +645,8 @@ int hb_qsv_param_parse(hb_qsv_param_t *param,
{
if (!error)
{
- param->codingOption2.LookAheadDepth = HB_QSV_CLIP3(10, 100,
+ // LookAheadDepth 10 will cause a hang with some driver versions
+ param->codingOption2.LookAheadDepth = HB_QSV_CLIP3(11, 100,
ivalue);
}
}