Changeset 296 in SHVCSoftware for branches/SHM-2.1-dev/source/App/TAppEncoder

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/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (3 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (5 diffs)

branches/SHM-2.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -843 +843 @@
   ("ConstantPicRateIdc",           cfg_constantPicRateIdc,            string(""), "List of constant picture rate IDCs; include non-negative number even if corresponding flag is 0")
 #endif
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+  ("AdaptiveResolutionChange",     m_adaptiveResolutionChange, 0, "Adaptive resolution change frame number. Should coincide with EL RAP picture. (0: disable)")
+#endif
   ;
   
@@ -2137 +2140 @@
   }
 #endif
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+  if (m_adaptiveResolutionChange > 0)
+  {
+    xConfirmPara(m_numLayers != 2, "Adaptive resolution change works with 2 layers only");
+    xConfirmPara(m_acLayerCfg[1].m_iIntraPeriod == 0 || (m_adaptiveResolutionChange % m_acLayerCfg[1].m_iIntraPeriod) != 0, "Adaptive resolution change must happen at enhancement layer RAP picture");
+  }
+#endif
 #undef xConfirmPara
   if (check_failed)
@@ -2175 +2185 @@
   printf("Multiview                     : %d\n", m_scalabilityMask[0] );
   printf("Scalable                      : %d\n", m_scalabilityMask[1] );
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+  printf("Adaptive Resolution Change    : %d\n", m_adaptiveResolutionChange );
+#endif
   for(UInt layer=0; layer<m_numLayers; layer++)
   {

branches/SHM-2.1-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -369 +369 @@
   Int*      m_constantPicRateIdc;                                ///< Indicates constant picture rate idc for various sub-layers
 #endif
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+  Int       m_adaptiveResolutionChange;                       ///< Indicate adaptive resolution change frame
+#endif
 public:
   TAppEncCfg();

branches/SHM-2.1-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -515 +515 @@
     }
 #endif
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+    m_acTEncTop[layer].setAdaptiveResolutionChange( m_adaptiveResolutionChange );
+#endif
   }
 }
@@ -1031 +1034 @@
     vps->setMaxOneActiveRefLayerFlag(maxDirectRefLayers > 1 ? false : true); 
 #endif 
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+  vps->setSingleLayerForNonIrapFlag(m_adaptiveResolutionChange > 0 ? true : false);
+#endif
 #else
   m_cTEncTop.init();
@@ -1150 +1156 @@
 #endif
 
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+    if (m_adaptiveResolutionChange)
+    {
+      for(UInt layer = 0; layer < m_numLayers; layer++)
+      {
+        TComList<TComPicYuv*>::iterator iterPicYuvRec;
+        for (iterPicYuvRec = m_acListPicYuvRec[layer].begin(); iterPicYuvRec != m_acListPicYuvRec[layer].end(); iterPicYuvRec++)
+        {
+          TComPicYuv* recPic = *(iterPicYuvRec);
+          recPic->setReconstructed(false);
+        }
+      }
+    }
+#endif
+
     // loop through frames in one GOP 
     for ( UInt iPicIdInGOP=0; iPicIdInGOP < (bFirstFrame? 1:m_iGOPSize); iPicIdInGOP++ )
@@ -1416 +1437 @@
   {
     TComPicYuv*  pcPicYuvRec  = *(iterPicYuvRec++);
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+    if (!m_acLayerCfg[layer].getReconFile().empty() && pcPicYuvRec->isReconstructed())
+#else
     if (!m_acLayerCfg[layer].getReconFile().empty())
+#endif
     {
       m_acTVideoIOYuvReconFile[layer].write( pcPicYuvRec, m_acLayerCfg[layer].getConfLeft(), m_acLayerCfg[layer].getConfRight(), 
@@ -1430 +1455 @@
   list<AccessUnit>::const_iterator iterBitstream = accessUnits.begin();
 
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+  for ( i = 0; i < iNumEncoded && iterBitstream != accessUnits.end(); i++ )
+#else
   for ( i = 0; i < iNumEncoded; i++ )
+#endif
   {
     const AccessUnit& au = *(iterBitstream++);