[x265] [PATCH] cli : Removed 'b'prefix in enable RD optimized quantization variable, modified bRDLevel to RDLevel

[Gopu Govindaswamy]

# HG changeset patch
# User Gopu Govindaswamy <gopu at multicorewareinc.com>
# Date 1382002354 -19800
# Node ID 2bc397397a14f90edd44e7bad401acb4dd4851fd
# Parent  844c9486a2296510641790c1dd492fc22190d8f5
cli : Removed 'b'prefix in enable RD optimized quantization variable, modified bRDLevel to RDLevel

diff -r 844c9486a229 -r 2bc397397a14 source/common/common.cpp
--- a/source/common/common.cpp	Thu Oct 17 14:52:17 2013 +0530
+++ b/source/common/common.cpp	Thu Oct 17 15:02:34 2013 +0530
@@ -138,7 +138,7 @@
     param->maxNumMergeCand = 5u;
     param->bEnableAMP = 1;
     param->bEnableRectInter = 1;
-    param->bRDLevel = X265_FULL_RDO;
+    param->RDLevel = X265_FULL_RDO;
     param->bEnableRDO = 1;
     param->bEnableRDOQ = 1;
     param->bEnableRDOQTS = 1;
@@ -280,8 +280,8 @@
           "Picture height must be an integer multiple of the specified chroma subsampling");
     CHECK(param->rc.rateControlMode<X265_RC_ABR || param->rc.rateControlMode> X265_RC_CRF,
           "Rate control mode is out of range");
-    CHECK(param->bRDLevel < X265_NO_RDO_NO_RDOQ ||
-          param->bRDLevel > X265_FULL_RDO,
+    CHECK(param->RDLevel < X265_NO_RDO_NO_RDOQ ||
+          param->RDLevel > X265_FULL_RDO,
           "RD Level is out of range");
     CHECK(param->bframes > param->lookaheadDepth,
           "Lookahead depth must be greater than the max consecutive bframe count");
@@ -395,7 +395,7 @@
     TOOLOPT(param->bEnableCbfFastMode, "cfm");
     TOOLOPT(param->bEnableConstrainedIntra, "cip");
     TOOLOPT(param->bEnableEarlySkip, "esd");
-    fprintf(stderr, "rd=%d ", param->bRDLevel);
+    fprintf(stderr, "rd=%d ", param->RDLevel);
 
     TOOLOPT(param->bEnableLoopFilter, "lft");
     if (param->bEnableSAO)
@@ -519,7 +519,7 @@
     OPT("crqpoffs")
         p->crQpOffset = atoi(value);
     OPT("rd")
-        p->bRDLevel = atoi(value);
+        p->RDLevel = atoi(value);
     OPT("signhide")
         p->bEnableSignHiding = bvalue;
     OPT("lft")
@@ -586,7 +586,7 @@
     s += sprintf(s, " qp=%d", p->rc.qp);
     s += sprintf(s, " cbqpoffs=%d", p->cbQpOffset);
     s += sprintf(s, " crqpoffs=%d", p->crQpOffset);
-    s += sprintf(s, " rd=%d", p->bRDLevel);
+    s += sprintf(s, " rd=%d", p->RDLevel);
     BOOL(p->bEnableSignHiding, "signhide");
     BOOL(p->bEnableLoopFilter, "lft");
     BOOL(p->bEnableSAO, "sao");
diff -r 844c9486a229 -r 2bc397397a14 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp	Thu Oct 17 14:52:17 2013 +0530
+++ b/source/encoder/encoder.cpp	Thu Oct 17 15:02:34 2013 +0530
@@ -925,7 +925,7 @@
     }
 
     /* Set flags according to RDLevel specified - check_params has verified that RDLevel is within range */
-    switch (_param->bRDLevel)
+    switch (_param->RDLevel)
     {
     case X265_NO_RDO_NO_RDOQ:
         _param->bEnableRDO = _param->bEnableRDOQ = 0;
diff -r 844c9486a229 -r 2bc397397a14 source/x265.cpp
--- a/source/x265.cpp	Thu Oct 17 14:52:17 2013 +0530
+++ b/source/x265.cpp	Thu Oct 17 15:02:34 2013 +0530
@@ -399,7 +399,7 @@
     H0("-q/--qp                          Base QP for CQP mode. Default %d\n", param->rc.qp);
     H0("   --cbqpoffs                    Chroma Cb QP Offset. Default %d\n", param->cbQpOffset);
     H0("   --crqpoffs                    Chroma Cr QP Offset. Default %d\n", param->crQpOffset);
-    H0("   --rd                          Level of RD in mode decision 0:least....2:full RDO. Default %d\n", param->bRDLevel);
+    H0("   --rd                          Level of RD in mode decision 0:least....2:full RDO. Default %d\n", param->RDLevel);
     H0("   --[no-]signhide               Hide sign bit of one coeff per TU (rdo). Default %s\n", OPT(param->bEnableSignHiding));
     H0("\nLoop filter:\n");
     H0("   --[no-]lft                    Enable Loop Filter. Default %s\n", OPT(param->bEnableLoopFilter));
diff -r 844c9486a229 -r 2bc397397a14 source/x265.h
--- a/source/x265.h	Thu Oct 17 14:52:17 2013 +0530
+++ b/source/x265.h	Thu Oct 17 15:02:34 2013 +0530
@@ -292,7 +292,7 @@
     int       bEnableRectInter;                ///< enable rectangular inter modes 2NxN, Nx2N
     int       bEnableCbfFastMode;              ///< enable use of Cbf flags for fast mode decision
     int       bEnableEarlySkip;                ///< enable early skip (merge) detection
-    int       bRDLevel;                     ///< enable RD optimized quantization
+    int       RDLevel;                     ///< enable RD optimized quantization
     int       bEnableRDO;
     int       bEnableRDOQ;
     int       bEnableSignHiding;               ///< enable hiding one sign bit per TU via implicit signaling