diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-04-29 15:49:00 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2013-04-29 16:02:00 -0700 |
| commit | 4747c6ed9068b8f2f5b8da84cffef61ae867dd5d (patch) | |
| tree | 3c18f2f8ffa07c4d0e6793e7e7467a01f151b31e | |
| parent | e388251d5d3739ed5d5154c7fd108a9a1403c578 (diff) | |
| download | libvpx-4747c6ed9068b8f2f5b8da84cffef61ae867dd5d.tar libvpx-4747c6ed9068b8f2f5b8da84cffef61ae867dd5d.tar.gz libvpx-4747c6ed9068b8f2f5b8da84cffef61ae867dd5d.tar.bz2 libvpx-4747c6ed9068b8f2f5b8da84cffef61ae867dd5d.zip | |
fixed new intra code for rectanglar blocks
Also fixed two minor subtle boundary conditions in intra prediction
code, and replaced memcpy/memset with vpx_ prefixed version.
Change-Id: I9cddff3be831228b628f1f2f065a61feacbcbee6
| -rw-r--r-- | vp9/common/vp9_reconintra.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vp9/common/vp9_reconintra.c b/vp9/common/vp9_reconintra.c index e7a711e11..4b62c1cce 100644 --- a/vp9/common/vp9_reconintra.c +++ b/vp9/common/vp9_reconintra.c @@ -99,7 +99,7 @@ static void d45_predictor(uint8_t *ypred_ptr, int y_stride, yabove_row[r + c + 1] * 2 + yabove_row[r + c + 2], 2); else - ypred_ptr[c] = yabove_row[bw]; + ypred_ptr[c] = yabove_row[bw * 2 - 1]; } ypred_ptr += y_stride; } @@ -240,7 +240,7 @@ void vp9_build_intra_predictors(uint8_t *src, int src_stride, vpx_memcpy(yabove_row + bw, yabove_ptr + bw, bw); else vpx_memset(yabove_row + bw, yabove_row[bw -1], bw); - ytop_left = left_available ? yabove_ptr[-1] : 127; + ytop_left = left_available ? yabove_ptr[-1] : 129; } else { vpx_memset(yabove_row, 127, bw * 2); ytop_left = 127; @@ -275,7 +275,7 @@ void vp9_build_intra_predictors(uint8_t *src, int src_stride, break; case V_PRED: for (r = 0; r < bh; r++) { - memcpy(ypred_ptr, yabove_row, bw); + vpx_memcpy(ypred_ptr, yabove_row, bw); ypred_ptr += y_stride; } break; @@ -323,7 +323,7 @@ void vp9_build_intra_predictors(uint8_t *src, int src_stride, } } else if (bw > bh) { uint8_t pred[64*64]; - memset(yleft_col + bh, yleft_col[bh - 1], bw - bh); + vpx_memset(yleft_col + bh, yleft_col[bh - 1], bw - bh); switch (mode) { case D45_PRED: d45_predictor(pred, 64, bw, bw, yabove_row, yleft_col); @@ -347,10 +347,10 @@ void vp9_build_intra_predictors(uint8_t *src, int src_stride, assert(0); } for (i = 0; i < bh; i++) - memcpy(ypred_ptr + y_stride * i, pred + i * 64, bw); + vpx_memcpy(ypred_ptr + y_stride * i, pred + i * 64, bw); } else { uint8_t pred[64 * 64]; - memset(yabove_row + bw, yabove_row[bw - 1], bh - bw); + vpx_memset(yabove_row + bw * 2, yabove_row[bw * 2 - 1], (bh - bw) * 2); switch (mode) { case D45_PRED: d45_predictor(pred, 64, bh, bh, yabove_row, yleft_col); @@ -374,7 +374,7 @@ void vp9_build_intra_predictors(uint8_t *src, int src_stride, assert(0); } for (i = 0; i < bh; i++) - memcpy(ypred_ptr + y_stride * i, pred + i * 64, bw); + vpx_memcpy(ypred_ptr + y_stride * i, pred + i * 64, bw); } break; default: |