[x265] quant: set rdoq level in setQPforQuant, and not init

[Deepthi Nandakumar]

# HG changeset patch
# User Deepthi Nandakumar <deepthi at multicorewareinc.com>
# Date 1456913081 -19800
#      Wed Mar 02 15:34:41 2016 +0530
# Node ID 81a6c44e9e4acfcd64d260914886e0039877c10e
# Parent  b043f1d2c2c0e25a67730508b1397378498fa364
quant: set rdoq level in setQPforQuant, and not init

diff -r b043f1d2c2c0 -r 81a6c44e9e4a source/common/quant.cpp
--- a/source/common/quant.cpp Wed Mar 02 15:29:46 2016 +0530
+++ b/source/common/quant.cpp Wed Mar 02 15:34:41 2016 +0530
@@ -188,10 +188,9 @@
     m_nr           = NULL;
 }

-bool Quant::init(int rdoqLevel, double psyScale, const ScalingList&
scalingList, Entropy& entropy)
+bool Quant::init(double psyScale, const ScalingList& scalingList, Entropy&
entropy)
 {
     m_entropyCoder = &entropy;
-    m_rdoqLevel    = rdoqLevel;
     m_psyRdoqScale = (int32_t)(psyScale * 256.0);
     X265_CHECK((psyScale * 256.0) < (double)MAX_INT, "psyScale value too
large\n");
     m_scalingList  = &scalingList;
@@ -223,6 +222,7 @@
 {
     m_nr = m_frameNr ? &m_frameNr[ctu.m_encData->m_frameEncoderID] : NULL;
     m_qpParam[TEXT_LUMA].setQpParam(qp + QP_BD_OFFSET);
+    m_rdoqLevel = ctu.m_encData->m_param->rdoqLevel;
     if (ctu.m_chromaFormat != X265_CSP_I400)
     {
         setChromaQP(qp + ctu.m_slice->m_pps->chromaQpOffset[0],
TEXT_CHROMA_U, ctu.m_chromaFormat);
diff -r b043f1d2c2c0 -r 81a6c44e9e4a source/common/quant.h
--- a/source/common/quant.h Wed Mar 02 15:29:46 2016 +0530
+++ b/source/common/quant.h Wed Mar 02 15:34:41 2016 +0530
@@ -100,7 +100,7 @@
     ~Quant();

     /* one-time setup */
-    bool init(int rdoqLevel, double psyScale, const ScalingList&
scalingList, Entropy& entropy);
+    bool init(double psyScale, const ScalingList& scalingList, Entropy&
entropy);
     bool allocNoiseReduction(const x265_param& param);

     /* CU setup */
diff -r b043f1d2c2c0 -r 81a6c44e9e4a source/encoder/search.cpp
--- a/source/encoder/search.cpp Wed Mar 02 15:29:46 2016 +0530
+++ b/source/encoder/search.cpp Wed Mar 02 15:34:41 2016 +0530
@@ -79,7 +79,7 @@
     m_rdCost.setPsyRdScale(param.psyRd);
     m_me.init(param.searchMethod, param.subpelRefine, param.internalCsp);

-    bool ok = m_quant.init(param.rdoqLevel, param.psyRdoq, scalingList,
m_entropyCoder);
+    bool ok = m_quant.init(param.psyRdoq, scalingList, m_entropyCoder);
     if (m_param->noiseReductionIntra || m_param->noiseReductionInter ||
m_param->rc.vbvBufferSize)
         ok &= m_quant.allocNoiseReduction(param);



-- 
Deepthi Nandakumar
Engineering Manager, x265
Multicoreware, Inc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20160302/b88ef6ec/attachment.html>