Changeset 1292 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

18 Jul 2015, 04:14:13 (10 years ago)

Author:

seregin

Message:

port rev 4326

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncAnalyze.cpp (modified) (1 diff)
• TEncAnalyze.h (modified) (2 diffs)
• TEncGOP.cpp (modified) (4 diffs)
• TEncGOP.h (modified) (3 diffs)
• TEncTop.h (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibEncoder/TEncAnalyze.cpp

@@ -45 +45 @@
 //////////////////////////////////////////////////////////////////////
 
-#if SVC_EXTENSION
-TEncAnalyze             m_gcAnalyzeAll [MAX_LAYERS];
-TEncAnalyze             m_gcAnalyzeI [MAX_LAYERS];
-TEncAnalyze             m_gcAnalyzeP [MAX_LAYERS];
-TEncAnalyze             m_gcAnalyzeB [MAX_LAYERS];
-#else
-TEncAnalyze             m_gcAnalyzeAll;
-TEncAnalyze             m_gcAnalyzeI;
-TEncAnalyze             m_gcAnalyzeP;
-TEncAnalyze             m_gcAnalyzeB;
-#endif
-
-TEncAnalyze             m_gcAnalyzeAll_in;
 
 //! \}

branches/SHM-dev/source/Lib/TLibEncoder/TEncAnalyze.h

@@ -137 +137 @@
 
 #if SVC_EXTENSION
-  Void    printOut ( Char cDelim, const ChromaFormat chFmt, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths, UInt layer )
+  Void    printOut ( Char cDelim, const ChromaFormat chFmt, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths, UInt layer = 0 )
 #else
   Void    printOut ( Char cDelim, const ChromaFormat chFmt, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths )
@@ -451 +451 @@
 };
 
-#if SVC_EXTENSION
-extern TEncAnalyze             m_gcAnalyzeAll [MAX_LAYERS];
-extern TEncAnalyze             m_gcAnalyzeI [MAX_LAYERS];
-extern TEncAnalyze             m_gcAnalyzeP [MAX_LAYERS];
-extern TEncAnalyze             m_gcAnalyzeB [MAX_LAYERS];
-#else
 extern TEncAnalyze             m_gcAnalyzeAll;
 extern TEncAnalyze             m_gcAnalyzeI;
 extern TEncAnalyze             m_gcAnalyzeP;
 extern TEncAnalyze             m_gcAnalyzeB;
-#endif
 
 extern TEncAnalyze             m_gcAnalyzeAll_in;

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -2918 +2918 @@
 }
 
-#if !SVC_EXTENSION
 Void TEncGOP::printOutSummary(UInt uiNumAllPicCoded, Bool isField, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths)
 {
@@ -2971 +2970 @@
   printf("\nRVM: %.3lf\n" , xCalculateRVM());
 }
-#endif
 
 Void TEncGOP::preLoopFilterPicAll( TComPic* pcPic, UInt64& ruiDist )
@@ -3267 +3265 @@
 
   //===== add PSNR =====
-#if SVC_EXTENSION
-  m_gcAnalyzeAll[pcPic->getSlice(0)->getVPS()->getLayerIdxInVps(m_layerId)].addResult (dPSNR, (Double)uibits, MSEyuvframe);
-  TComSlice*  pcSlice = pcPic->getSlice(0);
-  if (pcSlice->isIntra())
-  {
-    m_gcAnalyzeI[pcPic->getSlice(0)->getVPS()->getLayerIdxInVps(m_layerId)].addResult (dPSNR, (Double)uibits, MSEyuvframe);
-  }
-  if (pcSlice->isInterP())
-  {
-    m_gcAnalyzeP[pcPic->getSlice(0)->getVPS()->getLayerIdxInVps(m_layerId)].addResult (dPSNR, (Double)uibits, MSEyuvframe);
-  }
-  if (pcSlice->isInterB())
-  {
-    m_gcAnalyzeB[pcPic->getSlice(0)->getVPS()->getLayerIdxInVps(m_layerId)].addResult (dPSNR, (Double)uibits, MSEyuvframe);
-  }
-#else
   m_gcAnalyzeAll.addResult (dPSNR, (Double)uibits, MSEyuvframe);
   TComSlice*  pcSlice = pcPic->getSlice(0);
@@ -3297 +3279 @@
     m_gcAnalyzeB.addResult (dPSNR, (Double)uibits, MSEyuvframe);
   }
-#endif
 
   Char c = (pcSlice->isIntra() ? 'I' : pcSlice->isInterP() ? 'P' : 'B');

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.h

@@ -86 +86 @@
 
 private:
+
+  TEncAnalyze             m_gcAnalyzeAll;
+  TEncAnalyze             m_gcAnalyzeI;
+  TEncAnalyze             m_gcAnalyzeP;
+  TEncAnalyze             m_gcAnalyzeB;
+
+  TEncAnalyze             m_gcAnalyzeAll_in;
   //  Data
   Bool                    m_bLongtermTestPictureHasBeenCoded;
@@ -193 +200 @@
   TComList<TComPic*>*   getListPic()      { return m_pcListPic; }
   
-#if !SVC_EXTENSION
   Void  printOutSummary      ( UInt uiNumAllPicCoded, Bool isField, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths );
-#endif
   Void  preLoopFilterPicAll  ( TComPic* pcPic, UInt64& ruiDist );
 
@@ -204 +209 @@
 #if SVC_EXTENSION
   Void  determinePocResetIdc( Int const pocCurr, TComSlice *const slice);
-  Int   getIntraRefreshInterval()  { return m_pcCfg->getIntraPeriod(); }
-  Int   getIntraRefreshType()      { return m_pcCfg->getDecodingRefreshType(); }  
-  Int   getLastPocPeriodId()      { return m_lastPocPeriodId; }
-  Void  setLastPocPeriodId(Int x) { m_lastPocPeriodId = x;    }
+  Int   getIntraRefreshInterval()   { return m_pcCfg->getIntraPeriod(); }
+  Int   getIntraRefreshType()       { return m_pcCfg->getDecodingRefreshType(); }  
+  Int   getLastPocPeriodId()        { return m_lastPocPeriodId; }
+  Void  setLastPocPeriodId(Int x)   { m_lastPocPeriodId = x;    }
   Void  updatePocValuesOfPics( Int const pocCurr, TComSlice *const slice);
+
+  TEncAnalyze* getAnalyzeAll()      { return &m_gcAnalyzeAll;  }
+  TEncAnalyze* getAnalyzeI()        { return &m_gcAnalyzeI;    }
+  TEncAnalyze* getAnalyzeP()        { return &m_gcAnalyzeP;    }
+  TEncAnalyze* getAnalyzeB()        { return &m_gcAnalyzeB;    }
+  TEncAnalyze* getAnalyzeAllin()    { return &m_gcAnalyzeAll_in; }
+  Double       calculateRVM()       { return xCalculateRVM();    }
 #endif
 

branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h

@@ -263 +263 @@
   Void      setCurrPocMsb(Int poc)                            { m_currPocMsb = poc;  }
   Int       getCurrPocMsb()                                   { return m_currPocMsb; }
+
+  TEncAnalyze* getAnalyzeAll()                                { return m_cGOPEncoder.getAnalyzeAll();   }
+  TEncAnalyze* getAnalyzeI()                                  { return m_cGOPEncoder.getAnalyzeI();     }
+  TEncAnalyze* getAnalyzeP()                                  { return m_cGOPEncoder.getAnalyzeP();     }
+  TEncAnalyze* getAnalyzeB()                                  { return m_cGOPEncoder.getAnalyzeB();     }
+  TEncAnalyze* getAnalyzeAllin()                              { return m_cGOPEncoder.getAnalyzeAllin(); }
+  Double       calculateRVM()                                 { return m_cGOPEncoder.calculateRVM();    }
 #else //SVC_EXTENSION
   Void encode( Bool bEos,
@@ -275 +282 @@
                TComList<TComPicYuv*>& rcListPicYuvRecOut,
                std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded, Bool isTff);
+#endif //#if SVC_EXTENSION
 
   Void printSummary(Bool isField) { m_cGOPEncoder.printOutSummary (m_uiNumAllPicCoded, isField, m_printMSEBasedSequencePSNR, m_printSequenceMSE, m_cSPS.getBitDepths()); }
-#endif //#if SVC_EXTENSION
 };