[x265] [PATCH 2 of 8] remove duplicate vars, get() methods

aarthi at multicorewareinc.com aarthi at multicorewareinc.com
Sun Aug 4 12:21:05 CEST 2013


# HG changeset patch
# User Aarthi<aarthi at multicorewareinc.com>
# Date 1375610830 -19800
#      Sun Aug 04 15:37:10 2013 +0530
# Node ID 51cc06668ca45be4f4f550b865c9ecdcf4e754ad
# Parent  1222ed11b587feaad0d04254ceeb55c683aa1783
remove duplicate vars, get() methods

diff -r 1222ed11b587 -r 51cc06668ca4 source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp	Sun Aug 04 15:32:40 2013 +0530
+++ b/source/encoder/frameencoder.cpp	Sun Aug 04 15:37:10 2013 +0530
@@ -33,7 +33,7 @@
 {
     m_rdGoOnSbacCoder.init(&m_rdGoOnBinCodersCABAC);
     m_sbacCoder.init(&m_binCoderCABAC);
-    m_trQuant.init(1 << top->getQuadtreeTULog2MaxSize(), top->getUseRDOQ(), top->getUseRDOQTS(), top->getUseTransformSkipFast());
+    m_trQuant.init(1 << top->getQuadtreeTULog2MaxSize(), top->param.bEnableRDOQ, top->param.bEnableRDOQTS, top->param.bEnableTSkipFast);
 
     m_rdSbacCoders = new TEncSbac **[g_maxCUDepth + 1];
     m_binCodersCABAC = new TEncBinCABACCounter **[g_maxCUDepth + 1];
@@ -150,7 +150,7 @@
     }
 
     m_sliceEncoder.destroy();
-    if (m_cfg->getUseSAO())
+    if (m_cfg->param.bEnableSAO)
     {
         m_sao.destroy();
         m_sao.destroyEncBuffer();
@@ -165,10 +165,10 @@
 
     m_sliceEncoder.init(top);
     m_sliceEncoder.create(top->param.sourceWidth, top->param.sourceHeight, g_maxCUWidth, g_maxCUHeight, (UChar)g_maxCUDepth);
-    if (top->getUseSAO())
+    if (top->param.bEnableSAO)
     {
-        m_sao.setSaoLcuBoundary(top->getSaoLcuBoundary());
-        m_sao.setSaoLcuBasedOptimization(top->getSaoLcuBasedOptimization());
+        m_sao.setSaoLcuBoundary(top->param.saoLcuBoundary);
+        m_sao.setSaoLcuBasedOptimization(top->param.saoLcuBasedOptimization);
         m_sao.setMaxNumOffsetsPerPic(top->getMaxNumOffsetsPerPic());
         m_sao.create(top->param.sourceWidth, top->param.sourceHeight, g_maxCUWidth, g_maxCUHeight);
         m_sao.createEncBuffer();


More information about the x265-devel mailing list