Changeset 859 in 3DVCSoftware

Timestamp:

2 Mar 2014, 03:30:00 (11 years ago)

Author:

qualcomm

Message:

JCTVC-P0130: Discardable pictures shall not be present in RPS (Macro: H_MV_HLS_7_MISC_P0130_20)

Added assert statements to ensure that discardable pictures are not present in the temporal RPS and inter-layer RPS.

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/HTM-10.0-dev0/source/Lib/TLibCommon

Files:

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

branches/HTM-10.0-dev0/source/Lib/TLibCommon/TComSlice.cpp

@@ -1330 +1330 @@
 
     }
+#if H_MV_HLS_7_MISC_P0130_20
+    if( isReference ) // Current picture is in the temporal RPS
+    {
+      assert( rpcPic->getSlice(0)->getDiscardableFlag() == 0 ); // Temporal RPS shall not contain picture with discardable_flag equal to 1
+    }
+#endif
     // mark the picture as "unused for reference" if it is not in
     // the Reference Picture Set
@@ -2961 +2967 @@
     // Consider to check here: 
     // "If the current picture is a RADL picture, there shall be no entry in the RefPicSetInterLayer0 and RefPicSetInterLayer1 that is a RASL picture. "    
-#if H_MV_HLS7_GEN
-    // "There shall be no picture that has discardable_flag equal to 1 in RefPicSetInterLayer0 or RefPicSetInterLayer1".    
+#if H_MV_HLS_7_MISC_P0130_20
+    assert( picRef->getSlice(0)->getDiscardableFlag() == false ); // "There shall be no picture that has discardable_flag equal to 1 in RefPicSetInterLayer0 or RefPicSetInterLayer1".        
 #endif
   }

branches/HTM-10.0-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -340 +340 @@
 // #define H_MV_HLS_7_POC_P0041_FIXES        0 // (POC/P0041/Fixes) For each non-IRAP picture that has discardable_flag equal to 1 to have NUT value indicating that it is a sub-layer non-reference picture. 
 // #define H_MV_HLS_7_SEI_P0204_26           0 // (SEI/P0204/sub-bitstream SEI) #26 Add sub-bitstream property SEI message. Decision: Adopt
-// #define H_MV_HLS_7_MISC_P0130_20          0 // (MISC/P0130/discardable not in inter-layer RPS) #20 Add constraint restricting pictures marked as discardable from being present in the temporal or inter-layer RPS,
+#define H_MV_HLS_7_MISC_P0130_20          1 // (MISC/P0130/discardable not in inter-layer RPS) #20 Add constraint restricting pictures marked as discardable from being present in the temporal or inter-layer RPS,