Changeset 1105 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

6 Jul 2015, 20:41:31 (11 years ago)

Author:

seregin

Message:

macro cleanup: O0109_PROF_REF_MINUS1, P0048_REMOVE_PROFILE_REF

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2961 +2961 @@
     if( !vps->getProfilePresentFlag(idx) )
     {
-#if P0048_REMOVE_PROFILE_REF
       // Copy profile information from previous one
 #if MULTIPLE_PTL_SUPPORT
@@ -2967 +2966 @@
 #else
       vps->getPTLForExtn(idx)->copyProfileInfo( (idx==1) ? vps->getPTL() : vps->getPTLForExtn( idx - 1 ) );
-#endif
-#else
-      READ_CODE( 6, uiCode, "profile_ref_minus1[i]" ); vps->setProfileLayerSetRef(idx, uiCode + 1);
-#if O0109_PROF_REF_MINUS1
-      assert( vps->getProfileLayerSetRef(idx) <= idx );
-#else
-      assert( vps->getProfileLayerSetRef(idx) < idx );
-#endif
-      // Copy profile information as indicated
-      vps->getPTLForExtn(idx)->copyProfileInfo( vps->getPTLForExtn( vps->getProfileLayerSetRef(idx) ) );
 #endif
     }