Changeset 1488 in SHVCSoftware

Timestamp:

24 Nov 2015, 03:56:55 (9 years ago)

Author:

fujitsu

Message:

Fixed small error related to FORMATIDX_CHECK, checking that cfg files do not set two layers with different parameters but same formatID.

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (2 diffs)

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

@@ -1986 +1986 @@
     }
 #if FORMATIDX_CHECK
-    for(Int compareLayer = layer+1; compareLayer < m_numLayers; compareLayer++ )
+    for(Int compareLayer = 0; compareLayer < layer; compareLayer++ )
     {
       if(m_apcLayerCfg[layer]->m_repFormatIdx == m_apcLayerCfg[compareLayer]->m_repFormatIdx && (
@@ -1993 +1993 @@
            || m_apcLayerCfg[layer]->m_iSourceWidth != m_apcLayerCfg[compareLayer]->m_iSourceWidth
            || m_apcLayerCfg[layer]->m_iSourceHeight != m_apcLayerCfg[compareLayer]->m_iSourceHeight
-           || m_apcLayerCfg[layer]->m_internalBitDepth != m_apcLayerCfg[compareLayer]->m_internalBitDepth
+           || m_apcLayerCfg[layer]->m_internalBitDepth[0] != m_apcLayerCfg[compareLayer]->m_internalBitDepth[0]
+           || m_apcLayerCfg[layer]->m_internalBitDepth[1] != m_apcLayerCfg[compareLayer]->m_internalBitDepth[1]
            || m_apcLayerCfg[layer]->m_confWinLeft != m_apcLayerCfg[compareLayer]->m_confWinLeft
            || m_apcLayerCfg[layer]->m_confWinRight != m_apcLayerCfg[compareLayer]->m_confWinRight