Changeset 1502 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComPic.h

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/TComPic.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComPic.h

@@ -161 +161 @@
   Void          clearSliceBuffer()           {m_picSym.clearSliceBuffer();         }
 
-#if SVC_EXTENSION
-  const Window& getConformanceWindow() const { return m_picSym.getSlice(0)->getConformanceWindow(); }
-#else
   const Window& getConformanceWindow() const { return m_picSym.getSPS().getConformanceWindow(); }
-#endif
   Window        getDefDisplayWindow() const  { return m_picSym.getSPS().getVuiParametersPresentFlag() ? m_picSym.getSPS().getVuiParameters()->getDefaultDisplayWindow() : Window(); }