Changeset 1105 in SHVCSoftware

Timestamp:

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

Author:

seregin

Message:

macro cleanup: O0109_PROF_REF_MINUS1, P0048_REMOVE_PROFILE_REF

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TComSlice.h (modified) (2 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

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

@@ -2052 +2052 @@
 #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-dev/source/Lib/TLibCommon/TComSlice.h

@@ -659 +659 @@
   // 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
 #if !MULTIPLE_PTL_SUPPORT
   std::vector<TComPTL>    m_pcPTLForExtn;  
@@ -1061 +1058 @@
   Bool   getProfilePresentFlag(Int id)                          { return m_profilePresentFlag[id]; }
   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
 
 #if !MULTIPLE_PTL_SUPPORT

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

@@ -100 +100 @@
 #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 P0295_DEFAULT_OUT_LAYER_IDC      1      ///< JCTVC-P0295: modifify default_one_target_output_layer_idc to default_output_layer_idc
 #define O0109_DEFAULT_ONE_OUT_LAYER_IDC  1      ///< JCTVC-O0109: default_one_target_output_layer_flag to default_one_target_output_layer_idc

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
     }

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -2191 +2191 @@
 #endif
     WRITE_FLAG( vps->getProfilePresentFlag(idx),       "vps_profile_present_flag[i]" );
-#if !P0048_REMOVE_PROFILE_REF
-    if( !vps->getProfilePresentFlag(idx) )
-    {
-      WRITE_CODE( vps->getProfileLayerSetRef(idx) - 1, 6, "profile_ref_minus1[i]" );
-    }
-#endif
 #if MULTIPLE_PTL_SUPPORT
     codePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );