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

Timestamp:

11 Nov 2013, 21:59:32 (11 years ago)

Author:

qualcomm

Message:

Fix to align all_ref_layer_active_flag according to JCT-VC N1008v3. Related to ticket [JCTVCSHM software] #5.

Location:

branches/SHM-4.0-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

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

@@ -65 +65 @@
 
 #define ILP_SSH_SIG                      1      ///< JCTVC-N0195 proposal 2, JCTVC-N0118: add presence flag in VPS ext to condition inter-layer prediction signaling in slice segment header
+#if ILP_SSH_SIG
+#define ILP_SSH_SIG_FIX                  1
+#endif 
 #define SPL_FLG_CHK                      1      ///< JCTVC-N0195 proposal 5, JCTVC-N0085: constrain sum of lengths to be less than or equal to 6
 #define ILP_NUM_REF_CHK                  1      ///< JCTVC-N0195 proposal 1, JCTVC-N0081, JCTVC-N0154, JCTVC-N0217: a condition on signaling inter_layer_pred_layer_idc[ i ], to avoid sending when NumDirectRefLayers equals NumActiveRefLayerPics, and instead infer values

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

@@ -1715 +1715 @@
     rpcSlice->setActiveNumILRRefIdx(0);
 #if ILP_SSH_SIG
+#if ILP_SSH_SIG_FIX
+    if((sps->getLayerId() > 0) && !(rpcSlice->getVPS()->getIlpSshSignalingEnabledFlag()) && (rpcSlice->getNumILRRefIdx() > 0) )
+#else
     if((sps->getLayerId() > 0) && rpcSlice->getVPS()->getIlpSshSignalingEnabledFlag() && (rpcSlice->getNumILRRefIdx() > 0) )
+#endif
 #else
     if((sps->getLayerId() > 0)  &&  (rpcSlice->getNumILRRefIdx() > 0) )
@@ -1768 +1772 @@
     }
 #if ILP_SSH_SIG
+#if ILP_SSH_SIG_FIX
+    else if( rpcSlice->getVPS()->getIlpSshSignalingEnabledFlag() == true )
+#else
     else if( rpcSlice->getVPS()->getIlpSshSignalingEnabledFlag() == false )
+#endif 
     {
       rpcSlice->setInterLayerPredEnabledFlag(true);

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

@@ -1366 +1366 @@
 #if JCTVC_M0458_INTERLAYER_RPS_SIG
 #if ILP_SSH_SIG
+#if ILP_SSH_SIG_FIX
+    if((pcSlice->getSPS()->getLayerId() > 0) && !(pcSlice->getVPS()->getIlpSshSignalingEnabledFlag()) && (pcSlice->getNumILRRefIdx() > 0) )
+#else
     if((pcSlice->getSPS()->getLayerId() > 0) && pcSlice->getVPS()->getIlpSshSignalingEnabledFlag() && (pcSlice->getNumILRRefIdx() > 0) )
+#endif
 #else
     if((pcSlice->getSPS()->getLayerId() > 0)  &&  (pcSlice->getNumILRRefIdx() > 0) )