Changeset 1502 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComSlice.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/TComSlice.h (modified) (3 diffs)

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

@@ -1130 +1130 @@
   Void              checkNecessaryLayerFlagCondition();
   Void              calculateMaxSLInLayerSets();
-
-  ChromaFormat      getChromaFormatIdc( const TComSPS* sps, const UInt layerId ) const;
-  UInt              getPicHeightInLumaSamples( const TComSPS* sps, const UInt layerId ) const;
-  UInt              getPicWidthInLumaSamples( const TComSPS* sps, const UInt layerId ) const;
-  UInt              getBitDepth( ChannelType type, const TComSPS* sps, const UInt layerId ) const;
-  const BitDepths&  getBitDepths( const TComSPS* sps, const UInt layerId ) const;
-  const Window&     getConformanceWindow( const TComSPS* sps, const UInt layerId ) const;
 #endif //SVC_EXTENSION
 };
@@ -1604 +1597 @@
   Void                   setInferScalingListFlag( Bool flag )                                            { m_inferScalingListFlag = flag;                                       }
   Void                   setScalingListRefLayerId( UInt layerId )                                        { m_scalingListRefLayerId = layerId;                                   }
+
+  Void                   inferSPS( const UInt layerId, TComVPS* vps );
 #endif //SVC_EXTENSION
 };
@@ -2399 +2394 @@
   Bool                        getCrossLayerBLAFlag  ()                               { return m_bCrossLayerBLAFlag;                                  }
   Void                        setCrossLayerBLAFlag  (Bool b)                         { m_bCrossLayerBLAFlag = b;                                     }
-
   Int                         getNumNegativeRpsCurrTempList();
-
-  UInt                        getPicWidthInLumaSamples();
-  UInt                        getPicHeightInLumaSamples();
-  ChromaFormat                getChromaFormatIdc();
-  UInt                        getBitDepth(ChannelType type) const;
-  BitDepths&                  getBitDepths();
-  Int                         getQpBDOffset(ChannelType type) const                  { return (getBitDepth(type) - 8) * 6;                           }
-
-  const Window&               getConformanceWindow() const;
-
   Void                        setILRPic(TComPic **pcIlpPic);
-
   Int                         getPocResetIdc()                                       { return m_pocResetIdc;                                         }
   Void                        setPocResetIdc(Int b)                                  { m_pocResetIdc = b;                                            }