summaryrefslogtreecommitdiff
path: root/vp9/encoder
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2013-11-22 10:56:41 -0800
committerJingning Han <jingning@google.com>2013-11-22 12:02:08 -0800
commit86d2a9b978980f8507f7fbfa1f71a32720659f07 (patch)
tree53176e795d9358bb5218c332e9d5b8b9c3e425df /vp9/encoder
parent25aae73a30916cfdc5a2343365531e7357227a51 (diff)
downloadlibvpx-86d2a9b978980f8507f7fbfa1f71a32720659f07.tar
libvpx-86d2a9b978980f8507f7fbfa1f71a32720659f07.tar.gz
libvpx-86d2a9b978980f8507f7fbfa1f71a32720659f07.tar.bz2
libvpx-86d2a9b978980f8507f7fbfa1f71a32720659f07.zip
Separate setup_scale_factor/extend_frame_borders
This commit takes out vp9_extend_frame_borders from vp9_setup_scale_factors. The refactoring is for the preparation of the use of lazy border extension at decoder. This makes it necessary to handle border extension separately at encoder/decoder. The use of vp9_extend_frame_borders will be removed, when lazy border extension is ready. Change-Id: Ia3baba3d179d5f11eee1634f19b3b319d2a59186
Diffstat (limited to 'vp9/encoder')
-rw-r--r--vp9/encoder/vp9_onyx_if.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index b7874d515..bbc308829 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -3968,8 +3968,12 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags,
VP9BORDERINPIXELS);
// Calculate scaling factors for each of the 3 available references
- for (i = 0; i < ALLOWED_REFS_PER_FRAME; ++i)
+ for (i = 0; i < ALLOWED_REFS_PER_FRAME; ++i) {
vp9_setup_scale_factors(cm, i);
+ if (vp9_is_scaled(&cm->active_ref_scale_comm[i]))
+ vp9_extend_frame_borders(&cm->yv12_fb[cm->active_ref_idx[i]],
+ cm->subsampling_x, cm->subsampling_y);
+ }
vp9_setup_interp_filters(&cpi->mb.e_mbd, DEFAULT_INTERP_FILTER, cm);