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

Timestamp:

5 Mar 2015, 00:20:51 (10 years ago)

Author:

seregin

Message:

fix index for m_ppcTEncTop

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp (modified) (1 diff)

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

@@ -139 +139 @@
 {
 #if JCTVC_M0259_LAMBDAREFINEMENT
-  if( slice->getLayerId() > 0 && m_ppcTEncTop[slice->getLayerIdx()]->getNumActiveRefLayers() && depth >= 3 && m_pcCfg->getGOPSize() == ( 1 << depth ) )
-  {
-    Int layerIdx = slice->getLayerId();
+  Int layerIdx = slice->getLayerIdx();
+
+  if( slice->getLayerId() > 0 && m_ppcTEncTop[layerIdx]->getNumActiveRefLayers() && depth >= 3 && m_pcCfg->getGOPSize() == ( 1 << depth ) )
+  {
     UInt prevLayerIdx = 0; 
-    if (m_ppcTEncTop[layerIdx]->getNumActiveRefLayers() > 0)
+    if( m_ppcTEncTop[layerIdx]->getNumActiveRefLayers() > 0 )
     {
       prevLayerIdx = m_ppcTEncTop[layerIdx]->getPredLayerIdx( m_ppcTEncTop[layerIdx]->getNumActiveRefLayers() - 1);
     }
+
     Double gamma = xCalEnhLambdaFactor( m_ppcTEncTop[prevLayerIdx]->getQP() - m_ppcTEncTop[layerIdx]->getQP() ,
-      1.0 * m_ppcTEncTop[layerIdx]->getSourceWidth() * m_ppcTEncTop[layerIdx]->getSourceHeight()
-      / m_ppcTEncTop[prevLayerIdx]->getSourceWidth() / m_ppcTEncTop[prevLayerIdx]->getSourceHeight() );
+                                        1.0 * m_ppcTEncTop[layerIdx]->getSourceWidth() * m_ppcTEncTop[layerIdx]->getSourceHeight()
+                                        / m_ppcTEncTop[prevLayerIdx]->getSourceWidth() / m_ppcTEncTop[prevLayerIdx]->getSourceHeight() );
+
     dLambda *= gamma;
   }