Changeset 396 in 3DVCSoftware

Timestamp:

10 May 2013, 12:27:13 (11 years ago)

Author:

tech

Message:

Fixed assertion on NumPocTotalCurr.

File:

• branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -517 +517 @@
   {
     // 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 H_MV
+    // – If nuh_layer_id is equal to 0 and the current picture is a BLA picture or a 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() && m_layerId == 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);