Changeset 437 in SHVCSoftware for branches/SHM-3.1-dev/source/Lib/TLibEncoder

Timestamp:

15 Oct 2013, 15:17:33 (11 years ago)

Author:

nokia

Message:

fix spec inconsistencies and a typo (tileIdx -> tileSetIdx) in tile sets implementation

Location:

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

Files:

• SEIwrite.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (1 diff)
• TEncSearch.cpp (modified) (1 diff)

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

@@ -581 +581 @@
       WRITE_FLAG( sei.m_skippedTileSetPresentFlag,            "skipped_tile_set_present_flag"                );
     }
-    UInt numSignificantSets = sei.m_ilNumSetsInMessageMinus1 + (sei.m_skippedTileSetPresentFlag ? 1 : 0) + 1;
-    for( UInt i = 0; i <= numSignificantSets; i++ )
+    UInt numSignificantSets = sei.m_ilNumSetsInMessageMinus1 - (sei.m_skippedTileSetPresentFlag ? 1 : 0) + 1;
+    for( UInt i = 0; i < numSignificantSets; i++ )
     {
       WRITE_UVLC( sei.m_ilctsId[i],                           "ilcts_id"                                     );

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

@@ -324 +324 @@
       seiInterLayerConstrainedTileSets->m_skippedTileSetPresentFlag = false;
     }
-    UInt numSignificantSets = seiInterLayerConstrainedTileSets->m_ilNumSetsInMessageMinus1 - (seiInterLayerConstrainedTileSets->m_skippedTileSetPresentFlag ? 1 : 0) + 1;
-    for (UInt i = 0; i < numSignificantSets; i++)
+    seiInterLayerConstrainedTileSets->m_ilNumSetsInMessageMinus1 += seiInterLayerConstrainedTileSets->m_skippedTileSetPresentFlag ? 1 : 0;
+    for (UInt i = 0; i < m_pcCfg->getIlNumSetsInMessage(); i++)
     {
       seiInterLayerConstrainedTileSets->m_ilctsId[i] = i;

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

@@ -3223 +3223 @@
 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI
   Bool disableILP = false;
-  if (pcCU->getPic()->getLayerId() > 0 && m_pcEncCfg->getInterLayerConstrainedTileSetsSEIEnabled() /*&& pcCU->getPic()->getPicSym()->getTileIdxMap(pcCU->getAddr()) >= 0*/) //always true condition is commented out
+  if (pcCU->getPic()->getLayerId() == (m_pcEncCfg->getNumLayer() - 1)  && m_pcEncCfg->getInterLayerConstrainedTileSetsSEIEnabled() && pcCU->getPic()->getPicSym()->getTileSetIdxMap(pcCU->getAddr()) >= 0)
   {
     if (pcCU->getPic()->getPicSym()->getTileSetType(pcCU->getAddr()) == 2)