aboutsummaryrefslogtreecommitdiff
path: root/libvpx/vp9/common/vp9_postproc.c
diff options
context:
space:
mode:
authorJohann <johannkoenig@google.com>2019-01-16 10:31:45 -0800
committerJohann <johannkoenig@google.com>2019-01-16 10:31:45 -0800
commit9c8a1ae2f6520545ba10b748f291ec03b9a816ed (patch)
tree7efc8e164104d8aea404bd063d60dd61c9a3235c /libvpx/vp9/common/vp9_postproc.c
parentcfe1a0b82f21014b4a552180554cf4dbb828abb8 (diff)
downloadlibvpx-9c8a1ae2f6520545ba10b748f291ec03b9a816ed.tar.gz
libvpx: Pull from upstream
Current HEAD: 858fe955ae5a42a0006c974b0837df18b246986f git log from upstream: 858fe955a vp9: fix definition for VP9E_SET_POSTENCODE_DROP fa5083e8e Fix segmentation fault in hbd path 759d1de9d vp8 dec: Add flag to bring up threads. 38d98d870 vp8 idct dequant: resolve missing declarations 2e39962d7 vp8 blend: resolve missing declarations 0aeaf29b1 vp8 overlaps: resolve missing declaration f485c67d0 vp9_get_blockiness: resolve missing declaration 5aeaf43c4 vp8 multi dimensional search: resolve missing declarations 8466728f8 vp8_copy32xn: resolve missing declaration f479beeeb vpx_filter: resolve missing declarations 948e51696 vpx_clear_system_state: resolve missing declaration 9cf2e851d vp9 intra pred test: resolve -Wuninitialized warning 57d476bd8 arm neon: resolve missing declarations 46e17f0cb Fix OOB memory access on fuzzed data 6efdd9ad4 fix vp9 fdct_quant ad57c72b9 VP9 firstpass: Bugfix when mi_col_start/end is odd 3271a7ed6 Increase memory size in non-greedy-mv 23f8b8317 Build pyramid motion field c4c5c1d7e vp9: psnr diff thres for single vs multi threading. 95ac0cc9f Adaptively choose block sizes in temporal filtering <...> Test: none BUG=b/122675483 Change-Id: I392f4fab4355476fcbe944986b9c7399c1888d07
Diffstat (limited to 'libvpx/vp9/common/vp9_postproc.c')
-rw-r--r--libvpx/vp9/common/vp9_postproc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libvpx/vp9/common/vp9_postproc.c b/libvpx/vp9/common/vp9_postproc.c
index dfc315eea..5373b0218 100644
--- a/libvpx/vp9/common/vp9_postproc.c
+++ b/libvpx/vp9/common/vp9_postproc.c
@@ -293,7 +293,7 @@ static void swap_mi_and_prev_mi(VP9_COMMON *cm) {
}
int vp9_post_proc_frame(struct VP9Common *cm, YV12_BUFFER_CONFIG *dest,
- vp9_ppflags_t *ppflags) {
+ vp9_ppflags_t *ppflags, int unscaled_width) {
const int q = VPXMIN(105, cm->lf.filter_level * 2);
const int flags = ppflags->post_proc_flag;
YV12_BUFFER_CONFIG *const ppbuf = &cm->post_proc_buffer;
@@ -359,7 +359,7 @@ int vp9_post_proc_frame(struct VP9Common *cm, YV12_BUFFER_CONFIG *dest,
if (flags & (VP9D_DEMACROBLOCK | VP9D_DEBLOCK)) {
if (!cm->postproc_state.limits) {
cm->postproc_state.limits =
- vpx_calloc(cm->width, sizeof(*cm->postproc_state.limits));
+ vpx_calloc(unscaled_width, sizeof(*cm->postproc_state.limits));
}
}