[x265-commits] [x265] rdcost: fix cut-paste bugs in chroma QP offset R-D calcul...

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/4c0648e4c3cc
branches:  
changeset: 10368:4c0648e4c3cc
user:      Steve Borho <steve at borho.org>
date:      Mon May 04 14:18:57 2015 -0500
description:
rdcost: fix cut-paste bugs in chroma QP offset R-D calculations
Subject: [x265] cli: improve help for --crqpoffs and --cbqpoffs

details:   http://hg.videolan.org/x265/rev/f32e6464225a
branches:  
changeset: 10369:f32e6464225a
user:      Steve Borho <steve at borho.org>
date:      Mon May 04 15:15:42 2015 -0500
description:
cli: improve help for --crqpoffs and --cbqpoffs

diffstat:

 source/encoder/rdcost.h |  4 ++--
 source/x265cli.h        |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 28d7e7582028 -r f32e6464225a source/encoder/rdcost.h
--- a/source/encoder/rdcost.h	Mon May 04 12:57:08 2015 -0500
+++ b/source/encoder/rdcost.h	Mon May 04 15:15:42 2015 -0500
@@ -71,9 +71,9 @@ public:
         m_chromaDistWeight[0] = lambdaOffset;
 
         if (slice.m_sps->chromaFormatIdc == X265_CSP_I420)
-            qpCr = x265_clip3(QP_MIN, QP_MAX_MAX, (int)g_chromaScale[qp + slice.m_pps->chromaQpOffset[0]]);
+            qpCr = x265_clip3(QP_MIN, QP_MAX_MAX, (int)g_chromaScale[qp + slice.m_pps->chromaQpOffset[1]]);
         else
-            qpCr = X265_MIN(qp + slice.m_pps->chromaQpOffset[0], QP_MAX_SPEC);
+            qpCr = X265_MIN(qp + slice.m_pps->chromaQpOffset[1], QP_MAX_SPEC);
         chroma_offset_idx = X265_MIN(qp - qpCr + 12, MAX_CHROMA_LAMBDA_OFFSET);
         lambdaOffset = m_psyRd ? x265_chroma_lambda2_offset_tab[chroma_offset_idx] : 256;
         m_chromaDistWeight[1] = lambdaOffset;
diff -r 28d7e7582028 -r f32e6464225a source/x265cli.h
--- a/source/x265cli.h	Mon May 04 12:57:08 2015 -0500
+++ b/source/x265cli.h	Mon May 04 15:15:42 2015 -0500
@@ -365,8 +365,8 @@ static void showHelp(x265_param *param)
     H1("   --pbratio <float>             QP factor between P and B. Default %.2f\n", param->rc.pbFactor);
     H1("   --qcomp <float>               Weight given to predicted complexity. Default %.2f\n", param->rc.qCompress);
     H1("   --qpstep <integer>            The maximum single adjustment in QP allowed to rate control. Default %d\n", param->rc.qpStep);
-    H1("   --cbqpoffs <integer>          Chroma Cb QP Offset. Default %d\n", param->cbQpOffset);
-    H1("   --crqpoffs <integer>          Chroma Cr QP Offset. Default %d\n", param->crQpOffset);
+    H1("   --cbqpoffs <integer>          Chroma Cb QP Offset [-12..12]. Default %d\n", param->cbQpOffset);
+    H1("   --crqpoffs <integer>          Chroma Cr QP Offset [-12..12]. Default %d\n", param->crQpOffset);
     H1("   --scaling-list <string>       Specify a file containing HM style quant scaling lists or 'default' or 'off'. Default: off\n");
     H1("   --lambda-file <string>        Specify a file containing replacement values for the lambda tables\n");
     H1("                                 MAX_MAX_QP+1 floats for lambda table, then again for lambda2 table\n");