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

Timestamp:

23 Jan 2014, 18:05:13 (11 years ago)

Author:

seregin

Message:

JCTVC-P0048: Remove profile_ref_minus1 from VPS extension with macro P0048_REMOVE_PROFILE_REF. Patch was provided by Tomoyuki Yamamoto <yamamoto.tomoyuki@…>

Changes

• Remove profile_ref_minus1 from VPS extension
• Infer Profile info to be the previous one when not present

• Remove array m_profileLayerSetRef[MAX_VPS_LAYER_SETS_PLUS1]
• Remove method get/setProfileLayerSetRef()
• Remove macro O0109_PROF_REF_MINUS1

File:

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

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

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