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

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


# HG changeset patch
# User Aarthi<aarthi at multicorewareinc.com>
# Date 1375611254 -19800
#      Sun Aug 04 15:44:14 2013 +0530
# Node ID 282d033d7e4c653faa4688346479ab79bc7e5e6c
# Parent  eb82648509236dc732f7971afb9bb1be546a1d36
remove duplicate vars, get() methods

diff -r eb8264850923 -r 282d033d7e4c source/Lib/TLibEncoder/TEncGOP.cpp
--- a/source/Lib/TLibEncoder/TEncGOP.cpp	Sun Aug 04 15:42:44 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncGOP.cpp	Sun Aug 04 15:44:14 2013 +0530
@@ -567,7 +567,7 @@
         sliceEncoder->compressSlice(pic, frameEncoder);  // The bulk of the real work
 
         // SAO parameter estimation using non-deblocked pixels for LCU bottom and right boundary areas
-        if (m_cfg->getSaoLcuBasedOptimization() && m_cfg->getSaoLcuBoundary())
+        if (m_cfg->param.saoLcuBasedOptimization && m_cfg->param.saoLcuBoundary)
         {
             sao->resetStats();
             sao->calcSaoStatsCu_BeforeDblk(pic);
@@ -1183,7 +1183,7 @@
 
     for (Int extraNum = gopSize; extraNum < m_cfg->getExtraRPSs() + gopSize; extraNum++)
     {
-        if (intraPeriod > 0 && m_cfg->getDecodingRefreshType() > 0)
+        if (intraPeriod > 0 && m_cfg->param.decodingRefreshType > 0)
         {
             Int POCIndex = curPOC % intraPeriod;
             if (POCIndex == 0)
@@ -1216,7 +1216,7 @@
 
     for (Int extraNum = gopSize; extraNum < m_cfg->getExtraRPSs() + gopSize; extraNum++)
     {
-        if (intraPeriod > 0 && m_cfg->getDecodingRefreshType() > 0)
+        if (intraPeriod > 0 && m_cfg->param.decodingRefreshType > 0)
         {
             Int POCIndex = curPOC % intraPeriod;
             if (POCIndex == 0)
@@ -1478,11 +1478,11 @@
     }
     if (curPOC % m_cfg->param.keyframeInterval == 0)
     {
-        if (m_cfg->getDecodingRefreshType() == 1)
+        if (m_cfg->param.decodingRefreshType == 1)
         {
             return NAL_UNIT_CODED_SLICE_CRA;
         }
-        else if (m_cfg->getDecodingRefreshType() == 2)
+        else if (m_cfg->param.decodingRefreshType == 2)
         {
             return NAL_UNIT_CODED_SLICE_IDR_W_RADL;
         }


More information about the x265-devel mailing list