Changeset 291 in SHVCSoftware for branches/SHM-2.1-dev/source/Lib/TLibDecoder

Timestamp:

18 Jun 2013, 14:06:13 (12 years ago)

Author:

nokia

Message:

JCTVC-M0457: Co-located picture signaling

Location:

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

Files:

• TDecCAVLC.cpp (modified) (4 diffs)
• TDecTop.cpp (modified) (3 diffs)
• TDecTop.h (modified) (1 diff)

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

@@ -717 +717 @@
   READ_FLAG( uiCode, "sps_temporal_mvp_enable_flag" );            pcSPS->setTMVPFlagsPresent(uiCode);
 #if REF_IDX_MFM
+#if !M0457_COL_PICTURE_SIGNALING
   if(pcSPS->getLayerId() > 0)
   {
@@ -722 +723 @@
     pcSPS->setMFMEnabledFlag( uiCode ? true : false );
   }
+#endif
 #endif
   READ_FLAG( uiCode, "sps_strong_intra_smoothing_enable_flag" );  pcSPS->setUseStrongIntraSmoothing(uiCode);
@@ -1613 +1615 @@
     if ( rpcSlice->getEnableTMVPFlag() )
     {
+#if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
+      rpcSlice->setMFMEnabledFlag( false );
+      rpcSlice->setColRefLayerIdx( 0 );
+      rpcSlice->setAltColIndicationFlag( false );
+      if ( sps->getLayerId() > 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
       if ( rpcSlice->getSliceType() == B_SLICE )
       {
@@ -1634 +1654 @@
         rpcSlice->setColRefIdx(0);
       }
+#if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
+      }
+#endif
     }
     if ( (pps->getUseWP() && rpcSlice->getSliceType()==P_SLICE) || (pps->getWPBiPred() && rpcSlice->getSliceType()==B_SLICE) )

branches/SHM-2.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -541 +541 @@
   setRefLayerParams(m_apcSlicePilot->getVPS());
 #endif
+#if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
+  m_apcSlicePilot->setNumMotionPredRefLayers(m_numMotionPredRefLayers);
+#endif
+
 #if SVC_EXTENSION
   m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder[m_layerId]);
@@ -919 +923 @@
       setILRPic(pcPic);
 #if REF_IDX_MFM
+#if M0457_COL_PICTURE_SIGNALING
+      if( pcSlice->getMFMEnabledFlag() )
+#else
       if( pcSlice->getSPS()->getMFMEnabledFlag() )
+#endif
       {
         pcSlice->setRefPOCListILP(m_ppcTDecTop[m_layerId]->m_cIlpPic, pcSlice->getBaseColPic());
+#if M0457_COL_PICTURE_SIGNALING
+        pcSlice->setMotionPredIlp(getMotionPredIlp(pcSlice));
+#endif
       }
 #endif
@@ -1372 +1383 @@
 
 #endif
+
+#if M0457_COL_PICTURE_SIGNALING
+TComPic* TDecTop::getMotionPredIlp(TComSlice* pcSlice)
+{
+  TComPic* ilpPic = NULL;
+  Int activeMotionPredReflayerIdx = 0;
+
+  for( Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ )
+  {
+    UInt refLayerIdc = pcSlice->getInterLayerPredLayerIdc(i);
+    if (getMotionPredEnabledFlag(refLayerIdc))
+    {
+      if (activeMotionPredReflayerIdx == pcSlice->getColRefLayerIdx())
+      {
+        ilpPic = m_cIlpPic[i];
+        break;
+      }
+      else
+      {
+        activeMotionPredReflayerIdx++;
+      }
+    }
+  }
+
+  assert(ilpPic != NULL);
+
+  return ilpPic;
+}
+#endif
+
 //! \}

branches/SHM-2.1-dev/source/Lib/TLibDecoder/TDecTop.h

@@ -230 +230 @@
   Void      xDecodePPS();
   Void      xDecodeSEI( TComInputBitstream* bs, const NalUnitType nalUnitType );
+#if M0457_COL_PICTURE_SIGNALING
+  TComPic*  getMotionPredIlp(TComSlice* pcSlice);
+#endif
 
 };// END CLASS DEFINITION TDecTop