| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 362 | 362 |
| 363 // predict | 363 // predict |
| 364 if (mode == DC_PRED) { | 364 if (mode == DC_PRED) { |
| 365 dc_pred[left_available][up_available][tx_size](dst, dst_stride, | 365 dc_pred[left_available][up_available][tx_size](dst, dst_stride, |
| 366 const_above_row, left_col); | 366 const_above_row, left_col); |
| 367 } else { | 367 } else { |
| 368 pred[mode][tx_size](dst, dst_stride, const_above_row, left_col); | 368 pred[mode][tx_size](dst, dst_stride, const_above_row, left_col); |
| 369 } | 369 } |
| 370 } | 370 } |
| 371 | 371 |
| 372 void vp9_predict_intra_block(MACROBLOCKD *xd, int block_idx, int bwl_in, | 372 void vp9_predict_intra_block(const MACROBLOCKD *xd, int block_idx, int bwl_in, |
| 373 TX_SIZE tx_size, int mode, | 373 TX_SIZE tx_size, int mode, |
| 374 const uint8_t *ref, int ref_stride, | 374 const uint8_t *ref, int ref_stride, |
| 375 uint8_t *dst, int dst_stride) { | 375 uint8_t *dst, int dst_stride) { |
| 376 const int bwl = bwl_in - tx_size; | 376 const int bwl = bwl_in - tx_size; |
| 377 const int wmask = (1 << bwl) - 1; | 377 const int wmask = (1 << bwl) - 1; |
| 378 const int have_top = (block_idx >> bwl) || xd->up_available; | 378 const int have_top = (block_idx >> bwl) || xd->up_available; |
| 379 const int have_left = (block_idx & wmask) || xd->left_available; | 379 const int have_left = (block_idx & wmask) || xd->left_available; |
| 380 const int have_right = ((block_idx & wmask) != wmask); | 380 const int have_right = ((block_idx & wmask) != wmask); |
| 381 | 381 |
| 382 assert(bwl >= 0); | 382 assert(bwl >= 0); |
| 383 build_intra_predictors(ref, ref_stride, dst, dst_stride, mode, tx_size, | 383 build_intra_predictors(ref, ref_stride, dst, dst_stride, mode, tx_size, |
| 384 have_top, have_left, have_right); | 384 have_top, have_left, have_right); |
| 385 } | 385 } |
| OLD | NEW |