Changeset 783 in SHVCSoftware

Timestamp:

6 Jun 2014, 19:13:43 (10 years ago)

Author:

seregin

Message:

remove SPL_FLG_CHK

Location:

branches/SHM-6-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

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

@@ -133 +133 @@
 #endif
 
-#define SPL_FLG_CHK                      1      ///< JCTVC-N0195 proposal 5, JCTVC-N0085: constrain sum of lengths to be less than or equal to 6
 #define ILP_NUM_REF_CHK                  1      ///< JCTVC-N0195 proposal 1, JCTVC-N0081, JCTVC-N0154, JCTVC-N0217: a condition on signaling inter_layer_pred_layer_idc[ i ], to avoid sending when NumDirectRefLayers equals NumActiveRefLayerPics, and instead infer values
 

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

@@ -1102 +1102 @@
   }
 
+  // The value of dimBitOffset[ NumScalabilityTypes ] is set equal to 6.
   if(vps->getSplittingFlag())
   {

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

@@ -880 +880 @@
   }
 
-#if SPL_FLG_CHK
+  // The value of dimBitOffset[ NumScalabilityTypes ] is set equal to 6.
   if(vps->getSplittingFlag())
   {
@@ -890 +890 @@
     assert(splDimSum<=6);
   }
-#endif
 
   WRITE_FLAG( vps->getNuhLayerIdPresentFlag(),         "vps_nuh_layer_id_present_flag" );