Changeset 468 in SHVCSoftware for branches/SHM-4.0-dev/source/Lib

Timestamp:

14 Nov 2013, 09:02:43 (11 years ago)

Author:

nokia

Message:

Integration of O0194: Support different bit-depth values for different layers, enable weighted prediction for ILR for color gamut scalability.

Location:

branches/SHM-4.0-dev/source/Lib

Files:

• TLibCommon/TComUpsampleFilter.cpp (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibDecoder/TDecCu.cpp (modified) (3 diffs)
• TLibEncoder/TEncSlice.cpp (modified) (1 diff)
• TLibEncoder/WeightPredAnalysis.cpp (modified) (4 diffs)

branches/SHM-4.0-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

@@ -279 +279 @@
 #if  N0214_INTERMEDIATE_BUFFER_16BITS
 #if O0194_JOINT_US_BITSHIFT
-  Int nShift = 20 - g_bitDepthYLayer[1];
+    Int nShift = 20 - g_bitDepthYLayer[1];
 #else
     Int nShift = US_FILTER_PREC*2 - shift1;

branches/SHM-4.0-dev/source/Lib/TLibCommon/TypeDef.h

@@ -45 +45 @@
 #define RANDOM_ACCESS_SEI_FIX            1
 #if SVC_EXTENSION
-#define MFM_ENCCONSTRAINT                1      ///< JCTVC-O0216: Encoder constraint for motion field mapping
-
-#define O0194_DIFFERENT_BITDEPTH_EL_BL   1      ///< JCTVC-O0194: Support for different bitdepth values for BL and EL, add required configuration parameters
+#define O0194_DIFFERENT_BITDEPTH_EL_BL   1      ///< JCTVC-O0194: Support for different bitdepth values for BL and EL, add required configuration parameters (and Some bugfixes when REPN_FORMAT_IN_VPS (JCTVC-N0092) is enabled)
 #define O0194_JOINT_US_BITSHIFT          1      ///< JCTVC-O0194: Joint Upsampling and bit-shift
 #define O0194_WEIGHTED_PREDICTION_CGS    1      ///< JCTVC-O0194: Weighted prediciton for color gamut scalability
-#define O0194_REPN_FORMAT_IN_VPS_BUGFIX  1      ///< JCTVC-O0194: Some bugfixes when REPN_FORMAT_IN_VPS (JCTVC-N0092) is enabled
-
+#define MFM_ENCCONSTRAINT                1      ///< JCTVC-O0216: Encoder constraint for motion field mapping
 #define VPS_NUH_LAYER_ID                 1      ///< JCTVC-N0085: Assert that the nuh_layer_id of VPS NAL unit should be 0
 #define MAX_LAYERS                       2      ///< max number of layers the codec is supposed to handle

branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2007 +2007 @@
 
 #if REPN_FORMAT_IN_VPS
-#if O0194_REPN_FORMAT_IN_VPS_BUGFIX
+#if O0194_DIFFERENT_BITDEPTH_EL_BL
     g_bitDepthYLayer[rpcSlice->getLayerId()]     = rpcSlice->getBitDepthY();
     g_bitDepthCLayer[rpcSlice->getLayerId()]     = rpcSlice->getBitDepthC();

branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCu.cpp

@@ -616 +616 @@
     curChromaQpOffset = pcCU->getSlice()->getPPS()->getChromaCrQpOffset() + pcCU->getSlice()->getSliceQpDeltaCr();
   }
-#if O0194_REPN_FORMAT_IN_VPS_BUGFIX
+#if O0194_DIFFERENT_BITDEPTH_EL_BL
+  // Bug-fix
 #if REPN_FORMAT_IN_VPS
   m_pcTrQuant->setQPforQuant  ( pcCU->getQP(0), eText, pcCU->getSlice()->getQpBDOffsetC(), curChromaQpOffset );
@@ -776 +777 @@
   // Cb and Cr
   Int curChromaQpOffset = pcCU->getSlice()->getPPS()->getChromaCbQpOffset() + pcCU->getSlice()->getSliceQpDeltaCb();
-#if O0194_REPN_FORMAT_IN_VPS_BUGFIX
+#if O0194_DIFFERENT_BITDEPTH_EL_BL
+  // Bug-fix
 #if REPN_FORMAT_IN_VPS
   m_pcTrQuant->setQPforQuant( pcCU->getQP( uiAbsPartIdx ), TEXT_CHROMA, pcCU->getSlice()->getQpBDOffsetC(), curChromaQpOffset );
@@ -792 +794 @@
 
   curChromaQpOffset = pcCU->getSlice()->getPPS()->getChromaCrQpOffset() + pcCU->getSlice()->getSliceQpDeltaCr();
-#if O0194_REPN_FORMAT_IN_VPS_BUGFIX
+#if O0194_DIFFERENT_BITDEPTH_EL_BL
+  // Bug-fix
 #if REPN_FORMAT_IN_VPS
   m_pcTrQuant->setQPforQuant( pcCU->getQP( uiAbsPartIdx ), TEXT_CHROMA, pcCU->getSlice()->getQpBDOffsetC(), curChromaQpOffset );

branches/SHM-4.0-dev/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -931 +931 @@
   }
 #if O0194_WEIGHTED_PREDICTION_CGS
-  else{
+  else
+  {
     // Calculate for the base layer to be used in EL as Inter layer reference
     xCalcACDCParamSlice(pcSlice);

branches/SHM-4.0-dev/source/Lib/TLibEncoder/WeightPredAnalysis.cpp

@@ -232 +232 @@
       slice->getRefPic(eRefPicList, refIdxTemp)->getSlice(0)->getWpAcDcParam(refWeightACDCParam);
 #if O0194_WEIGHTED_PREDICTION_CGS
-      if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(1)){
+      if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId()))
+      {
         refWeightACDCParam = (wpACDCParam *)g_refWeightACDCParam;
       }
@@ -250 +251 @@
         Int64 refAC = refWeightACDCParam[comp].iAC;
 #if O0194_WEIGHTED_PREDICTION_CGS
-        if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(1)){
+        if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId()))
+        {
           refAC *= (double)currWeightACDCParam[comp].iSamples/refWeightACDCParam[comp].iSamples;
 #if O0194_JOINT_US_BITSHIFT
@@ -264 +266 @@
         Int offset = (Int)( ((currDC<<log2Denom) - ((Int64)weight * refDC) + (Int64)realOffset) >> realLog2Denom );
 #if O0194_WEIGHTED_PREDICTION_CGS
-        if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(1)){
+        if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId())){
         }
         else{
@@ -293 +295 @@
 #if O0194_WEIGHTED_PREDICTION_CGS
         // make sure the reference frames other than ILR are not using weighted prediction
-        if (!(slice->getRefPic(eRefPicList, refIdxTemp)->isILR(1)))
-        {
+        if (!(slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId()))){
           continue;
         }