Showing the changes to codec/encoder/core/src/sample.cpp (1 of 4 files). Show all
Unified · Split
| @@ -169,17 +169,17 @@ int32_t WelsSampleSatdIntra4x4Combined3_c (uint8_t* pDec, int32_t iDecStride, ui · 168 unmodified lines | |||
| 169 | 169 | ||
| 170 | return iBestCost; | 170 | return iBestCost; |
| 171 | } | 171 | } |
| 172 | extern void WelsIChormaPredDc_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride); | 172 | extern void WelsIChromaPredDc_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride); |
| 173 | extern void WelsIChormaPredH_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride); | 173 | extern void WelsIChromaPredH_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride); |
| 174 | extern void WelsIChormaPredV_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride); | 174 | extern void WelsIChromaPredV_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride); |
| 175 | 175 | ||
| 176 | int32_t WelsSampleSatdIntra8x8Combined3_c (uint8_t* pDecCb, int32_t iDecStride, uint8_t* pEncCb, int32_t iEncStride, | 176 | int32_t WelsSampleSatdIntra8x8Combined3_c (uint8_t* pDecCb, int32_t iDecStride, uint8_t* pEncCb, int32_t iEncStride, |
| 177 | int32_t* pBestMode, int32_t iLambda, uint8_t* pDstChroma, uint8_t* pDecCr, uint8_t* pEncCr) { | 177 | int32_t* pBestMode, int32_t iLambda, uint8_t* pDstChroma, uint8_t* pDecCr, uint8_t* pEncCr) { |
| 178 | int32_t iBestMode = -1; | 178 | int32_t iBestMode = -1; |
| 179 | int32_t iCurCost, iBestCost = INT_MAX; | 179 | int32_t iCurCost, iBestCost = INT_MAX; |
| 180 | 180 | ||
| 181 | WelsIChormaPredV_c (pDstChroma, pDecCb, iDecStride); | 181 | WelsIChromaPredV_c (pDstChroma, pDecCb, iDecStride); |
| 182 | WelsIChormaPredV_c (pDstChroma + 64, pDecCr, iDecStride); | 182 | WelsIChromaPredV_c (pDstChroma + 64, pDecCr, iDecStride); |
| 183 | iCurCost = WelsSampleSatd8x8_c (pDstChroma, 8, pEncCb, iEncStride); | 183 | iCurCost = WelsSampleSatd8x8_c (pDstChroma, 8, pEncCb, iEncStride); |
| 184 | iCurCost += WelsSampleSatd8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2; | 184 | iCurCost += WelsSampleSatd8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2; |
| 185 | 185 | ||
| @@ -188,16 +188,16 @@ int32_t WelsSampleSatdIntra8x8Combined3_c (uint8_t* pDecCb, int32_t iDecStride, · 2 unmodified lines | |||
| 188 | iBestCost = iCurCost; | 188 | iBestCost = iCurCost; |
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | WelsIChormaPredH_c (pDstChroma, pDecCb, iDecStride); | 191 | WelsIChromaPredH_c (pDstChroma, pDecCb, iDecStride); |
| 192 | WelsIChormaPredH_c (pDstChroma + 64, pDecCr, iDecStride); | 192 | WelsIChromaPredH_c (pDstChroma + 64, pDecCr, iDecStride); |
| 193 | iCurCost = WelsSampleSatd8x8_c (pDstChroma, 8, pEncCb, iEncStride); | 193 | iCurCost = WelsSampleSatd8x8_c (pDstChroma, 8, pEncCb, iEncStride); |
| 194 | iCurCost += WelsSampleSatd8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2; | 194 | iCurCost += WelsSampleSatd8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2; |
| 195 | if (iCurCost < iBestCost) { | 195 | if (iCurCost < iBestCost) { |
| 196 | iBestMode = 1; | 196 | iBestMode = 1; |
| 197 | iBestCost = iCurCost; | 197 | iBestCost = iCurCost; |
| 198 | } | 198 | } |
| 199 | WelsIChormaPredDc_c (pDstChroma, pDecCb, iDecStride); | 199 | WelsIChromaPredDc_c (pDstChroma, pDecCb, iDecStride); |
| 200 | WelsIChormaPredDc_c (pDstChroma + 64, pDecCr, iDecStride); | 200 | WelsIChromaPredDc_c (pDstChroma + 64, pDecCr, iDecStride); |
| 201 | iCurCost = WelsSampleSatd8x8_c (pDstChroma, 8, pEncCb, iEncStride); | 201 | iCurCost = WelsSampleSatd8x8_c (pDstChroma, 8, pEncCb, iEncStride); |
| 202 | iCurCost += WelsSampleSatd8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride); | 202 | iCurCost += WelsSampleSatd8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride); |
| 203 | if (iCurCost < iBestCost) { | 203 | if (iCurCost < iBestCost) { |
| @@ -216,8 +216,8 @@ int32_t WelsSampleSadIntra8x8Combined3_c (uint8_t* pDecCb, int32_t iDecStride, u · 12 unmodified lines | |||
| 216 | int32_t iBestMode = -1; | 216 | int32_t iBestMode = -1; |
| 217 | int32_t iCurCost, iBestCost = INT_MAX; | 217 | int32_t iCurCost, iBestCost = INT_MAX; |
| 218 | 218 | ||
| 219 | WelsIChormaPredV_c (pDstChroma, pDecCb, iDecStride); | 219 | WelsIChromaPredV_c (pDstChroma, pDecCb, iDecStride); |
| 220 | WelsIChormaPredV_c (pDstChroma + 64, pDecCr, iDecStride); | 220 | WelsIChromaPredV_c (pDstChroma + 64, pDecCr, iDecStride); |
| 221 | iCurCost = WelsSampleSad8x8_c (pDstChroma, 8, pEncCb, iEncStride); | 221 | iCurCost = WelsSampleSad8x8_c (pDstChroma, 8, pEncCb, iEncStride); |
| 222 | iCurCost += WelsSampleSad8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2; | 222 | iCurCost += WelsSampleSad8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2; |
| 223 | 223 | ||
| @@ -226,16 +226,16 @@ int32_t WelsSampleSadIntra8x8Combined3_c (uint8_t* pDecCb, int32_t iDecStride, u · 2 unmodified lines | |||
| 226 | iBestCost = iCurCost; | 226 | iBestCost = iCurCost; |
| 227 | } | 227 | } |
| 228 | 228 | ||
| 229 | WelsIChormaPredH_c (pDstChroma, pDecCb, iDecStride); | 229 | WelsIChromaPredH_c (pDstChroma, pDecCb, iDecStride); |
| 230 | WelsIChormaPredH_c (pDstChroma + 64, pDecCr, iDecStride); | 230 | WelsIChromaPredH_c (pDstChroma + 64, pDecCr, iDecStride); |
| 231 | iCurCost = WelsSampleSad8x8_c (pDstChroma, 8, pEncCb, iEncStride); | 231 | iCurCost = WelsSampleSad8x8_c (pDstChroma, 8, pEncCb, iEncStride); |
| 232 | iCurCost += WelsSampleSad8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2; | 232 | iCurCost += WelsSampleSad8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2; |
| 233 | if (iCurCost < iBestCost) { | 233 | if (iCurCost < iBestCost) { |
| 234 | iBestMode = 1; | 234 | iBestMode = 1; |
| 235 | iBestCost = iCurCost; | 235 | iBestCost = iCurCost; |
| 236 | } | 236 | } |
| 237 | WelsIChormaPredDc_c (pDstChroma, pDecCb, iDecStride); | 237 | WelsIChromaPredDc_c (pDstChroma, pDecCb, iDecStride); |
| 238 | WelsIChormaPredDc_c (pDstChroma + 64, pDecCr, iDecStride); | 238 | WelsIChromaPredDc_c (pDstChroma + 64, pDecCr, iDecStride); |
| 239 | iCurCost = WelsSampleSad8x8_c (pDstChroma, 8, pEncCb, iEncStride); | 239 | iCurCost = WelsSampleSad8x8_c (pDstChroma, 8, pEncCb, iEncStride); |
| 240 | iCurCost += WelsSampleSad8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride); | 240 | iCurCost += WelsSampleSad8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride); |
| 241 | if (iCurCost < iBestCost) { | 241 | if (iCurCost < iBestCost) { |