[x265] [PATCH 4 of 4] framepp: move xPCMRestoration* outside from TComSampleAdaptiveOffset

[Min Chen]

# HG changeset patch
# User Min Chen <chenm003 at 163.com>
# Date 1376588117 -28800
# Node ID 3409129648263f609133b26de3939225d136933a
# Parent  9db59d007cfb45248d0515681335482616671acf
framepp: move xPCMRestoration* outside from TComSampleAdaptiveOffset

diff -r 9db59d007cfb -r 340912964826 source/Lib/TLibCommon/TComSampleAdaptiveOffset.cpp
--- a/source/Lib/TLibCommon/TComSampleAdaptiveOffset.cpp	Fri Aug 16 01:34:35 2013 +0800
+++ b/source/Lib/TLibCommon/TComSampleAdaptiveOffset.cpp	Fri Aug 16 01:35:17 2013 +0800
@@ -1132,13 +1132,17 @@
     }
 }
 
+static Void xPCMRestoration(TComPic* pic);
+static Void xPCMCURestoration(TComDataCU* cu, UInt absZOrderIdx, UInt depth);
+static Void xPCMSampleRestoration(TComDataCU* cu, UInt absZOrderIdx, UInt depth, TextType ttText);
+
 /** PCM LF disable process.
  * \param pic picture (TComPic) pointer
  * \returns Void
  *
  * \note Replace filtered sample values of PCM mode blocks with the transmitted and reconstructed ones.
  */
-Void TComSampleAdaptiveOffset::PCMLFDisableProcess(TComPic* pic)
+Void PCMLFDisableProcess(TComPic* pic)
 {
     xPCMRestoration(pic);
 }
@@ -1147,7 +1151,7 @@
  * \param pic picture (TComPic) pointer
  * \returns Void
  */
-Void TComSampleAdaptiveOffset::xPCMRestoration(TComPic* pic)
+static Void xPCMRestoration(TComPic* pic)
 {
     Bool  bPCMFilter = (pic->getSlice()->getSPS()->getUsePCM() && pic->getSlice()->getSPS()->getPCMFilterDisableFlag()) ? true : false;
 
@@ -1168,7 +1172,7 @@
  * \param depth CU depth
  * \returns Void
  */
-Void TComSampleAdaptiveOffset::xPCMCURestoration(TComDataCU* cu, UInt absZOrderIdx, UInt depth)
+static Void xPCMCURestoration(TComDataCU* cu, UInt absZOrderIdx, UInt depth)
 {
     TComPic* pic     = cu->getPic();
     UInt curNumParts = pic->getNumPartInCU() >> (depth << 1);
@@ -1204,7 +1208,7 @@
  * \param ttText texture component type
  * \returns Void
  */
-Void TComSampleAdaptiveOffset::xPCMSampleRestoration(TComDataCU* cu, UInt absZOrderIdx, UInt depth, TextType ttText)
+static Void xPCMSampleRestoration(TComDataCU* cu, UInt absZOrderIdx, UInt depth, TextType ttText)
 {
     TComPicYuv* pcPicYuvRec = cu->getPic()->getPicYuvRec();
     Pel* src;
diff -r 9db59d007cfb -r 340912964826 source/Lib/TLibCommon/TComSampleAdaptiveOffset.h
--- a/source/Lib/TLibCommon/TComSampleAdaptiveOffset.h	Fri Aug 16 01:34:35 2013 +0800
+++ b/source/Lib/TLibCommon/TComSampleAdaptiveOffset.h	Fri Aug 16 01:35:17 2013 +0800
@@ -178,10 +178,6 @@
     Bool    m_saoLcuBoundary;
     Bool    m_saoLcuBasedOptimization;
 
-    Void xPCMRestoration(TComPic* pic);
-    Void xPCMCURestoration(TComDataCU* cu, UInt absZOrderIdx, UInt depth);
-    Void xPCMSampleRestoration(TComDataCU* cu, UInt absZOrderIdx, UInt depth, TextType ttText);
-
 public:
 
     TComSampleAdaptiveOffset();
@@ -219,8 +215,8 @@
 
     Void resetSaoUnit(SaoLcuParam* saoUnit);
     Void copySaoUnit(SaoLcuParam* saoUnitDst, SaoLcuParam* saoUnitSrc);
-    Void PCMLFDisableProcess(TComPic* pic); ///< interface function for ALF process
 };
+Void PCMLFDisableProcess(TComPic* pic);
 
 //! \}
 #endif // ifndef __TCOMSAMPLEADAPTIVEOFFSET__
diff -r 9db59d007cfb -r 340912964826 source/Lib/TLibEncoder/TEncGOP.cpp
--- a/source/Lib/TLibEncoder/TEncGOP.cpp	Fri Aug 16 01:34:35 2013 +0800
+++ b/source/Lib/TLibEncoder/TEncGOP.cpp	Fri Aug 16 01:35:17 2013 +0800
@@ -677,7 +677,7 @@
         SAOParam& saoParam = *slice->getPic()->getPicSym()->getSaoParam();
         sao->SAOProcess(&saoParam, pic->getSlice()->getLambdaLuma(), pic->getSlice()->getLambdaChroma(), pic->getSlice()->getDepth());
         sao->endSaoEnc();
-        sao->PCMLFDisableProcess(pic);
+        PCMLFDisableProcess(pic);
 
         pic->getSlice()->setSaoEnabledFlag((saoParam.bSaoFlag[0] == 1) ? true : false);
     }