Changeset 1067 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

5 Mar 2015, 01:07:47 (10 years ago)

Author:

seregin

Message:

fix default layerID setting

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (1 diff)
• TAppEncTop.cpp (modified) (1 diff)

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

@@ -1948 +1948 @@
   for(Int layer = 0; layer < MAX_LAYERS; layer++)
   {
+    if( m_acLayerCfg[layer].m_layerId < 0 )
+    {
+      m_acLayerCfg[layer].m_layerId = layer;
+    }
+
     m_acLayerCfg[layer].m_MSBExtendedBitDepth[CHANNEL_TYPE_LUMA  ] = m_acLayerCfg[layer].m_inputBitDepth      [CHANNEL_TYPE_LUMA  ];
     m_acLayerCfg[layer].m_MSBExtendedBitDepth[CHANNEL_TYPE_CHROMA] = m_acLayerCfg[layer].m_MSBExtendedBitDepth[CHANNEL_TYPE_LUMA  ];

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

@@ -301 +301 @@
 #endif
     // set layer ID
-    m_acTEncTop[layer].setLayerId                                         ( m_acLayerCfg[layer].m_layerId == -1 ? layer : m_acLayerCfg[layer].m_layerId );
+    m_acTEncTop[layer].setLayerId                                         ( m_acLayerCfg[layer].m_layerId );
     m_acTEncTop[layer].setNumLayer                                        ( m_numLayers );
     m_acTEncTop[layer].setLayerEnc                                        ( m_apcTEncTop );