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

Timestamp:

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

Author:

nokia

Message:

JCTVC-M0457: Co-located picture signaling

File:

• branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

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) )