Changeset 258 in SHVCSoftware for branches/SHM-2.1-dev/source/Lib/TLibEncoder

Timestamp:

4 Jun 2013, 23:13:05 (12 years ago)

Author:

qualcomm

Message:

Generic initialization of ActiveNumILRRefIdx and InterLayerPredLayerIdc.

Location:

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

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncSlice.cpp (modified) (1 diff)

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

@@ -1067 +1067 @@
           if( !pcSlice->getVPS()->getMaxOneActiveRefLayerFlag()) 
           {
-            WRITE_CODE(pcSlice->getNumInterLayerRefPics(), numBits,"num_inter_layer_ref_pics_minus1");
+            WRITE_CODE(pcSlice->getActiveNumILRRefIdx() - 1, numBits,"num_inter_layer_ref_pics_minus1");           
           }       
           for(Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ )

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

@@ -491 +491 @@
   {
 #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
     if( rpcSlice->getNumILRRefIdx() > 0 )
     {
-      rpcSlice->setActiveNumILRRefIdx(1);
+      rpcSlice->setActiveNumILRRefIdx( rpcSlice->getNumILRRefIdx() );
+      for( Int i = 0; i < rpcSlice->getActiveNumILRRefIdx(); i++ )
+      {
+        rpcSlice->setInterLayerPredLayerIdc(i, i);
+      }
       rpcSlice->setInterLayerPredEnabledFlag(1);
     }