Changeset 774 in SHVCSoftware

Timestamp:

12 May 2014, 20:54:21 (11 years ago)

Author:

seregin

Message:

fix code compiler warning and code formatting

Location:

branches/SHM-6-dev/source/Lib

Files:

• TLibCommon/TComSlice.h (modified) (1 diff)
• TLibDecoder/SEIread.cpp (modified) (3 diffs)
• TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• TLibEncoder/SEIwrite.cpp (modified) (1 diff)

branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.h

@@ -735 +735 @@
 #endif
 #if HRD_BPB
-    Int getBspHrdParamBufferCpbCntMinus1(UInt i, UInt sl)
-    {
-        return m_bspHrd->getCpbCntMinus1(sl);
-    }
+  Int getBspHrdParamBufferCpbCntMinus1(UInt i, UInt sl)
+  {
+    return m_bspHrd->getCpbCntMinus1(sl);
+  }
 #endif
 

branches/SHM-6-dev/source/Lib/TLibDecoder/SEIread.cpp

@@ -1210 +1210 @@
     READ_UVLC( uiCode, "num_sei_bitstream_partitions_minus1[i]"); sei.m_seiNumBitstreamPartitionsMinus1[lsIdx] = uiCode;
 #if HRD_BPB
-      Int chkPart=0;
-#endif
-      UInt i;
-    for (i = 0; i <= sei.m_seiNumBitstreamPartitionsMinus1[lsIdx]; i++)
+    Int chkPart=0;
+#endif
+    UInt i;
+    for(i = 0; i <= sei.m_seiNumBitstreamPartitionsMinus1[lsIdx]; i++)
     {
 #if HRD_BPB
-        UInt nl=0; UInt j;
-    for (j = 0 ; j < sei.m_vpsMaxLayers; j++)
-      {
-          if (sei.m_layerIdIncludedFlag[lsIdx][j])
-              nl++;
-      }
-    for (j = 0; j < nl; j++)
+      UInt nl=0; UInt j;
+      for(j = 0; j < sei.m_vpsMaxLayers; j++)
+      {
+        if (sei.m_layerIdIncludedFlag[lsIdx][j])
+        {
+          nl++;
+        }
+      }
+      for (j = 0; j < nl; j++)
       {
 #else
@@ -1236 +1238 @@
 #endif
 #if HRD_BPB
-        chkPart+=sei.m_seiLayerInBspFlag[lsIdx][i][j];
+      chkPart+=sei.m_seiLayerInBspFlag[lsIdx][i][j];
 #endif
     }
 #if HRD_BPB
-      assert(chkPart<=1);
+    assert(chkPart<=1);
 #endif
 #if HRD_BPB
-      if(sei.m_seiNumBitstreamPartitionsMinus1[lsIdx]==0)
-      {
-          Int chkPartition1=0; Int chkPartition2=0;
-          for (UInt j = 0; j < sei.m_vpsMaxLayers; j++)
-          {
-              if( sei.m_layerIdIncludedFlag[lsIdx][j] )
-              {
-                  chkPartition1+=sei.m_seiLayerInBspFlag[lsIdx][i][j];
-                  chkPartition2++;
-              }
-          }
-          assert(chkPartition1!=chkPartition2);
-      }
+    if(sei.m_seiNumBitstreamPartitionsMinus1[lsIdx]==0)
+    {
+      Int chkPartition1=0; Int chkPartition2=0;
+      for (UInt j = 0; j < sei.m_vpsMaxLayers; j++)
+      {
+        if( sei.m_layerIdIncludedFlag[lsIdx][j] )
+        {
+          chkPartition1+=sei.m_seiLayerInBspFlag[lsIdx][i][j];
+          chkPartition2++;
+        }
+      }
+      assert(chkPartition1!=chkPartition2);
+    }
 #endif
       
     READ_UVLC( uiCode, "sei_num_bsp_sched_combinations_minus1[i]"); sei.m_seiNumBspSchedCombinationsMinus1[lsIdx] = uiCode;
-    for (UInt i = 0; i <= sei.m_seiNumBspSchedCombinationsMinus1[lsIdx]; i++)
+    for (i = 0; i <= sei.m_seiNumBspSchedCombinationsMinus1[lsIdx]; i++)
     {
       for (UInt j = 0; j <= sei.m_seiNumBitstreamPartitionsMinus1[lsIdx]; j++)
@@ -1265 +1267 @@
         READ_UVLC( uiCode, "sei_bsp_comb_hrd_idx[lsIdx][i][j]"); sei.m_seiBspCombHrdIdx[lsIdx][i][j] = uiCode;
 #if HRD_BPB
-          assert(uiCode <= sei.m_seiNumBspHrdParametersMinus1);
+        assert(uiCode <= sei.m_seiNumBspHrdParametersMinus1);
 #endif
         READ_UVLC( uiCode, "sei_bsp_comb_sched_idx[lsIdx][i][j]"); sei.m_seiBspCombScheddx[lsIdx][i][j] = uiCode;
 #if HRD_BPB
-          assert(uiCode <=  sei.hrd->getCpbCntMinus1( sps->getMaxTLayers()-1 ));
+        assert(uiCode <= sei.hrd->getCpbCntMinus1( sps->getMaxTLayers()-1 ));
 #endif
 

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

@@ -2311 +2311 @@
         READ_UVLC( uiCode, "num_bitstream_partitions[i]"); vps->setNumBitstreamPartitions(h, uiCode);
 #if HRD_BPB
-          Int chkPart=0;
+        Int chkPart=0;
 #endif
         for( i = 0; i < vps->getNumBitstreamPartitions(h); i++ )
@@ -2323 +2323 @@
           }
 #if HRD_BPB
-            chkPart+=vps->getLayerInBspFlag(h, i, j);
+          chkPart+=vps->getLayerInBspFlag(h, i, j);
 #endif
         }
 #if HRD_BPB
-          assert(chkPart<=1);
+        assert(chkPart<=1);
 #endif
 #if HRD_BPB
-          if(vps->getNumBitstreamPartitions(h)==1)
+        if(vps->getNumBitstreamPartitions(h)==1)
+        {
+          Int chkPartition1=0; Int chkPartition2=0;
+          for( j = 0; j <= (vps->getMaxLayers()-1); j++ )
           {
-              Int chkPartition1=0; Int chkPartition2=0;
-              for( j = 0; j <= (vps->getMaxLayers()-1); j++ )
-              {
-                  if( vps->getLayerIdIncludedFlag(h, j) )
-                  {
-                      chkPartition1+=vps->getLayerInBspFlag(h, 0, j);
-                      chkPartition2++;
-                  }
-              }
-              assert(chkPartition1!=chkPartition2);
+            if( vps->getLayerIdIncludedFlag(h, j) )
+            {
+              chkPartition1+=vps->getLayerInBspFlag(h, 0, j);
+              chkPartition2++;
+            }
           }
+          assert(chkPartition1!=chkPartition2);
+        }
 #endif
         if (vps->getNumBitstreamPartitions(h))
@@ -2357 +2357 @@
               READ_UVLC( uiCode, "bsp_comb_hrd_idx[h][i][j]"); vps->setBspCombHrdIdx(h, i, j, uiCode);
 #if HRD_BPB
-                assert(uiCode <= vps->getVpsNumBspHrdParametersMinus1());
+              assert(uiCode <= vps->getVpsNumBspHrdParametersMinus1());
 #endif
                 
               READ_UVLC( uiCode, "bsp_comb_sched_idx[h][i][j]"); vps->setBspCombSchedIdx(h, i, j, uiCode);
 #if HRD_BPB
-                assert(uiCode <= vps->getBspHrdParamBufferCpbCntMinus1(uiCode,vps->getMaxTLayers()-1));
+              assert(uiCode <= vps->getBspHrdParamBufferCpbCntMinus1(uiCode,vps->getMaxTLayers()-1));
 #endif
             }

branches/SHM-6-dev/source/Lib/TLibEncoder/SEIwrite.cpp

@@ -894 +894 @@
     {
 #if HRD_BPB
-        UInt nl=0;
-     for (UInt j = 0; j < sei.m_vpsMaxLayers; j++)
-     {
-            if (sei.m_layerIdIncludedFlag[lsIdx][j])
-                nl++;
-     }
-     for (UInt j = 0; j < nl; j++)
-     {
+      UInt nl=0;
+      for (UInt j = 0; j < sei.m_vpsMaxLayers; j++)
+      {
+        if (sei.m_layerIdIncludedFlag[lsIdx][j])
+        {
+          nl++;
+        }
+      }
+      for (UInt j = 0; j < nl; j++)
+      {
 #else
       for (UInt j = 0; j < sei.m_vpsMaxLayers; j++)