Changeset 1222 in SHVCSoftware for branches/SHM-dev

Timestamp:

9 Jul 2015, 00:03:51 (9 years ago)

Author:

seregin

Message:

macro cleanup: DISCARDABLE_PIC_RPS

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (3 diffs)
• TypeDef.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -474 +474 @@
       {
         numInterLayerRPSPics++;
-#if DISCARDABLE_PIC_RPS
+
         assert( ilpPic[i]->getSlice(0)->getDiscardableFlag() == 0 );    // Inter-layer RPS shall not contain picture with discardable_flag = 1.
-#endif
       }
     }
@@ -1392 +1391 @@
 
     }
-#if DISCARDABLE_PIC_RPS
+
+#if SVC_EXTENSION
     if( isReference ) // Current picture is in the temporal RPS
     {
@@ -1398 +1398 @@
     }
 #endif
+
     // mark the picture as "unused for reference" if it is not in
     // the Reference Picture Set

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

@@ -47 +47 @@
 #define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
 
-#define DISCARDABLE_PIC_RPS              1      ///< JCTVC-P0130: Inter-layer RPS and temporal RPS should not contain picture with discardable_flag equal to 1
-
 #define O0164_MULTI_LAYER_HRD            1      ///< JCTVC-O0164: Multi-layer HRD operation