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

Timestamp:

6 Jul 2015, 21:03:54 (11 years ago)

Author:

seregin

Message:

macro cleanup: CROSS_LAYER_BLA_FLAG_FIX

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)

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

@@ -1232 +1232 @@
   {
 #if SVC_EXTENSION
-#if CROSS_LAYER_BLA_FLAG_FIX
     Int iBits = 0;
     if(pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits)
-#else
-    if(pcSlice->getPPS()->getNumExtraSliceHeaderBits()>0)
-#endif
     {
       READ_FLAG(uiCode, "discardable_flag"); // ignored
@@ -1251 +1247 @@
       }
 #endif
-#if CROSS_LAYER_BLA_FLAG_FIX
       iBits++;
-#endif
-    }
-#if CROSS_LAYER_BLA_FLAG_FIX
+    }
+
     if(pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits)
     {
@@ -1261 +1255 @@
       iBits++;
     }
+
     for ( ; iBits < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); iBits++)
-#else
-    for (Int i = 1; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++)
-#endif
     {
       READ_FLAG(uiCode, "slice_reserved_undetermined_flag[]"); // ignored