Changeset 1499 in SHVCSoftware for branches/SHM-dev

Timestamp:

9 Dec 2015, 18:45:39 (9 years ago)

Author:

seregin

Message:

update get chroma format idc, patched-by Guillaume Barroux<guillaume.b@…>

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComTU.cpp (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComTU.cpp

@@ -47 +47 @@
 
 TComTU::TComTU(TComDataCU *pcCU, const UInt absPartIdxCU, const UInt cuDepth, const UInt initTrDepthRelCU)
+#if SCALABLE_REXT
+  : mChromaFormat(pcCU->getSlice()->getChromaFormatIdc()),
+#else
   : mChromaFormat(pcCU->getSlice()->getSPS()->getChromaFormatIdc()),
+#endif
     mbProcessLastOfLevel(true), // does not matter. the top level is not 4 quadrants.
     mCuDepth(cuDepth),

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1225 +1225 @@
 #endif
 
+#if SCALABLE_REXT
+  const ChromaFormat chFmt = pcSlice->getChromaFormatIdc();
+#else
   const ChromaFormat chFmt = sps->getChromaFormatIdc();
+#endif
   const UInt numValidComp=getNumberValidComponents(chFmt);
   const Bool bChroma=(chFmt!=CHROMA_400);
@@ -2425 +2429 @@
 {
         WPScalingParam *wp;
+#if SCALABLE_REXT
+  const ChromaFormat    chFmt        = pcSlice->getChromaFormatIdc();
+#else
   const ChromaFormat    chFmt        = sps->getChromaFormatIdc();
+#endif
   const Int             numValidComp = Int(getNumberValidComponents(chFmt));
   const Bool            bChroma      = (chFmt!=CHROMA_400);

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -633 +633 @@
 #endif
     m_cLoopFilter.create( sps->getMaxTotalCUDepth() );
+#if SCALABLE_REXT
+    m_cPrediction.initTempBuff(pSlice->getChromaFormatIdc());
+#else
     m_cPrediction.initTempBuff(sps->getChromaFormatIdc());
+#endif