Fix two bugs in QPRD

fprofile settings now actually fprofile QPRD.
Don't use i_mbrd before initializing it.

diff --git a/Makefile b/Makefile
index e065611893f0506fb9aefa326993503c45fb8f61..c3d03c739fdd340af8117efc66b255b1fbfbcebf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ OPT1 = --crf 16 -b2 -m3 -r3 --me hex --no-8x8dct --direct spatial --no-dct-decim
 OPT2 = --crf 26 -b4 -m5 -r2 --me hex --cqm jvt --nr 100 --psnr --no-mixed-refs --b-adapt 2
 OPT3 = --crf 18 -b3 -m9 -r5 --me umh -t1 -A all --b-pyramid --direct auto --no-fast-pskip
 OPT4 = --crf 22 -b3 -m7 -r4 --me esa -t2 -A all --psy-rd 1.0:1.0
-OPT5 = --frames 50 --crf 24 -b3 -m10 -r3 --me tesa -t1
+OPT5 = --frames 50 --crf 24 -b3 -m10 -r3 --me tesa -t2
 OPT6 = --frames 50 -q0 -m9 -r2 --me hex -Aall
 OPT7 = --frames 50 -q0 -m2 -r1 --me hex --no-cabac
 

diff --git a/encoder/analyse.c b/encoder/analyse.c
index e09d714f0f610625a18feef279233cc191cee4fc..c052fd8135f79b0d73b68847377c6a7a7fdfaa85 100644 (file)
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -2265,7 +2265,7 @@ void x264_macroblock_analyse( x264_t *h )
         x264_adaptive_quant( h );
         /* If the QP of this MB is within 1 of the previous MB, code the same QP as the previous MB,
          * to lower the bit cost of the qp_delta.  Don't do this if QPRD is enabled. */
-        if( analysis.i_mbrd < 3 && abs(h->mb.i_qp - h->mb.i_last_qp) == 1 )
+        if( h->param.analyse.i_subpel_refine < 10 && abs(h->mb.i_qp - h->mb.i_last_qp) == 1 )
             h->mb.i_qp = h->mb.i_last_qp;
     }