Changeset 635 in SHVCSoftware for branches/SHM-5.1-dev/source/App

Timestamp:

17 Mar 2014, 22:45:53 (11 years ago)

Author:

seregin

Message:

fix compiler warnings, reported by J. Chen

File:

• branches/SHM-5.1-dev/source/App/TAppEncoder/TAppEncTop.cpp (modified) (5 diffs)

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

@@ -1363 +1363 @@
   for( UInt layerId = 1; layerId < m_numLayers; layerId++ )
   {
-    for(Int i = 0; i < m_acLayerCfg[layerId].m_numScaledRefLayerOffsets; i++)
+    for( i = 0; i < m_acLayerCfg[layerId].m_numScaledRefLayerOffsets; i++ )
     {
       if( m_acTEncTop[layerId].getVertPhasePositionEnableFlag(i) )
@@ -1383 +1383 @@
     vps->setVpsNumBspHrdParametersMinus1(vps->getNumLayerSets() - 2); 
     vps->createBspHrdParamBuffer(vps->getVpsNumBspHrdParametersMinus1() + 1);
-    for (UInt i = 0; i <= vps->getVpsNumBspHrdParametersMinus1(); i++)
+    for ( i = 0; i <= vps->getVpsNumBspHrdParametersMinus1(); i++ )
     {
       vps->setBspCprmsPresentFlag(i, true);
@@ -1392 +1392 @@
       Int iPicWidth         = pcCfgLayer->getSourceWidth();
       Int iPicHeight        = pcCfgLayer->getSourceHeight();
-      UInt uhTotalDepth      = m_uiMaxCUDepth;
-      UInt uiNumPartitions   = 1<<(uhTotalDepth<<1);
-      UInt uiMinCUWidth      = m_uiMaxCUWidth  >> uhTotalDepth;
-      UInt uiMinCUHeight     = m_uiMaxCUHeight >> uhTotalDepth;
       UInt uiWidthInCU       = ( iPicWidth %m_uiMaxCUWidth  ) ? iPicWidth /m_uiMaxCUWidth  + 1 : iPicWidth /m_uiMaxCUWidth;
       UInt uiHeightInCU      = ( iPicHeight%m_uiMaxCUHeight ) ? iPicHeight/m_uiMaxCUHeight + 1 : iPicHeight/m_uiMaxCUHeight;
@@ -1409 +1405 @@
       vps->setBspHrdParameters( i, pcCfgLayer->getFrameRate(), numDU, pcCfgLayer->getTargetBitrate(), ( pcCfgLayer->getIntraPeriod() > 0 ) );
     }
-    for (UInt h = 1; h <= (vps->getNumLayerSets()-1); h++)
+    for(UInt h = 1; h <= (vps->getNumLayerSets()-1); h++)
     {
       vps->setNumBitstreamPartitions(h, 1);
-      for (UInt i = 0; i < vps->getNumBitstreamPartitions(h); i++)
-      {
-        for (UInt j = 0; j <= (vps->getMaxLayers()-1); j++)
+      for( i = 0; i < vps->getNumBitstreamPartitions(h); i++ )
+      {
+        for( UInt j = 0; j <= (vps->getMaxLayers()-1); j++ )
         {
           if (vps->getLayerIdIncludedFlag(h, j) && h == j)
@@ -1423 +1419 @@
       }
       vps->setNumBspSchedCombinations(h, 1);
-      for (UInt i = 0; i < vps->getNumBspSchedCombinations(h); i++)
-      {
-        for (UInt j = 0; j < vps->getNumBitstreamPartitions(h); j++)
+      for( i = 0; i < vps->getNumBspSchedCombinations(h); i++ )
+      {
+        for( UInt j = 0; j < vps->getNumBitstreamPartitions(h); j++ )
         {
           vps->setBspCombHrdIdx(h, i, j, 0);