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

Timestamp:

10 May 2013, 00:11:31 (12 years ago)

Author:

seregin

Message:

clean up for JCTVC_M0458_INTERLAYER_RPS_SIG

Location:

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

Files:

• TEncGOP.cpp (modified) (1 diff)
• TEncSlice.cpp (modified) (2 diffs)

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

@@ -194 +194 @@
   rpcSlice->setPic( pcPic );
 #if SVC_EXTENSION
+  UInt layerId = pcPic->getLayerId();
   rpcSlice->setVPS( vps );
-  rpcSlice->initSlice( pcPic->getLayerId() );
+  rpcSlice->initSlice( layerId );
 #else
   rpcSlice->initSlice();
@@ -486 +487 @@
   xStoreWPparam( pPPS->getUseWP(), pPPS->getWPBiPred() );
 
+#if SVC_EXTENSION
+  if( layerId > 0 )
+  {
 #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);
+    if( rpcSlice->getNumILRRefIdx() > 0 )
+    {
+      rpcSlice->setActiveNumILRRefIdx(1);
+      rpcSlice->setInterLayerPredEnabledFlag(1);
+    }
+#else
+    rpcSlice->setNumILRRefIdx( rpcSlice->getVPS()->getNumDirectRefLayers( layerId ) );
 #endif 
+  }
+
+#endif
 }