diff options
| author | hkuang <hkuang@google.com> | 2013-12-09 17:16:31 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-12-09 17:16:31 -0800 |
| commit | d70a8c09c6f383e1eb9c97ba433886dbeca4c631 (patch) | |
| tree | 9ddb12210bbcbf7e91db05d179619ec70d40b64f /vp9/decoder | |
| parent | 54040f94b910fe304ece6d04cb6e6c02779b14a0 (diff) | |
| parent | ff2c96be1fe11f76b72e6f15fd23155627c9bbe4 (diff) | |
| download | libvpx-d70a8c09c6f383e1eb9c97ba433886dbeca4c631.tar libvpx-d70a8c09c6f383e1eb9c97ba433886dbeca4c631.tar.gz libvpx-d70a8c09c6f383e1eb9c97ba433886dbeca4c631.tar.bz2 libvpx-d70a8c09c6f383e1eb9c97ba433886dbeca4c631.zip | |
Merge "Implenment on demand border extension. In place extend the border now. Next commit will totally remove the border."
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 2 | ||||
| -rw-r--r-- | vp9/decoder/vp9_onyxd_if.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 07c5401d6..1608aa6aa 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -379,6 +379,8 @@ static void set_ref(VP9_COMMON *const cm, MACROBLOCKD *const xd, const int ref = mbmi->ref_frame[idx] - LAST_FRAME; const YV12_BUFFER_CONFIG *cfg = get_frame_ref_buffer(cm, ref); const struct scale_factors_common *sfc = &cm->active_ref_scale_comm[ref]; + + xd->ref_buf[idx] = cfg; if (!vp9_is_valid_scale(sfc)) vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, "Invalid scale factors"); diff --git a/vp9/decoder/vp9_onyxd_if.c b/vp9/decoder/vp9_onyxd_if.c index e72b9628b..e24ba4279 100644 --- a/vp9/decoder/vp9_onyxd_if.c +++ b/vp9/decoder/vp9_onyxd_if.c @@ -379,10 +379,6 @@ int vp9_receive_compressed_data(VP9D_PTR ptr, cm->current_video_frame + 3000); #endif - vp9_extend_frame_inner_borders(cm->frame_to_show, - cm->subsampling_x, - cm->subsampling_y); - #if WRITE_RECON_BUFFER == 1 if (cm->show_frame) recon_write_yuv_frame("recon.yuv", cm->frame_to_show, |