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

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.

File:

• branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)

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);