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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: CROSS_LAYER_BLA_FLAG_FIX

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

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

@@ -955 +955 @@
   {
 #if SVC_EXTENSION
-#if CROSS_LAYER_BLA_FLAG_FIX
     Int iBits = 0;
     if(pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits)
-#else
-    if (pcSlice->getPPS()->getNumExtraSliceHeaderBits()>0)
-#endif
     {
       assert(!!"discardable_flag");
@@ -974 +970 @@
 #endif
       WRITE_FLAG(pcSlice->getDiscardableFlag(), "discardable_flag");
-#if CROSS_LAYER_BLA_FLAG_FIX
       iBits++;
-#endif
-    }
-#if CROSS_LAYER_BLA_FLAG_FIX
+    }
+
     if( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits )
     {
@@ -985 +979 @@
       iBits++;
     }
+
     for (; iBits < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); iBits++)
-#else
-    for (Int i = 1; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++)
-#endif
     {
       assert(!!"slice_reserved_undetermined_flag[]");