Changeset 1367 in 3DVCSoftware for branches/HTM-15.2-dev/source/Lib/TLibEncoder

Timestamp:

28 Oct 2015, 20:05:17 (9 years ago)

Author:

tech

Message:

Align macros

Location:

branches/HTM-15.2-dev/source/Lib/TLibEncoder

Files:

• SEIwrite.cpp (modified) (2 diffs)
• SEIwrite.h (modified) (2 diffs)
• TEncEntropy.h (modified) (1 diff)
• TEncGOP.cpp (modified) (1 diff)
• TEncSearch.cpp (modified) (3 diffs)
• TEncSlice.cpp (modified) (1 diff)

branches/HTM-15.2-dev/source/Lib/TLibEncoder/SEIwrite.cpp

@@ -902 +902 @@
 }
 
-
+#if NH_MV
 #if NH_MV_LAYERS_NOT_PRESENT_SEI
 Void SEIWriter::xWriteSEILayersNotPresent(const SEILayersNotPresent& sei)
@@ -1457 +1457 @@
 };
 #endif
-
+#endif
 
 //! \}

branches/HTM-15.2-dev/source/Lib/TLibEncoder/SEIwrite.h

@@ -81 +81 @@
   Void xWriteSEIMasteringDisplayColourVolume( const SEIMasteringDisplayColourVolume& sei);
 
+#if NH_MV
 #if NH_MV_SEI
 #if NH_MV_LAYERS_NOT_PRESENT_SEI
@@ -108 +109 @@
   Void xWriteSEIAlternativeDepthInfo          ( const SEIAlternativeDepthInfo& sei);
 #endif
+#endif
+#endif
+
   Void xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, const TComSPS *sps);
   Void xWriteByteAlign();
 };
-#endif
 
 //! \}

branches/HTM-15.2-dev/source/Lib/TLibEncoder/TEncEntropy.h

@@ -139 +139 @@
   Void    setBitstream              ( TComBitIf* p )          { m_pcEntropyCoderIf->setBitstream(p);  }
   Void    resetBits                 ()                        { m_pcEntropyCoderIf->resetBits();      }
+#if NH_MV
   UInt    getNumberOfWrittenBits    ()                        {
-#if NH_MV
       D_PRINT_INDENT(g_encNumberOfWrittenBits,  "NumBits: " +  n2s( m_pcEntropyCoderIf->getNumberOfWrittenBits() ))
-#endif
  return m_pcEntropyCoderIf->getNumberOfWrittenBits(); }
+#else
+  UInt    getNumberOfWrittenBits    ()                        { return m_pcEntropyCoderIf->getNumberOfWrittenBits(); }
+#endif
   Void    resetEntropy              (const TComSlice *pSlice) { m_pcEntropyCoderIf->resetEntropy(pSlice);  }
   SliceType determineCabacInitIdx   (const TComSlice *pSlice) { return m_pcEntropyCoderIf->determineCabacInitIdx(pSlice); }

branches/HTM-15.2-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -605 +605 @@
 Void TEncGOP::xCreatePictureTimingSEI  (Int IRAPGOPid, SEIMessages& seiMessages, SEIMessages& nestedSeiMessages, SEIMessages& duInfoSeiMessages, TComSlice *slice, Bool isField, std::deque<DUData> &duData)
 {
-#if !NH_MV
-  SEIPictureTiming *pictureTimingSEI = new SEIPictureTiming();
-#endif
 
   const TComVUI *vui = slice->getSPS()->getVuiParameters();

branches/HTM-15.2-dev/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -113 +113 @@
 , m_iSearchRange (0)
 , m_bipredSearchRange (0)
+, m_motionEstimationSearchMethod (MESEARCH_FULL)
 , m_pppcRDSbacCoder (NULL)
 , m_pcRDGoOnSbacCoder (NULL)
@@ -6708 +6709 @@
               }
 
-
               DEBUG_STRING_NEW(sSingleStringTest)
 #if NH_MV
@@ -6718 +6718 @@
                 D_PRINT_INC_INDENT(g_traceModeCheck, "NonZero");
 #endif
-
                 if (isFirstMode)
                 {

branches/HTM-15.2-dev/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -318 +318 @@
   else
   {
+#if NH_MV
 #if 0 // Check this! NH_MV
     rpcSlice->setTemporalLayerNonReferenceFlag(!m_pcCfg->getGOPEntry( (eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid ).m_refPic);
+#else
+    rpcSlice->setTemporalLayerNonReferenceFlag(!m_pcCfg->getGOPEntry(iGOPid).m_refPic);
+#endif
 #else
     rpcSlice->setTemporalLayerNonReferenceFlag(!m_pcCfg->getGOPEntry(iGOPid).m_refPic);