Changeset 1502 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComPicSym.cpp

Timestamp:

11 Dec 2015, 00:05:48 (8 years ago)

Author:

seregin

Message:

infer parameters in SPS after activation, fixing chroma scaling for non 4:2:0

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComPicSym.cpp (modified) (1 diff)

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

@@ -84 +84 @@
 Void TComPicSym::create  ( const TComVPS& vps, const TComSPS &sps, const TComPPS &pps, UInt uiMaxDepth, const UInt layerId )
 {
+  m_vps = vps;
+#else
+Void TComPicSym::create  ( const TComSPS &sps, const TComPPS &pps, UInt uiMaxDepth )
+{
+#endif
   UInt i;
   m_sps = sps;
   m_pps = pps;
-  m_vps = vps;
-  
-  const ChromaFormat chromaFormatIDC = vps.getChromaFormatIdc(&sps, layerId);
-  const Int iPicWidth  = vps.getPicWidthInLumaSamples(&sps, layerId);
-  const Int iPicHeight = vps.getPicHeightInLumaSamples(&sps, layerId);
-#else
-Void TComPicSym::create  ( const TComSPS &sps, const TComPPS &pps, UInt uiMaxDepth )
-{
-  UInt i;
-  m_sps = sps;
-  m_pps = pps;
 
   const ChromaFormat chromaFormatIDC = sps.getChromaFormatIdc();
   const Int iPicWidth      = sps.getPicWidthInLumaSamples();
   const Int iPicHeight     = sps.getPicHeightInLumaSamples();
-#endif
 
   const UInt uiMaxCuWidth  = sps.getMaxCUWidth();