Changeset 412 in SHVCSoftware for branches/SHM-3.1-dev/source/Lib/TLibCommon

Timestamp:

8 Oct 2013, 08:10:53 (11 years ago)

Author:

qualcomm

Message:

Correct NAL unit type name.

Changed NAL_UNIT_CODED_SLICE_TLA_R to NAL_UNIT_CODED_SLICE_TSA_R.

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

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

Files:

• CommonDef.h (modified) (1 diff)
• NAL.h (modified) (1 diff)
• TComSlice.cpp (modified) (1 diff)

branches/SHM-3.1-dev/source/Lib/TLibCommon/CommonDef.h

@@ -200 +200 @@
   
   NAL_UNIT_CODED_SLICE_TSA_N,     // 2
-  NAL_UNIT_CODED_SLICE_TLA_R,       // 3
+  NAL_UNIT_CODED_SLICE_TSA_R,       // 3
   
   NAL_UNIT_CODED_SLICE_STSA_N,    // 4

branches/SHM-3.1-dev/source/Lib/TLibCommon/NAL.h

@@ -76 +76 @@
     return m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_R
         || m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_N
-        || m_nalUnitType == NAL_UNIT_CODED_SLICE_TLA_R
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_TSA_R
         || m_nalUnitType == NAL_UNIT_CODED_SLICE_TSA_N
         || m_nalUnitType == NAL_UNIT_CODED_SLICE_STSA_R

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

@@ -1295 +1295 @@
     assert(rpcPic->getSlice( 0 )->isReferenced()==0||rpcPic->getUsedByCurr()==0||rpcPic->getTLayer()<=this->getTLayer());
     //check that pictures of higher or equal temporal layer are not in the RPS if the current picture is a TSA picture
-    if(this->getNalUnitType() == NAL_UNIT_CODED_SLICE_TLA_R || this->getNalUnitType() == NAL_UNIT_CODED_SLICE_TSA_N)
+    if(this->getNalUnitType() == NAL_UNIT_CODED_SLICE_TSA_R || this->getNalUnitType() == NAL_UNIT_CODED_SLICE_TSA_N)
     {
       assert(rpcPic->getSlice( 0 )->isReferenced()==0||rpcPic->getTLayer()<this->getTLayer());