Changeset 374 in 3DVCSoftware for branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon
- Timestamp:
- 5 May 2013, 12:09:11 (12 years ago)
- Location:
- branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TComDataCU.cpp
r355 r374 3003 3003 UInt iNumbPart; 3004 3004 3005 #if SHARP_ILLUCOMP_PARSE_D0060 3006 if (!(getPartitionSize(uiAbsPartIdx) == SIZE_2Nx2N)) 3007 { 3008 return false; 3009 } 3010 if (getSlice()->getIcSkipParseFlag()) 3011 { 3012 if (getMergeFlag(uiAbsPartIdx) && getMergeIndex(uiAbsPartIdx) == 0) 3013 { 3014 return false; 3015 } 3016 } 3017 if (getMergeFlag(uiAbsPartIdx)) 3018 { 3019 return true; 3020 } 3021 #endif 3022 #if HHI_MPI 3005 3023 if(!getSlice()->getIsDepth()) 3006 3024 { 3025 #endif 3007 3026 Int iWidth, iHeight; 3008 3027 … … 3025 3044 } 3026 3045 } 3046 #if HHI_MPI 3027 3047 } 3028 3048 else … … 3046 3066 } 3047 3067 } 3068 #endif 3048 3069 3049 3070 return false; … … 3056 3077 Int iWidth, iHeight; 3057 3078 3079 #if SHARP_ILLUCOMP_PARSE_D0060 3080 if (!(getPartitionSize(uiAbsPartIdx) == SIZE_2Nx2N)) 3081 { 3082 return false; 3083 } 3084 if (getSlice()->getIcSkipParseFlag()) 3085 { 3086 if (getMergeFlag(uiAbsPartIdx) && getMergeIndex(uiAbsPartIdx) == 0) 3087 { 3088 return false; 3089 } 3090 } 3091 if (getMergeFlag(uiAbsPartIdx)) 3092 { 3093 return true; 3094 } 3095 #endif 3058 3096 UInt uiPartMode = getPartitionSize(uiAbsPartIdx); 3059 3097 -
branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TComSlice.cpp
r332 r374 113 113 #if LGE_ILLUCOMP_B0045 114 114 , m_bApplyIC ( false ) 115 #if SHARP_ILLUCOMP_PARSE_D0060 116 , m_icSkipParseFlag ( false ) 117 #endif 115 118 #endif 116 119 #if INTER_VIEW_VECTOR_SCALING_C0115 … … 827 830 828 831 m_bLMvdL1Zero = pSrc->m_bLMvdL1Zero; 832 #if LGE_ILLUCOMP_B0045 833 m_bApplyIC = pSrc->m_bApplyIC; 834 #if SHARP_ILLUCOMP_PARSE_D0060 835 m_icSkipParseFlag = pSrc->m_icSkipParseFlag; 836 #endif 837 #endif 829 838 } 830 839 -
branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TComSlice.h
r332 r374 1106 1106 #if LGE_ILLUCOMP_B0045 1107 1107 Bool m_bApplyIC; 1108 #if SHARP_ILLUCOMP_PARSE_D0060 1109 Bool m_icSkipParseFlag; 1110 #endif 1108 1111 #endif 1109 1112 #if INTER_VIEW_VECTOR_SCALING_C0115|QC_MVHEVC_B0046 … … 1401 1404 Bool getApplyIC () { return m_bApplyIC; } 1402 1405 Void xSetApplyIC (); 1406 #if SHARP_ILLUCOMP_PARSE_D0060 1407 Void setIcSkipParseFlag( Bool b ) { m_icSkipParseFlag = b; } 1408 Bool getIcSkipParseFlag() { return m_icSkipParseFlag; } 1409 #endif 1403 1410 #endif 1404 1411 #if QC_TMVP_MRG_REFIDX_C0047 -
branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TypeDef.h
r355 r374 143 143 #endif 144 144 #endif 145 146 #define SHARP_ILLUCOMP_PARSE_D0060 1 // JCT3V-D0060 Removal of IC's parsing dependency 145 147 146 148 ///// ***** INTERVIEW SKIP *********
Note: See TracChangeset for help on using the changeset viewer.