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

Timestamp:

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

Author:

seregin

Message:

fix compiler warnings, reported by J. Chen

Location:

branches/SHM-5.1-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (5 diffs)
• Lib/TLibCommon/TComPrediction.cpp (modified) (1 diff)
• Lib/TLibCommon/TComPrediction.h (modified) (2 diffs)
• Lib/TLibCommon/TComRom.h (modified) (1 diff)
• Lib/TLibCommon/TComUpsampleFilter.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (4 diffs)
• Lib/TLibEncoder/TEncGOP.cpp (modified) (1 diff)

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);

branches/SHM-5.1-dev/source/Lib/TLibCommon/TComPrediction.cpp

@@ -768 +768 @@
 #if O0215_PHASE_ALIGNMENT
 #if O0194_JOINT_US_BITSHIFT
-Void TComPrediction::upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, bool phaseAlignFlag )
+Void TComPrediction::upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag )
 {
   m_cUsf.upsampleBasePic( currSlice, refLayerIdc, pcUsPic, pcBasePic, pcTempPic, window, phaseAlignFlag );
 }
 #else
-Void TComPrediction::upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, bool phaseAlignFlag )
+Void TComPrediction::upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag )
 {
   m_cUsf.upsampleBasePic( refLayerIdc, pcUsPic, pcBasePic, pcTempPic, window, phaseAlignFlag );

branches/SHM-5.1-dev/source/Lib/TLibCommon/TComPrediction.h

@@ -49 +49 @@
 
 #if SVC_UPSAMPLING
-#include "TComDataCU.h"
 #include "TComUpsampleFilter.h"
 #endif
@@ -122 +121 @@
 #if O0215_PHASE_ALIGNMENT
 #if O0194_JOINT_US_BITSHIFT
-  Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, bool phaseAlignFlag );
+  Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag );
 #else
-  Void upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, bool phaseAlignFlag );
+  Void upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag );
 #endif
 #else

branches/SHM-5.1-dev/source/Lib/TLibCommon/TComRom.h

@@ -273 +273 @@
 #if SVC_EXTENSION
 #if FAST_INTRA_SHVC
-extern       UInt  g_reducedSetIntraModes[NUM_INTRA_MODE-1];
-extern       UInt  g_predefSetIntraModes[NUM_INTRA_MODE-1];
+extern UInt g_reducedSetIntraModes[NUM_INTRA_MODE-1];
+extern UInt g_predefSetIntraModes[NUM_INTRA_MODE-1];
 #endif
 extern Int g_mvScalingFactor  [MAX_LAYERS][2];

branches/SHM-5.1-dev/source/Lib/TLibCommon/TComUpsampleFilter.h

@@ -45 +45 @@
 #if O0215_PHASE_ALIGNMENT
 #if O0194_JOINT_US_BITSHIFT
-  Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, bool phaseAlignFlag );
+  Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag );
 #else
-  Void upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, bool phaseAlignFlag );
+  Void upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag );
 #endif
 #else

branches/SHM-5.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2027 +2027 @@
       READ_UVLC( uiCode, "vps_num_bsp_hrd_parameters_minus1" ); vps->setVpsNumBspHrdParametersMinus1(uiCode);
       vps->createBspHrdParamBuffer(vps->getVpsNumBspHrdParametersMinus1() + 1);
-      for (UInt i = 0; i <= vps->getVpsNumBspHrdParametersMinus1(); i++)
-      {
-        if (i > 0)
+      for( i = 0; i <= vps->getVpsNumBspHrdParametersMinus1(); i++ )
+      {
+        if( i > 0 )
         {
           READ_FLAG( uiCode, "bsp_cprms_present_flag[i]" ); vps->setBspCprmsPresentFlag(i, uiCode);
@@ -2035 +2035 @@
         parseHrdParameters(vps->getBspHrd(i), i==0 ? 1 : vps->getBspCprmsPresentFlag(i), vps->getMaxTLayers()-1);
       }
-      for (UInt h = 1; h <= (vps->getNumLayerSets()-1); h++)
+      for( UInt h = 1; h <= (vps->getNumLayerSets()-1); h++ )
       {
         READ_UVLC( uiCode, "num_bitstream_partitions[i]"); vps->setNumBitstreamPartitions(h, uiCode);
-        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( j = 0; j <= (vps->getMaxLayers()-1); j++ )
           {
-            if (vps->getLayerIdIncludedFlag(h, j))
+            if( vps->getLayerIdIncludedFlag(h, j) )
             {
               READ_FLAG( uiCode, "layer_in_bsp_flag[h][i][j]" ); vps->setLayerInBspFlag(h, i, j, uiCode);
@@ -2051 +2051 @@
         {
           READ_UVLC( uiCode, "num_bsp_sched_combinations[h]"); vps->setNumBspSchedCombinations(h, uiCode);
-          for (UInt i = 0; i < vps->getNumBspSchedCombinations(h); i++)
+          for( i = 0; i < vps->getNumBspSchedCombinations(h); i++ )
           {
-            for (UInt j = 0; j < vps->getNumBitstreamPartitions(h); j++)
+            for( j = 0; j < vps->getNumBitstreamPartitions(h); j++ )
             {
               READ_UVLC( uiCode, "bsp_comb_hrd_idx[h][i][j]"); vps->setBspCombHrdIdx(h, i, j, uiCode);

branches/SHM-5.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1524 +1524 @@
     {
       WRITE_UVLC( vps->getVpsNumBspHrdParametersMinus1(), "vps_num_bsp_hrd_parameters_minus1" );
-      for (UInt i = 0; i <= vps->getVpsNumBspHrdParametersMinus1(); i++)
-      {
-        if (i > 0)
+      for( i = 0; i <= vps->getVpsNumBspHrdParametersMinus1(); i++ )
+      {
+        if( i > 0 )
         {
           WRITE_FLAG( vps->getBspCprmsPresentFlag(i), "bsp_cprms_present_flag[i]" );
@@ -1532 +1532 @@
         codeHrdParameters(vps->getBspHrd(i), i==0 ? 1 : vps->getBspCprmsPresentFlag(i), vps->getMaxTLayers()-1);
       }
-      for (UInt h = 1; h <= (vps->getNumLayerSets()-1); h++)
+      for( UInt h = 1; h <= (vps->getNumLayerSets()-1); h++ )
       {
         WRITE_UVLC( vps->getNumBitstreamPartitions(h), "num_bitstream_partitions[i]");
-        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( j = 0; j <= (vps->getMaxLayers()-1); j++ )
           {
             if (vps->getLayerIdIncludedFlag(h, j))
@@ -1548 +1548 @@
         {
           WRITE_UVLC( vps->getNumBspSchedCombinations(h), "num_bsp_sched_combinations[h]");
-          for (UInt i = 0; i < vps->getNumBspSchedCombinations(h); i++)
+          for( i = 0; i < vps->getNumBspSchedCombinations(h); i++ )
           {
-            for (UInt j = 0; j < vps->getNumBitstreamPartitions(h); j++)
+            for( j = 0; j < vps->getNumBitstreamPartitions(h); j++ )
             {
               WRITE_UVLC( vps->getBspCombHrdIdx(h, i, j), "bsp_comb_hrd_idx[h][i][j]");
@@ -2240 +2240 @@
     if( slice->getPocMsbValPresentFlag() )
     {
-      Int iMaxPOClsb = 1<< slice->getSPS()->getBitsForPOC();
-
       UInt lengthVal = 1;
       UInt tempVal = slice->getPocMsbVal() + 1;

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

@@ -1753 +1753 @@
       if (pcSlice->getLayerId() == 0 && m_pcEncTop->getVPS()->getVpsVuiBspHrdPresentFlag())
       {
-        OutputNALUnit nalu(NAL_UNIT_PREFIX_SEI, 0, 1);
+        nalu = NALUnit(NAL_UNIT_PREFIX_SEI, 0, 1);
         m_pcEntropyCoder->setEntropyCoder(m_pcCavlcCoder, pcSlice);
         m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);