[x265-commits] [x265] ratecontrol: change type of m_bframeBits to int64_t

[Deepthi Nandakumar]

details:   http://hg.videolan.org/x265/rev/495874699b0d
branches:  
changeset: 7016:495874699b0d
user:      Deepthi Nandakumar <deepthi at multicorewareinc.com>
date:      Thu Jun 05 11:41:43 2014 +0530
description:
ratecontrol: change type of m_bframeBits to int64_t
Subject: [x265] weightb: reinitialize weight table when weightb is off

details:   http://hg.videolan.org/x265/rev/9dddc48aecc7
branches:  
changeset: 7017:9dddc48aecc7
user:      Kavitha Sampath <kavitha at multicorewareinc.com>
date:      Thu Jun 05 13:05:33 2014 +0530
description:
weightb: reinitialize weight table when weightb is off

diffstat:

 source/encoder/frameencoder.cpp |  4 ++++
 source/encoder/ratecontrol.h    |  2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r c11920cb6f04 -r 9dddc48aecc7 source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp	Wed Jun 04 23:14:37 2014 -0500
+++ b/source/encoder/frameencoder.cpp	Thu Jun 05 13:05:33 2014 +0530
@@ -498,6 +498,10 @@ void FrameEncoder::compressFrame()
         X265_CHECK(slice->getPPS()->getUseWP(), "weightp not enabled in PPS, but in use\n");
         weightAnalyse(*slice, *m_cfg->m_param);
     }
+    else
+    {
+        slice->resetWpScaling();
+    }
 
     // Generate motion references
     int numPredDir = slice->isInterP() ? 1 : slice->isInterB() ? 2 : 0;
diff -r c11920cb6f04 -r 9dddc48aecc7 source/encoder/ratecontrol.h
--- a/source/encoder/ratecontrol.h	Wed Jun 04 23:14:37 2014 -0500
+++ b/source/encoder/ratecontrol.h	Thu Jun 05 13:05:33 2014 +0530
@@ -109,7 +109,7 @@ public:
     Predictor m_predBfromP;
 
     int       m_bframes;
-    int       m_bframeBits;
+    int64_t   m_bframeBits;
     int64_t   m_currentSatd;
     int       m_qpConstant[3];
     double    m_ipOffset;