Changeset 1434 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

Timestamp:

11 Aug 2015, 20:47:57 (9 years ago)

Author:

seregin

Message:

port rev 4588

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (5 diffs)

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

@@ -635 +635 @@
     seiMessages.push_back(sei);
   }
+  if(m_pcCfg->getChromaResamplingFilterHintEnabled())
+  {
+    SEIChromaResamplingFilterHint *seiChromaResamplingFilterHint = new SEIChromaResamplingFilterHint;
+    m_seiEncoder.initSEIChromaResamplingFilterHint(seiChromaResamplingFilterHint, m_pcCfg->getChromaResamplingHorFilterIdc(), m_pcCfg->getChromaResamplingVerFilterIdc());
+    seiMessages.push_back(seiChromaResamplingFilterHint);
+  }
 
 #if SVC_EXTENSION
@@ -890 +896 @@
     m_seiEncoder.initSEIRecoveryPoint(recoveryPointSEI, slice);
     seiMessages.push_back(recoveryPointSEI);
-
-    if(m_pcCfg->getDecodingRefreshType() == 3)
-    {
-      m_iLastRecoveryPicPOC = slice->getPOC();
-    }
   }
   if (m_pcCfg->getTemporalLevel0IndexSEIEnabled())
@@ -901 +902 @@
     m_seiEncoder.initTemporalLevel0IndexSEI(temporalLevel0IndexSEI, slice);
     seiMessages.push_back(temporalLevel0IndexSEI);
-  }
-
-  if(slice->getSPS()->getVuiParametersPresentFlag() && m_pcCfg->getChromaSamplingFilterHintEnabled() && ( slice->getSliceType() == I_SLICE ))
-  {
-    SEIChromaSamplingFilterHint *seiChromaSamplingFilterHint = new SEIChromaSamplingFilterHint;
-    m_seiEncoder.initSEIChromaSamplingFilterHint(seiChromaSamplingFilterHint, m_pcCfg->getChromaSamplingHorFilterIdc(), m_pcCfg->getChromaSamplingVerFilterIdc());
-    seiMessages.push_back(seiChromaSamplingFilterHint);
   }
 
@@ -1714 +1708 @@
       pcSlice->setMFMEnabledFlag(false);
     }
-#endif //SVC_EXTENSION    
+#endif //SVC_EXTENSION
+
     pcSlice->setLastIDR(m_iLastIDR);
     pcSlice->setSliceIdx(0);
@@ -1916 +1911 @@
       }
     }
+
     if (m_pcCfg->getEfficientFieldIRAPEnabled())
     {