summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodeo <[email protected]>2014-04-07 23:33:06 +0000
committerRodeo <[email protected]>2014-04-07 23:33:06 +0000
commitf838015dd636281979e2e4335f7fb0ad91d3013b (patch)
tree1b2dc31b84915f2cba21ddf55558ee744dfca5ba
parent2e6f73542dcc281dc19b2f1347cfe7992e12ed13 (diff)
QSV: fix logging of whether B-frames are enabled.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6157 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--libhb/enc_qsv.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libhb/enc_qsv.c b/libhb/enc_qsv.c
index bc9bb4305..42f398188 100644
--- a/libhb/enc_qsv.c
+++ b/libhb/enc_qsv.c
@@ -1001,7 +1001,8 @@ int encqsvInit(hb_work_object_t *w, hb_job_t *job)
}
/* check whether B-frames are used */
- if (videoParam.mfx.GopRefDist > 1 && videoParam.mfx.GopPicSize > 2)
+ int bframes = videoParam.mfx.GopRefDist > 1 && videoParam.mfx.GopPicSize > 2;
+ if (bframes)
{
/* the muxer needs to know to the init_delay */
switch (pv->qsv_info->codec_id)
@@ -1030,16 +1031,16 @@ int encqsvInit(hb_work_object_t *w, hb_job_t *job)
if (pv->qsv_info->capabilities & HB_QSV_CAP_B_REF_PYRAMID)
{
hb_log("encqsvInit: BFrames %s BPyramid %s",
- pv->bfrm_delay ? "on" : "off",
- pv->bfrm_delay && pv->param.gop.b_pyramid ? "on" : "off");
+ bframes ? "on" : "off",
+ bframes && pv->param.gop.b_pyramid ? "on" : "off");
}
else
{
- hb_log("encqsvInit: BFrames %s", pv->bfrm_delay ? "on" : "off");
+ hb_log("encqsvInit: BFrames %s", bframes ? "on" : "off");
}
if (pv->qsv_info->capabilities & HB_QSV_CAP_OPTION2_IB_ADAPT)
{
- if (pv->bfrm_delay > 0)
+ if (bframes)
{
hb_log("encqsvInit: AdaptiveI %s AdaptiveB %s",
hb_qsv_codingoption_get_name(option2->AdaptiveI),
@@ -1515,8 +1516,7 @@ static void qsv_bitstream_slurp(hb_work_private_t *pv, mfxBitstream *bs)
(bs->FrameType & MFX_FRAMETYPE_B) &&
(bs->FrameType & MFX_FRAMETYPE_REF))
{
- hb_log("encqsv: BPyramid off not respected (delay: %d)",
- pv->bfrm_delay);
+ hb_log("encqsv: BPyramid off not respected (delay: %d)", pv->bfrm_delay);
/* don't pollute the log unnecessarily */
pv->param.gop.b_pyramid = 1;