Changeset 401 in SHVCSoftware

Timestamp:

18 Sep 2013, 08:14:31 (11 years ago)

Author:

sony

Message:

TEMP_SCALABILITY_FIX: encoder fix to handle temporal scalability configuration

Location:

branches/SHM-3.1-dev/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncSlice.cpp (modified) (1 diff)

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

@@ -1574 +1574 @@
     xConfirmPara(errorGOP,"Invalid GOP structure given");
   }
+#if TEMP_SCALABILITY_FIX
+  if( m_acLayerCfg[1].m_GOPListLayer[5].m_POC == 6  && m_acLayerCfg[1].m_GOPListLayer[7].m_POC == 7  && 
+    m_acLayerCfg[1].m_GOPListLayer[5].m_temporalId == 0 && m_acLayerCfg[1].m_GOPListLayer[7].m_temporalId == 0)
+#else
   //tentative for encoder
   if( m_acLayerCfg[1].m_GOPListLayer[5].m_POC == 6  && m_acLayerCfg[1].m_GOPListLayer[7].m_POC == 7 )
+#endif
   {
     //RA, POC5

branches/SHM-3.1-dev/source/Lib/TLibCommon/TypeDef.h

@@ -54 +54 @@
 #if FINAL_RPL_CHANGE_N0082
 #define EXTERNAL_USEDBYCURR_N0082        1      ///< N0082: final ref picture list change (encoder) //dev ver.
+#define TEMP_SCALABILITY_FIX             1      ///< fix for temporal scalability
 #endif
 #define M0463_VUI_EXT_ILP_REF            0      ///< VUI extension inter-layer dependency offset signalling

branches/SHM-3.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -140 +140 @@
 #if SVC_EXTENSION
 #if !REPN_FORMAT_IN_VPS
-Void TDecTop::xInitILRP(TComSPS *pcSPS
+Void TDecTop::xInitILRP(TComSPS *pcSPS)
 #else
 Void TDecTop::xInitILRP(TComSlice *slice)

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

@@ -479 +479 @@
   
   pcPic->setTLayer( m_pcCfg->getGOPEntry(iGOPid).m_temporalId );
+#if TEMP_SCALABILITY_FIX
+  if((eSliceType==I_SLICE) || (rpcSlice->getPOC() == 0))
+#else
   if(eSliceType==I_SLICE)
+#endif
   {
     pcPic->setTLayer(0);