Changeset 1287 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComPattern.cpp
- Timestamp:
- 17 Jul 2015, 05:43:37 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/source/Lib/TLibCommon/TComPattern.cpp
r1260 r1287 79 79 Int iRoiWidth, 80 80 Int iRoiHeight, 81 Int iStride 81 Int iStride, 82 Int bitDepth 82 83 ) 83 84 { 84 85 m_piROIOrigin = piTexture; 85 m_iROIWidth = iRoiWidth; 86 m_iROIHeight = iRoiHeight; 87 m_iPatternStride = iStride; 86 m_iROIWidth = iRoiWidth; 87 m_iROIHeight = iRoiHeight; 88 m_iPatternStride = iStride; 89 m_bitDepth = bitDepth; 88 90 } 89 91 … … 95 97 Int iRoiWidth, 96 98 Int iRoiHeight, 97 Int iStride) 98 { 99 m_cPatternY. setPatternParamPel( piY, iRoiWidth, iRoiHeight, iStride); 99 Int iStride, 100 Int bitDepthLuma) 101 { 102 m_cPatternY. setPatternParamPel( piY, iRoiWidth, iRoiHeight, iStride, bitDepthLuma); 100 103 } 101 104 … … 120 123 const Int iAboveUnits = iTUWidthInUnits << 1; 121 124 const Int iLeftUnits = iTUHeightInUnits << 1; 125 #if SVC_EXTENSION 126 const Int bitDepthForChannel = pcCU->getSlice()->getBitDepth(chType); 127 #else 128 const Int bitDepthForChannel = pcCU->getSlice()->getSPS()->getBitDepth(chType); 129 #endif 122 130 123 131 assert(iTUHeightInUnits > 0 && iTUWidthInUnits > 0); … … 156 164 Pel *piRoiOrigin = pcCU->getPic()->getPicYuvRec()->getAddr(compID, pcCU->getCtuRsAddr(), pcCU->getZorderIdxInCtu()+uiZorderIdxInPart); 157 165 #if O0043_BEST_EFFORT_DECODING 158 fillReferenceSamples (g_bitDepthInStream[chType], g_bitDepthInStream[chType] - g_bitDepth[chType], pcCU, piRoiOrigin, piAdiTemp, bNeighborFlags, iNumIntraNeighbor, iUnitWidth, iUnitHeight, iAboveUnits, iLeftUnits, 159 #else 160 fillReferenceSamples (g_bitDepth[chType], pcCU, piRoiOrigin, piAdiTemp, bNeighborFlags, iNumIntraNeighbor, iUnitWidth, iUnitHeight, iAboveUnits, iLeftUnits, 166 const Int bitDepthForChannelInStream = pcCU->getSlice()->getSPS()->getStreamBitDepth(chType); 167 fillReferenceSamples (bitDepthForChannelInStream, bitDepthForChannelInStream - bitDepthForChannel, pcCU, piRoiOrigin, piAdiTemp, bNeighborFlags, iNumIntraNeighbor, iUnitWidth, iUnitHeight, iAboveUnits, iLeftUnits, 168 #else 169 fillReferenceSamples (bitDepthForChannel, pcCU, piRoiOrigin, piAdiTemp, bNeighborFlags, iNumIntraNeighbor, iUnitWidth, iUnitHeight, iAboveUnits, iLeftUnits, 161 170 #endif 162 171 uiTuWidth, uiTuHeight, uiROIWidth, uiROIHeight, iPicStride, toChannelType(compID), chFmt); … … 202 211 { 203 212 #if O0043_BEST_EFFORT_DECODING 204 const Int threshold = 1 << ( g_bitDepthInStream[chType]- 5);205 #else 206 const Int threshold = 1 << ( g_bitDepth[chType]- 5);213 const Int threshold = 1 << (bitDepthForChannelInStream - 5); 214 #else 215 const Int threshold = 1 << (bitDepthForChannel - 5); 207 216 #endif 208 217 const Bool bilinearLeft = abs((bottomLeft + topLeft ) - (2 * piAdiTemp[stride * uiTuHeight])) < threshold; //difference between the
Note: See TracChangeset for help on using the changeset viewer.