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

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

Location:

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

Files:

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

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

@@ -2082 +2082 @@
 #if VPS_EXTN_PROFILE_INFO
   ::memset(m_profilePresentFlag, 0, sizeof(m_profilePresentFlag));
+#if !P0048_REMOVE_PROFILE_REF
   ::memset(m_profileLayerSetRef, 0, sizeof(m_profileLayerSetRef));
+#endif
 #endif
 #if VPS_EXTN_OP_LAYER_SETS

branches/SHM-5.0-dev/source/Lib/TLibCommon/TComSlice.h

@@ -514 +514 @@
   // Profile-tier-level signalling related
   Bool       m_profilePresentFlag[MAX_VPS_LAYER_SETS_PLUS1];    // The value with index 0 will not be used.
+#if !P0048_REMOVE_PROFILE_REF
   UInt       m_profileLayerSetRef[MAX_VPS_LAYER_SETS_PLUS1];    // The value with index 0 will not be used.
+#endif
   std::vector<TComPTL>    m_pcPTLForExtn;  
 #endif
@@ -777 +779 @@
   Void   setProfilePresentFlag(Int id, Bool x)                  { m_profilePresentFlag[id] = x;    }
 
+#if !P0048_REMOVE_PROFILE_REF
   UInt   getProfileLayerSetRef(Int id)                          { return m_profileLayerSetRef[id]; }
   Void   setProfileLayerSetRef(Int id, Bool x)                  { m_profileLayerSetRef[id] = x;    }
+#endif
 
   std::vector<TComPTL>* getPTLForExtnPtr()                      { return &m_pcPTLForExtn;          }

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

@@ -53 +53 @@
 #define O0109_O0199_FLAGS_TO_VUI         1      ///< JCTVC-O0109, O0199: move single_layer_for_non_irap_flag and higher_layer_flag to vps_vui
 #define O0109_VIEW_ID_LEN                1      ///< JCTVC-O0109: view_id_len_minus1 to view_id_len, and add constraint (1<<view_id_len) is greater than or equal to NumViews
+
+#define P0048_REMOVE_PROFILE_REF         1      ///< JCTVC-P0048: remove profile_ref_minus1
+#if !P0048_REMOVE_PROFILE_REF
 #define O0109_PROF_REF_MINUS1            1      ///< JCTVC-O0109: constraint that profile_ref_minus1[i] shall be less than or equal to i
+#endif
+
 #define O0109_DEFAULT_ONE_OUT_LAYER_IDC  1      ///< JCTVC-O0109: default_one_target_output_layer_flag to default_one_target_output_layer_idc
 #define O0109_MOVE_VPS_VUI_FLAG          1      ///< JCTVC-O0109: move vps_vui_present_flag before vps_vui_offset