Changeset 1218 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

8 Jul 2015, 23:49:21 (9 years ago)

Author:

seregin

Message:

macro cleanup: OLS_IDX_CHK

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• SEIread.cpp (modified) (3 diffs)
• SEIread.h (modified) (1 diff)

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

@@ -330 +330 @@
    case SEI::SUB_BITSTREAM_PROPERTY:
      sei = new SEISubBitstreamProperty;
-#if OLS_IDX_CHK
      xParseSEISubBitstreamProperty((SEISubBitstreamProperty&) *sei, vps, pDecodedMessageOutputStream);
-#else
-     xParseSEISubBitstreamProperty((SEISubBitstreamProperty&) *sei, pDecodedMessageOutputStream);
-#endif
      break;
 #endif
@@ -1489 +1485 @@
 
 #if SUB_BITSTREAM_PROPERTY_SEI
-#if OLS_IDX_CHK
 Void SEIReader::xParseSEISubBitstreamProperty(SEISubBitstreamProperty &sei, TComVPS *vps, std::ostream *pDecodedMessageOutputStream)
-#else
-Void SEIReader::xParseSEISubBitstreamProperty(SEISubBitstreamProperty &sei, std::ostream *pDecodedMessageOutputStream)
-#endif
 {
   UInt uiCode;
@@ -1503 +1495 @@
     sei_read_code( pDecodedMessageOutputStream,  2, uiCode, "sub_bitstream_mode[i]"           ); sei.m_subBitstreamMode[i] = uiCode;
     sei_read_uvlc( pDecodedMessageOutputStream,     uiCode, "output_layer_set_idx_to_vps[i]"  );
-#if OLS_IDX_CHK
-      // The value of output_layer_set_idx_to_vps[ i ]  shall be in the range of 0 to NumOutputLayerSets − 1, inclusive.
-      assert(uiCode > 0 && uiCode <= vps->getNumOutputLayerSets()-1);
-#endif
-      sei.m_outputLayerSetIdxToVps[i] = uiCode;
+
+    // The value of output_layer_set_idx_to_vps[ i ]  shall be in the range of 0 to NumOutputLayerSets − 1, inclusive.
+    assert(uiCode > 0 && uiCode <= vps->getNumOutputLayerSets()-1);
+
+    sei.m_outputLayerSetIdxToVps[i] = uiCode;
+
     sei_read_code( pDecodedMessageOutputStream,  3, uiCode, "highest_sub_layer_id[i]"         ); sei.m_highestSublayerId[i] = uiCode;
     sei_read_code( pDecodedMessageOutputStream, 16, uiCode, "avg_bit_rate[i]"                 ); sei.m_avgBitRate[i] = uiCode;

branches/SHM-dev/source/Lib/TLibDecoder/SEIread.h

@@ -117 +117 @@
 #endif
 #if SUB_BITSTREAM_PROPERTY_SEI
-#if OLS_IDX_CHK
 Void   xParseSEISubBitstreamProperty          (SEISubBitstreamProperty &sei, TComVPS *vps, std::ostream *pDecodedMessageOutputStream);
-#else
-Void   xParseSEISubBitstreamProperty          (SEISubBitstreamProperty &sei, std::ostream *pDecodedMessageOutputStream);
-#endif
 #endif
 #if LAYERS_NOT_PRESENT_SEI