Changeset 1101 in SHVCSoftware

Timestamp:

6 Jul 2015, 20:23:02 (9 years ago)

Author:

seregin

Message:

macro cleanup: SHM_FIX7

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -208 +208 @@
 
 #define O0062_POC_LSB_NOT_PRESENT_FLAG   1      ///< JCTVC-O0062: signal poc_lsb_not_present_flag for each layer in VPS extension
-#define SHM_FIX7                         1      ///< fix for SHVC WD ticket #7
 
 #define O0092_0094_DEPENDENCY_CONSTRAINT 1      ///< JCTVC-O0092: constraint on the layer_id of SPS/PPS

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

@@ -1226 +1226 @@
 
 #if Q0142_POC_LSB_NOT_PRESENT
-#if SHM_FIX7
   Int iPOClsb = 0;
-#endif
 #endif
 

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

@@ -1034 +1034 @@
 
 #if N0065_LAYER_POC_ALIGNMENT
-#if SHM_FIX7
-    }
-#endif
-      if( !pcSlice->getIdrPicFlag() )
-      {
+    }
+    if( !pcSlice->getIdrPicFlag() )
+    {
 #endif
       TComReferencePictureSet* rps = pcSlice->getRPS();
@@ -1156 +1154 @@
 #endif
       }
-#if N0065_LAYER_POC_ALIGNMENT && !SHM_FIX7
-      }
-#endif
     }