Changeset 1287 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp

Timestamp:

17 Jul 2015, 05:43:37 (9 years ago)

Author:

seregin

Message:

port rev 4322 (g_bitDepth)

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp (modified) (5 diffs)

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

@@ -886 +886 @@
   
 #if SVC_EXTENSION  
-  Int qpBdOffsetY =  pcCU->getSlice()->getQpBDOffsetY();
+  Int qpBdOffsetY =  pcCU->getSlice()->getQpBDOffset(CHANNEL_TYPE_LUMA);
 #else
   Int qpBdOffsetY =  pcCU->getSlice()->getSPS()->getQpBDOffset(CHANNEL_TYPE_LUMA);
@@ -1608 +1608 @@
   }
 }
-#if SVC_EXTENSION
-Void TEncSbac::codeSAOOffsetParam(ComponentID compIdx, SAOOffset& ctbParam, Bool sliceEnabled, UInt* saoMaxOffsetQVal)
-#else
-Void TEncSbac::codeSAOOffsetParam(ComponentID compIdx, SAOOffset& ctbParam, Bool sliceEnabled)
-#endif
+
+Void TEncSbac::codeSAOOffsetParam(ComponentID compIdx, SAOOffset& ctbParam, Bool sliceEnabled, const Int channelBitDepth)
 {
   UInt uiSymbol;
@@ -1658 +1655 @@
     }
 
+    const Int  maxOffsetQVal = TComSampleAdaptiveOffset::getMaxOffsetQVal(channelBitDepth);
     for(Int i=0; i< 4; i++)
     {
-#if SVC_EXTENSION
-      codeSaoMaxUvlc((offset[i]<0)?(-offset[i]):(offset[i]),  saoMaxOffsetQVal[compIdx] ); //sao_offset_abs
-#else
-      codeSaoMaxUvlc((offset[i]<0)?(-offset[i]):(offset[i]),  g_saoMaxOffsetQVal[compIdx] ); //sao_offset_abs
-#endif
+      codeSaoMaxUvlc((offset[i]<0)?(-offset[i]):(offset[i]),  maxOffsetQVal ); //sao_offset_abs
     }
 
@@ -1693 +1687 @@
 
 
-Void TEncSbac::codeSAOBlkParam(SAOBlkParam& saoBlkParam
-#if SVC_EXTENSION
-                              , UInt* saoMaxOffsetQVal
-#endif
+Void TEncSbac::codeSAOBlkParam(SAOBlkParam& saoBlkParam, const BitDepths &bitDepths
                               , Bool* sliceEnabled
                               , Bool leftMergeAvail
@@ -1728 +1719 @@
     for(Int compIdx=0; compIdx < MAX_NUM_COMPONENT; compIdx++)
     {
-#if SVC_EXTENSION
-      codeSAOOffsetParam(ComponentID(compIdx), saoBlkParam[compIdx], sliceEnabled[compIdx], saoMaxOffsetQVal);
-#else
-      codeSAOOffsetParam(ComponentID(compIdx), saoBlkParam[compIdx], sliceEnabled[compIdx]);
-#endif
+      codeSAOOffsetParam(ComponentID(compIdx), saoBlkParam[compIdx], sliceEnabled[compIdx], bitDepths.recon[toChannelType(ComponentID(compIdx))]);
     }
   }