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

Timestamp:

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

Author:

seregin

Message:

fix compiler warnings, reported by J. Chen

Location:

branches/SHM-5.1-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (4 diffs)
• TEncGOP.cpp (modified) (1 diff)

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