[x265-commits] [x265] rest: nits

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/e6862130b35b
branches:  
changeset: 6601:e6862130b35b
user:      Steve Borho <steve at borho.org>
date:      Wed Mar 26 00:08:43 2014 -0500
description:
rest: nits
Subject: [x265] fix chroma lambda weighting

details:   http://hg.videolan.org/x265/rev/d38335a9375a
branches:  
changeset: 6602:d38335a9375a
user:      Satoshi Nakagawa <nakagawa424 at oki.com>
date:      Mon Mar 24 23:42:38 2014 +0900
description:
fix chroma lambda weighting
Subject: [x265] rest: make life slightly more difficult for spambots

details:   http://hg.videolan.org/x265/rev/2d41a9d48e3b
branches:  
changeset: 6603:2d41a9d48e3b
user:      Steve Borho <steve at borho.org>
date:      Wed Mar 26 19:47:14 2014 -0500
description:
rest: make life slightly more difficult for spambots
Subject: [x265] rest: this sentence was perhaps redundant

details:   http://hg.videolan.org/x265/rev/7d37c06c80f4
branches:  
changeset: 6604:7d37c06c80f4
user:      Steve Borho <steve at borho.org>
date:      Wed Mar 26 19:48:18 2014 -0500
description:
rest: this sentence was perhaps redundant

diffstat:

 doc/reST/cli.rst                |  12 ++++++------
 doc/reST/introduction.rst       |   2 +-
 source/encoder/frameencoder.cpp |   9 ++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diffs (83 lines):

diff -r 2cda667fd786 -r 7d37c06c80f4 doc/reST/cli.rst
--- a/doc/reST/cli.rst	Tue Mar 25 22:46:36 2014 -0500
+++ b/doc/reST/cli.rst	Wed Mar 26 19:48:18 2014 -0500
@@ -293,15 +293,15 @@ Temporal / motion search options
 .. option:: --rect, --no-rect
 
 	Enable analysis of rectangular motion partitions Nx2N and 2NxN
-	(50/50 splits, two directions).  Default enabled
+	(50/50 splits, two directions). Default enabled
 
 .. option:: --amp, --no-amp
 
 	Enable analysis of asymmetric motion partitions (75/25 splits, four
 	directions). This setting has no effect if rectangular partitions
-	are disabled. Even there are four possible AMP partitions, only the
-	most likely candidate is tested, based on the results of the
-	rectangular mode tests. Default enabled
+	are disabled. Even though there are four possible AMP partitions,
+	only the most likely candidate is tested, based on the results of
+	the rectangular mode tests. Default enabled
 
 .. option:: --max-merge <1..5>
 
@@ -311,7 +311,7 @@ Temporal / motion search options
 	as a "skip".  Otherwise the merge candidates are tested as part of
 	motion estimation when searching for the least cost inter option.
 	The max candidate number is encoded in the SPS and determines the
-	bit cost of signaling merge CUs.  Default 2
+	bit cost of signaling merge CUs. Default 2
 
 .. option:: --early-skip, --no-early-skip
 
@@ -322,7 +322,7 @@ Temporal / motion search options
 	Short circuit analysis if a prediction is found that does not set
 	the coded block flag (aka: no residual was encoded).  It prevents
 	the encoder from perhaps finding other predictions that also have no
-	residual but perhaps require less signaling bits.  Default disabled
+	residual but require less signaling bits.  Default disabled
 
 .. option:: --ref <1..16>
 
diff -r 2cda667fd786 -r 7d37c06c80f4 doc/reST/introduction.rst
--- a/doc/reST/introduction.rst	Tue Mar 25 22:46:36 2014 -0500
+++ b/doc/reST/introduction.rst	Wed Mar 26 19:48:18 2014 -0500
@@ -43,7 +43,7 @@ The x265 software is available for free 
 from https://bitbucket.org/multicoreware/x265.  For commercial companies
 that wish to distribute x265 without being subject to the open source
 requirements of the GPL 2 license, commercial licenses are available
-with competitive terms.  Contact license at x265.com to inquire about
+with competitive terms.  Contact license @ x265.com to inquire about
 commercial license terms.  
 
 While x265 is primarily designed as a video encoder software library, a
diff -r 2cda667fd786 -r 7d37c06c80f4 source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp	Tue Mar 25 22:46:36 2014 -0500
+++ b/source/encoder/frameencoder.cpp	Wed Mar 26 19:48:18 2014 -0500
@@ -335,11 +335,10 @@ void FrameEncoder::setLambda(int qp, int
     // instead we weight the distortion of chroma.
     int chromaQPOffset = slice->getPPS()->getChromaCbQpOffset() + slice->getSliceQpDeltaCb();
     int qpc = Clip3(0, MAX_MAX_QP, qp + chromaQPOffset);
-    double cbWeight = pow(2.0, (qp - g_chromaScale[chFmt][qpc])); // takes into account of the chroma qp mapping and chroma qp Offset
-
+    double cbWeight = pow(2.0, (qp - g_chromaScale[chFmt][qpc]) / 3.0); // takes into account of the chroma qp mapping and chroma qp Offset
     chromaQPOffset = slice->getPPS()->getChromaCrQpOffset() + slice->getSliceQpDeltaCr();
     qpc = Clip3(0, MAX_MAX_QP, qp + chromaQPOffset);
-    double crWeight = pow(2.0, (qp - g_chromaScale[chFmt][qpc])); // takes into account of the chroma qp mapping and chroma qp Offset
+    double crWeight = pow(2.0, (qp - g_chromaScale[chFmt][qpc]) / 3.0); // takes into account of the chroma qp mapping and chroma qp Offset
     double chromaLambda = lambda / crWeight;
 
     m_rows[row].m_search.setQPLambda(qp, lambda, chromaLambda);
@@ -379,10 +378,10 @@ void FrameEncoder::compressFrame()
     int qpc;
     int chromaQPOffset = slice->getPPS()->getChromaCbQpOffset() + slice->getSliceQpDeltaCb();
     qpc = Clip3(0, MAX_MAX_QP, qp + chromaQPOffset);
-    double cbWeight = pow(2.0, (qp - g_chromaScale[chFmt][qpc])); // takes into account of the chroma qp mapping and chroma qp Offset
+    double cbWeight = pow(2.0, (qp - g_chromaScale[chFmt][qpc]) / 3.0); // takes into account of the chroma qp mapping and chroma qp Offset
     chromaQPOffset = slice->getPPS()->getChromaCrQpOffset() + slice->getSliceQpDeltaCr();
     qpc = Clip3(0, MAX_MAX_QP, qp + chromaQPOffset);
-    double crWeight = pow(2.0, (qp - g_chromaScale[chFmt][qpc])); // takes into account of the chroma qp mapping and chroma qp Offset
+    double crWeight = pow(2.0, (qp - g_chromaScale[chFmt][qpc]) / 3.0); // takes into account of the chroma qp mapping and chroma qp Offset
     double chromaLambda = lambda / crWeight;
 
     // NOTE: set SAO lambda every Frame