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

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/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (3 diffs)
• TEncGOP.cpp (modified) (6 diffs)
• TEncGOP.h (modified) (1 diff)
• TEncTop.cpp (modified) (1 diff)

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

@@ -548 +548 @@
   WRITE_FLAG( pcSPS->getTMVPFlagsPresent()  ? 1 : 0,           "sps_temporal_mvp_enable_flag" );
 #if REF_IDX_MFM
+#if !M0457_COL_PICTURE_SIGNALING
   if( pcSPS->getLayerId() > 0 )
   {
     WRITE_FLAG( pcSPS->getMFMEnabledFlag() ? 1 : 0,          "sps_enh_mfm_enable_flag" );
   }
+#endif
 #endif
   WRITE_FLAG( pcSPS->getUseStrongIntraSmoothing(),             "sps_strong_intra_smoothing_enable_flag" );
@@ -1219 +1221 @@
     if ( pcSlice->getEnableTMVPFlag() )
     {
+#if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
+      if ( !pcSlice->getIdrPicFlag() && pcSlice->getLayerId() > 0 && pcSlice->getNumMotionPredRefLayers() > 0 )
+      {
+        WRITE_FLAG( 1, "alt_collocated_indication_flag" );
+        if (pcSlice->getNumMotionPredRefLayers() > 1)
+        {
+          WRITE_UVLC(0, "collocated_ref_layer_idx");
+        }
+      }
+      else
+      {
+#endif
       if ( pcSlice->getSliceType() == B_SLICE )
       {
@@ -1230 +1244 @@
         WRITE_UVLC( pcSlice->getColRefIdx(), "collocated_ref_idx" );
       }
+#if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
+      }
+#endif
     }
     if ( (pcSlice->getPPS()->getUseWP() && pcSlice->getSliceType()==P_SLICE) || (pcSlice->getPPS()->getWPBiPred() && pcSlice->getSliceType()==B_SLICE) )

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

@@ -487 +487 @@
     m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getSPS(), m_pcEncTop->getPPS() );
 #endif
+#if M0457_COL_PICTURE_SIGNALING
+    pcSlice->setMFMEnabledFlag(m_pcEncTop->getMFMEnabledFlag());
+    pcSlice->setAltColIndicationFlag(m_pcEncTop->getNumMotionPredRefLayers() > 0 ? true : false);
+    pcSlice->setColRefLayerIdx(0);
+#endif
     pcSlice->setLastIDR(m_iLastIDR);
     pcSlice->setSliceIdx(0);
@@ -760 +765 @@
 
 #if REF_IDX_FRAMEWORK
+#if M0457_COL_PICTURE_SIGNALING
+    if ( pcSlice->getSliceType() == B_SLICE && !pcSlice->getAltColIndicationFlag() )
+#else
     if( pcSlice->getSliceType() == B_SLICE )
+#endif
     {
       pcSlice->setColFromL0Flag(1-uiColDir);
@@ -789 +798 @@
 
 #if REF_IDX_MFM
+#if M0457_COL_PICTURE_SIGNALING
+      if( pcSlice->getMFMEnabledFlag() )
+#else
       if( pcSlice->getSPS()->getMFMEnabledFlag() )
+#endif
       {
         pcSlice->setRefPOCListILP(m_pcEncTop->getIlpList(), pcSlice->getBaseColPic());
+#if M0457_COL_PICTURE_SIGNALING
+        pcSlice->setMotionPredIlp(getMotionPredIlp(pcSlice));
+#endif
       }
 #endif
@@ -798 +814 @@
 
 #if REF_IDX_MFM
+#if M0457_COL_PICTURE_SIGNALING
+      if( pcSlice->getMFMEnabledFlag() && !pcSlice->getAltColIndicationFlag() )
+#else
       if( pcSlice->getSPS()->getMFMEnabledFlag() )
+#endif
       {
         Bool found         = false;
@@ -1608 +1628 @@
             startCUAddrSliceSegmentIdx++;
           }
-
+#if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
+          pcSlice->setNumMotionPredRefLayers(m_pcEncTop->getNumMotionPredRefLayers());
+#endif
           pcSlice->setRPS(pcPic->getSlice(0)->getRPS());
           pcSlice->setRPSidx(pcPic->getSlice(0)->getRPSidx());
@@ -3001 +3023 @@
 }
 #endif
+
+#if M0457_COL_PICTURE_SIGNALING
+TComPic* TEncGOP::getMotionPredIlp(TComSlice* pcSlice)
+{
+  TComPic* ilpPic = NULL;
+  Int activeMotionPredReflayerIdx = 0;
+
+  for( Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ )
+  {
+    UInt refLayerIdc = pcSlice->getInterLayerPredLayerIdc(i);
+    if (m_pcEncTop->getMotionPredEnabledFlag(refLayerIdc))
+    {
+      if (activeMotionPredReflayerIdx == pcSlice->getColRefLayerIdx())
+      {
+        ilpPic = m_pcEncTop->getIlpList()[i];
+        break;
+      }
+      else
+      {
+        activeMotionPredReflayerIdx++;
+      }
+    }
+  }
+
+  assert(ilpPic != NULL);
+
+  return ilpPic;
+}
+#endif
+
 //! \}

branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncGOP.h

@@ -207 +207 @@
   Void dblMetric( TComPic* pcPic, UInt uiNumSlices );
 #endif
+#if M0457_COL_PICTURE_SIGNALING
+  TComPic* getMotionPredIlp(TComSlice* pcSlice);
+#endif
 };// END CLASS DEFINITION TEncGOP
 

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

@@ -599 +599 @@
 #endif
 #if REF_IDX_MFM
+#if !M0457_COL_PICTURE_SIGNALING
   m_cSPS.setMFMEnabledFlag(m_bMFMEnabledFlag);
+#endif
 #endif
 #if SCALED_REF_LAYER_OFFSETS