diff options
| author | Jingning Han <jingning@google.com> | 2015-02-27 18:19:18 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-02-27 18:19:18 -0800 |
| commit | f4e0eb17e85eb84c162ac0218cf32a9eccece353 (patch) | |
| tree | 7426b1483f780943d04c179f98dd8b7356c6f1af /vp9 | |
| parent | 94bba48525d6a1ff333c2336896b9482247f7c83 (diff) | |
| parent | fe85fabbac668b2426ce56387906b34539edbf64 (diff) | |
| download | libvpx-f4e0eb17e85eb84c162ac0218cf32a9eccece353.tar libvpx-f4e0eb17e85eb84c162ac0218cf32a9eccece353.tar.gz libvpx-f4e0eb17e85eb84c162ac0218cf32a9eccece353.tar.bz2 libvpx-f4e0eb17e85eb84c162ac0218cf32a9eccece353.zip | |
Merge "Fix source frame border extension"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_extend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_extend.c b/vp9/encoder/vp9_extend.c index c9b213142..a1d7daac4 100644 --- a/vp9/encoder/vp9_extend.c +++ b/vp9/encoder/vp9_extend.c @@ -110,9 +110,9 @@ void vp9_copy_and_extend_frame(const YV12_BUFFER_CONFIG *src, // Motion estimation may use src block variance with the block size up // to 64x64, so the right and bottom need to be extended to 64 multiple // or up to 16, whichever is greater. - const int eb_y = MAX(src->y_width + 16, ALIGN_POWER_OF_TWO(src->y_width, 6)) + const int er_y = MAX(src->y_width + 16, ALIGN_POWER_OF_TWO(src->y_width, 6)) - src->y_crop_width; - const int er_y = MAX(src->y_height + 16, ALIGN_POWER_OF_TWO(src->y_height, 6)) + const int eb_y = MAX(src->y_height + 16, ALIGN_POWER_OF_TWO(src->y_height, 6)) - src->y_crop_height; const int uv_width_subsampling = (src->uv_width != src->y_width); const int uv_height_subsampling = (src->uv_height != src->y_height); |