Changeset 588 in SHVCSoftware for trunk/source/Lib/TLibEncoder/TEncSlice.cpp

Timestamp:

1 Feb 2014, 23:50:54 (11 years ago)

Author:

seregin

Message:

merge with SHM-5.0-dev

Location:

trunk

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/Lib/TLibEncoder/TEncSlice.cpp (modified) (3 diffs)

trunk/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -523 +523 @@
   if( layerId > 0 )
   {
-#if JCTVC_M0458_INTERLAYER_RPS_SIG
     if( rpcSlice->getNumILRRefIdx() > 0 )
     {
@@ -533 +532 @@
       rpcSlice->setInterLayerPredEnabledFlag(1);
     }
-#else
-    rpcSlice->setNumILRRefIdx( rpcSlice->getVPS()->getNumDirectRefLayers( layerId ) );
-#endif
-#if M0457_COL_PICTURE_SIGNALING
     rpcSlice->setMFMEnabledFlag(m_ppcTEncTop[layerId]->getMFMEnabledFlag());
-#if !REMOVE_COL_PICTURE_SIGNALING
-    rpcSlice->setAltColIndicationFlag(rpcSlice->getMFMEnabledFlag());
-#endif
-#endif
   }
 
@@ -820 +811 @@
   }
 #if O0194_WEIGHTED_PREDICTION_CGS
-  else
+  else if( m_ppcTEncTop[pcSlice->getLayerId()]->getInterLayerWeightedPredFlag() )
   {
     // Calculate for the base layer to be used in EL as Inter layer reference