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

Timestamp:

20 Jun 2013, 17:44:29 (12 years ago)

Author:

nokia

Message:

Implementation of JCTVC-M0040 "Adaptive Resolution Change"

Location:

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

Files:

• TEncCavlc.cpp (modified) (2 diffs)
• TEncCfg.h (modified) (2 diffs)
• TEncGOP.cpp (modified) (5 diffs)
• TEncSlice.cpp (modified) (1 diff)

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

@@ -879 +879 @@
   }
 #endif
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+  WRITE_FLAG(vps->getSingleLayerForNonIrapFlag(), "single_layer_for_non_irap_flag" );
+#endif
 }
 #endif
@@ -1222 +1225 @@
     {
 #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)
+      if ( !pcSlice->getIdrPicFlag() && pcSlice->getLayerId() > 0 && pcSlice->getActiveNumILRRefIdx() > 0 && pcSlice->getNumMotionPredRefLayers() > 0 )
+      {
+        WRITE_FLAG( pcSlice->getAltColIndicationFlag() ? 1 : 0, "alt_collocated_indication_flag" );
+        if (pcSlice->getAltColIndicationFlag() && pcSlice->getNumMotionPredRefLayers() > 1)
         {
           WRITE_UVLC(0, "collocated_ref_layer_idx");

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

@@ -367 +367 @@
 #if REF_IDX_FRAMEWORK
   Int      m_elRapSliceBEnabled;
+#endif
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+  Int      m_adaptiveResolutionChange;
 #endif
 
@@ -888 +891 @@
   Int       getElRapSliceTypeB()              {return m_elRapSliceBEnabled;}
 #endif
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+  Void      setAdaptiveResolutionChange(Int x) { m_adaptiveResolutionChange = x;    }
+  Int       getAdaptiveResolutionChange()      { return m_adaptiveResolutionChange; }
+#endif
 };
 

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

@@ -498 +498 @@
     }
 
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+    if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && ((m_layerId == 1 && pocCurr < m_pcEncTop->getAdaptiveResolutionChange()) ||
+                                                          (m_layerId == 0 && pocCurr > m_pcEncTop->getAdaptiveResolutionChange())) )
+    {
+      continue;
+    }
+#endif
+
     if( getNalUnitType(pocCurr, m_iLastIDR) == NAL_UNIT_CODED_SLICE_IDR_W_RADL || getNalUnitType(pocCurr, m_iLastIDR) == NAL_UNIT_CODED_SLICE_IDR_N_LP )
     {
@@ -518 +526 @@
     m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getSPS(), m_pcEncTop->getPPS() );
 #endif
+
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+    if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && m_layerId == 1 && pocCurr > m_pcEncTop->getAdaptiveResolutionChange())
+    {
+      pcSlice->setActiveNumILRRefIdx(0);
+      pcSlice->setInterLayerPredEnabledFlag(false);
 #if M0457_COL_PICTURE_SIGNALING
-    pcSlice->setMFMEnabledFlag(m_pcEncTop->getMFMEnabledFlag());
-    pcSlice->setAltColIndicationFlag(m_pcEncTop->getNumMotionPredRefLayers() > 0 ? true : false);
-    pcSlice->setColRefLayerIdx(0);
-#endif
+      pcSlice->setMFMEnabledFlag(false);
+      pcSlice->setAltColIndicationFlag(false);
+#endif
+    }
+#endif
+
     pcSlice->setLastIDR(m_iLastIDR);
     pcSlice->setSliceIdx(0);
@@ -797 +813 @@
 #if REF_IDX_FRAMEWORK
 #if M0457_COL_PICTURE_SIGNALING
-    if ( pcSlice->getSliceType() == B_SLICE && !pcSlice->getAltColIndicationFlag() )
+    if ( pcSlice->getSliceType() == B_SLICE && !(pcSlice->getActiveNumILRRefIdx() > 0 && m_pcEncTop->getNumMotionPredRefLayers() > 0) )
 #else
     if( pcSlice->getSliceType() == B_SLICE )
@@ -846 +862 @@
 #if REF_IDX_MFM
 #if M0457_COL_PICTURE_SIGNALING
-      if( pcSlice->getMFMEnabledFlag() && !pcSlice->getAltColIndicationFlag() )
+      if( pcSlice->getMFMEnabledFlag() && !(pcSlice->getActiveNumILRRefIdx() > 0 && m_pcEncTop->getNumMotionPredRefLayers() > 0) )
 #else
       if( pcSlice->getSPS()->getMFMEnabledFlag() )
@@ -2260 +2276 @@
       pcPic->getPicYuvRec()->copyToPic(pcPicYuvRecOut);
 
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+      pcPicYuvRecOut->setReconstructed(true);
+#endif
+
       pcPic->setReconMark   ( true );
       m_bFirst = false;

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

@@ -502 +502 @@
 #else
     rpcSlice->setNumILRRefIdx( rpcSlice->getVPS()->getNumDirectRefLayers( layerId ) );
-#endif 
+#endif
+#if M0457_COL_PICTURE_SIGNALING
+    rpcSlice->setMFMEnabledFlag(m_ppcTEncTop[layerId]->getMFMEnabledFlag());
+    rpcSlice->setAltColIndicationFlag(rpcSlice->getMFMEnabledFlag());
+#endif
   }