Changeset 174 in SHVCSoftware for branches/SHM-2.0-dev/source/Lib/TLibEncoder

Timestamp:

9 May 2013, 22:14:35 (12 years ago)

Author:

qualcomm

Message:

code formatting, Changes initialization process of m_activeNumILRRefIdx

Location:

branches/SHM-2.0-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (3 diffs)
• TEncGOP.cpp (modified) (1 diff)
• TEncSlice.cpp (modified) (1 diff)

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

@@ -797 +797 @@
 #endif
 #endif
-#if JCTVC_M0458
+#if JCTVC_M0458_INTERLAYER_RPS_SIG
       WRITE_FLAG(vps->getMaxOneActiveRefLayerFlag(), "max_one_active_ref_layer_flag");
 #endif 
@@ -1166 +1166 @@
     }
   }
-#if JCTVC_M0458    
+#if JCTVC_M0458_INTERLAYER_RPS_SIG    
     if((pcSlice->getSPS()->getLayerId() > 0)  &&  (pcSlice->getNumILRRefIdx() > 0) ) 
     {
@@ -1179 +1179 @@
           }       
           for(Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ ) 
-            WRITE_UVLC(pcSlice->getInterLayerPredEnabledFlag(),"inter_layer_pred_layer_idc[i]");          
+            WRITE_UVLC(pcSlice->getInterLayerPredLayerIdc(i),"inter_layer_pred_layer_idc[i]");     
         }
       }

branches/SHM-2.0-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -669 +669 @@
         pcSlice->setNumRefIdx(REF_PIC_LIST_1, pcSlice->getNumRefIdx(REF_PIC_LIST_1)+pcSlice->getNumILRRefIdx());
       }
+#if JCTVC_M0458_INTERLAYER_RPS_SIG
+        // currently only one reference layer is supported in software and no decision logic to select yet.
+        // hence num of active inter layer references is set to one always
+          pcSlice->setActiveNumILRRefIdx(1);
+#endif 
     }
 #endif

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

@@ -485 +485 @@
   rpcSlice->setMaxNumMergeCand        ( m_pcCfg->getMaxNumMergeCand()        );
   xStoreWPparam( pPPS->getUseWP(), pPPS->getWPBiPred() );
+
+#if JCTVC_M0458_INTERLAYER_RPS_SIG
+  // currently only one reference layer is supported in software and no decision logic to select yet.
+  // hence num of active inter layer references is set to one always
+  rpcSlice->setActiveNumILRRefIdx(1);
+#endif 
 }