diff options
| author | hkuang <hkuang@google.com> | 2013-12-16 14:48:54 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-12-16 14:48:54 -0800 |
| commit | fb53409d2a4030f0af48850f33aad617cc9c3004 (patch) | |
| tree | 51a7bb671fd852d9f5fe60c76b7b18636629f963 /vp9/decoder | |
| parent | b1d821704bcd63527007db3d9133d34acf35c82f (diff) | |
| parent | 25e55526301eba7d6e5c68e25402e9b2102976d8 (diff) | |
| download | libvpx-fb53409d2a4030f0af48850f33aad617cc9c3004.tar libvpx-fb53409d2a4030f0af48850f33aad617cc9c3004.tar.gz libvpx-fb53409d2a4030f0af48850f33aad617cc9c3004.tar.bz2 libvpx-fb53409d2a4030f0af48850f33aad617cc9c3004.zip | |
Merge "Remove border extension in intra frame prediction."
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 79f0835a7..c1670041e 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -305,12 +305,10 @@ static void predict_and_reconstruct_intra_block(int plane, int block, txfrm_block_to_raster_xy(plane_bsize, tx_size, block, &x, &y); dst = &pd->dst.buf[4 * y * pd->dst.stride + 4 * x]; - if (xd->mb_to_right_edge < 0 || xd->mb_to_bottom_edge < 0) - extend_for_intra(xd, plane_bsize, plane, x, y); - vp9_predict_intra_block(xd, block >> (tx_size << 1), b_width_log2(plane_bsize), tx_size, mode, - dst, pd->dst.stride, dst, pd->dst.stride); + dst, pd->dst.stride, dst, pd->dst.stride, + x, y, plane); if (!mi->mbmi.skip_coeff) { const int eob = vp9_decode_block_tokens(cm, xd, plane, block, @@ -1349,6 +1347,7 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) { const int tile_rows = 1 << cm->log2_tile_rows; const int tile_cols = 1 << cm->log2_tile_cols; YV12_BUFFER_CONFIG *const new_fb = get_frame_new_buffer(cm); + xd->cur_buf = new_fb; if (!first_partition_size) { // showing a frame directly |