Changeset 1502 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.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/TLibEncoder/TEncSampleAdaptiveOffset.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp

@@ -320 +320 @@
       Pel* orgBlk     = orgYuv->getAddr(component) + ((yPos >> componentScaleY) * orgStride) + (xPos >> componentScaleX);
 
-#if SVC_EXTENSION
-      getBlkStats(component, pPic->getSlice(0)->getBitDepth(toChannelType(component)), blkStats[ctuRsAddr][component]
-#else
       getBlkStats(component, pPic->getPicSym()->getSPS().getBitDepth(toChannelType(component)), blkStats[ctuRsAddr][component]
-#endif
                 , srcBlk, orgBlk, srcStride, orgStride, (width  >> componentScaleX), (height >> componentScaleY)
                 , isLeftAvail,  isRightAvail, isAboveAvail, isBelowAvail, isAboveLeftAvail, isAboveRightAvail
@@ -813 +809 @@
       case SAO_MODE_NEW:
         {
-#if SVC_EXTENSION
-          deriveModeNewRDO(pic->getSlice(0)->getBitDepths(), ctuRsAddr, mergeList, sliceEnabled, blkStats, modeParam, modeCost, m_pppcRDSbacCoder, SAO_CABACSTATE_BLK_CUR);
-#else
           deriveModeNewRDO(pic->getPicSym()->getSPS().getBitDepths(), ctuRsAddr, mergeList, sliceEnabled, blkStats, modeParam, modeCost, m_pppcRDSbacCoder, SAO_CABACSTATE_BLK_CUR);
-#endif
-
         }
         break;
       case SAO_MODE_MERGE:
         {
-#if SVC_EXTENSION
-          deriveModeMergeRDO(pic->getSlice(0)->getBitDepths(), ctuRsAddr, mergeList, sliceEnabled, blkStats , modeParam, modeCost, m_pppcRDSbacCoder, SAO_CABACSTATE_BLK_CUR);
-#else
           deriveModeMergeRDO(pic->getPicSym()->getSPS().getBitDepths(), ctuRsAddr, mergeList, sliceEnabled, blkStats , modeParam, modeCost, m_pppcRDSbacCoder, SAO_CABACSTATE_BLK_CUR);
-#endif
         }
         break;