generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pass block pixel width/height into av1_predict_intra_block

Browse Source 
Change-Id: Ia69bceef24b61b0a222783eba79e7a70bb60edd8
This commit is contained in:
Angie Chiang
2016-10-27 17:12:16 -07:00
parent b99af6e3e9
commit 45c198a197
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
av1/common/reconinter.c
View File

@@ -1889,6 +1889,7 @@ static void build_intra_predictors_for_interintra(MACROBLOCKD *xd, uint8_t *ref,
int dst_stride,
PREDICTION_MODE mode,
BLOCK_SIZE bsize, int plane) {
struct macroblockd_plane *const pd = &xd->plane[plane];
BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, &xd->plane[plane]);
const int bwl = b_width_log2_lookup[plane_bsize];
const int bhl = b_height_log2_lookup[plane_bsize];
@@ -1897,14 +1898,14 @@ static void build_intra_predictors_for_interintra(MACROBLOCKD *xd, uint8_t *ref,
TX_SIZE max_tx_size = max_txsize_lookup[plane_bsize];
if (bwl == bhl) {
av1_predict_intra_block(xd, bwl, bhl, max_tx_size, mode, ref, ref_stride,
dst, dst_stride, 0, 0, plane);
av1_predict_intra_block(xd, pd->width, pd->height, max_tx_size, mode, ref,
ref_stride, dst, dst_stride, 0, 0, plane);
} else if (bwl < bhl) {
uint8_t *src_2 = ref + pxbw * ref_stride;
uint8_t *dst_2 = dst + pxbw * dst_stride;
av1_predict_intra_block(xd, bwl, bhl, max_tx_size, mode, ref, ref_stride,
dst, dst_stride, 0, 0, plane);
av1_predict_intra_block(xd, pd->width, pd->height, max_tx_size, mode, ref,
ref_stride, dst, dst_stride, 0, 0, plane);
#if CONFIG_AOM_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
uint16_t *src_216 = CONVERT_TO_SHORTPTR(src_2);
@@ -1916,14 +1917,14 @@ static void build_intra_predictors_for_interintra(MACROBLOCKD *xd, uint8_t *ref,
{
memcpy(src_2 - ref_stride, dst_2 - dst_stride, sizeof(*src_2) * pxbw);
}
av1_predict_intra_block(xd, bwl, bhl, max_tx_size, mode, src_2, ref_stride,
dst_2, dst_stride, 0, 1 << bwl, plane);
av1_predict_intra_block(xd, pd->width, pd->height, max_tx_size, mode, src_2,
ref_stride, dst_2, dst_stride, 0, 1 << bwl, plane);
} else { // bwl > bhl
int i;
uint8_t *src_2 = ref + pxbh;
uint8_t *dst_2 = dst + pxbh;
av1_predict_intra_block(xd, bwl, bhl, max_tx_size, mode, ref, ref_stride,
dst, dst_stride, 0, 0, plane);
av1_predict_intra_block(xd, pd->width, pd->height, max_tx_size, mode, ref,
ref_stride, dst, dst_stride, 0, 0, plane);
#if CONFIG_AOM_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
uint16_t *src_216 = CONVERT_TO_SHORTPTR(src_2);
@@ -1936,8 +1937,8 @@ static void build_intra_predictors_for_interintra(MACROBLOCKD *xd, uint8_t *ref,
for (i = 0; i < pxbh; ++i)
src_2[i * ref_stride - 1] = dst_2[i * dst_stride - 1];
}
av1_predict_intra_block(xd, bwl, bhl, max_tx_size, mode, src_2, ref_stride,
dst_2, dst_stride, 1 << bhl, 0, plane);
av1_predict_intra_block(xd, pd->width, pd->height, max_tx_size, mode, src_2,
ref_stride, dst_2, dst_stride, 1 << bhl, 0, plane);
}
}