Changeset 196 in SHVCSoftware for branches/SHM-2.1-dev/source/Lib/TLibCommon

Timestamp:

14 May 2013, 18:56:16 (12 years ago)

Author:

sharp

Message:

JCTVC-M0208 proposal 3 – A restriction for CRA and BLA pictures with nuh_layer_id==0
From Sachin Deshpande <sdeshpande@…>

Location:

branches/SHM-2.1-dev/source/Lib/TLibCommon

Files:

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

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

@@ -554 +554 @@
   {
     // The variable NumPocTotalCurr is derived as specified in subclause 7.4.7.2. It is a requirement of bitstream conformance that the following applies to the value of NumPocTotalCurr:
+#if ILP_RAP    // inter-layer prediction is allowed for BLA, CRA pictures of nuh_layer_id>0
+    // – If the current picture is a BLA or CRA picture with nuh_layer_id equal to 0, the value of NumPocTotalCurr shall be equal to 0.
+    // – Otherwise, when the current picture contains a P or B slice, the value of NumPocTotalCurr shall not be equal to 0.
+    if (getRapPicFlag() && getLayerId()==0)
+#else
     // – If the current picture is a BLA or CRA picture, the value of NumPocTotalCurr shall be equal to 0.
     // – Otherwise, when the current picture contains a P or B slice, the value of NumPocTotalCurr shall not be equal to 0.
     if (getRapPicFlag())
+#endif
     {
       assert(numPocTotalCurr == 0);

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

@@ -72 +72 @@
 #define JCTVC_M0259_LAMBDAREFINEMENT     1      ///< JCTVC-M0259: lambda refinement (encoder only optimization)
 #define RESTR_CHK                        1      ///< JCTVC-M0208 proposal 1
+#define ILP_RAP                          1      ///< JCTVC-M0208 proposal 3
 
 #define REF_IDX_FRAMEWORK                1      ///< inter-layer reference framework