Changeset 563 in SHVCSoftware for branches/SHM-5.0-dev/source/Lib/TLibDecoder

Timestamp:

27 Jan 2014, 17:44:28 (11 years ago)

Author:

seregin

Message:

remove REMOVE_COL_PICTURE_SIGNALING macro

File:

• branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)

branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2339 +2339 @@
     if ( rpcSlice->getEnableTMVPFlag() )
     {
-#if REMOVE_COL_PICTURE_SIGNALING
+#if SVC_EXTENSION && REF_IDX_MFM
+      // set motion mapping flag
       rpcSlice->setMFMEnabledFlag( ( rpcSlice->getNumMotionPredRefLayers() > 0 && rpcSlice->getActiveNumILRRefIdx() ) ? true : false );
-#else
-      rpcSlice->setMFMEnabledFlag( false );
-      rpcSlice->setColRefLayerIdx( 0 );
-      rpcSlice->setAltColIndicationFlag( false );
-      if ( sps->getLayerId() > 0 && rpcSlice->getActiveNumILRRefIdx() > 0 && rpcSlice->getNumMotionPredRefLayers() > 0 )
-      {
-        READ_FLAG( uiCode, "alt_collocated_indication_flag" );
-        rpcSlice->setAltColIndicationFlag( uiCode == 1 ? true : false );
-        rpcSlice->setMFMEnabledFlag( uiCode == 1 ? true : false );
-        if ( rpcSlice->getNumMotionPredRefLayers() > 1 )
-        {
-          READ_UVLC( uiCode, "collocated_ref_layer_idx" );
-          rpcSlice->setColRefLayerIdx( uiCode );
-        }
-      }
-      else
-      {
-#endif //REMOVE_COL_PICTURE_SIGNALING
+#endif
       if ( rpcSlice->getSliceType() == B_SLICE )
       {