diff options
| author | Johann Koenig <johannkoenig@google.com> | 2017-07-19 21:35:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-07-19 21:35:57 +0000 |
| commit | e1809501d0eaef5b61e84be8973aaacb5cf12ddc (patch) | |
| tree | cd1ea42a735bd923e125ecfdc628fc10725e30ae | |
| parent | 9dd992b6f07bee08ce67dc3b8293b383b029ca35 (diff) | |
| parent | b72d3e8a25720494cef1911f9b9dc3e2c9090323 (diff) | |
| download | libvpx-e1809501d0eaef5b61e84be8973aaacb5cf12ddc.tar libvpx-e1809501d0eaef5b61e84be8973aaacb5cf12ddc.tar.gz libvpx-e1809501d0eaef5b61e84be8973aaacb5cf12ddc.tar.bz2 libvpx-e1809501d0eaef5b61e84be8973aaacb5cf12ddc.zip | |
Merge "Earmark extra space for VSX."
| -rw-r--r-- | vp8/common/reconintra.c | 8 | ||||
| -rw-r--r-- | vp8/common/reconintra4x4.c | 12 |
2 files changed, 19 insertions, 1 deletions
diff --git a/vp8/common/reconintra.c b/vp8/common/reconintra.c index 986074ec7..8e2094da8 100644 --- a/vp8/common/reconintra.c +++ b/vp8/common/reconintra.c @@ -71,8 +71,16 @@ void vp8_build_intra_predictors_mbuv_s( unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char *upred_ptr, unsigned char *vpred_ptr, int pred_stride) { MB_PREDICTION_MODE uvmode = x->mode_info_context->mbmi.uv_mode; +#if HAVE_VSX + /* Power PC implementation uses "vec_vsx_ld" to read 16 bytes from + uleft_col and vleft_col. Play it safe by reserving enough stack + space here. */ + unsigned char uleft_col[16]; + unsigned char vleft_col[16]; +#else unsigned char uleft_col[8]; unsigned char vleft_col[8]; +#endif int i; intra_pred_fn fn; diff --git a/vp8/common/reconintra4x4.c b/vp8/common/reconintra4x4.c index 7852cf9da..64d33a287 100644 --- a/vp8/common/reconintra4x4.c +++ b/vp8/common/reconintra4x4.c @@ -40,7 +40,15 @@ void vp8_intra4x4_predict(unsigned char *above, unsigned char *yleft, int left_stride, B_PREDICTION_MODE b_mode, unsigned char *dst, int dst_stride, unsigned char top_left) { - unsigned char Aboveb[12], *Above = Aboveb + 4; +/* Power PC implementation uses "vec_vsx_ld" to read 16 bytes from + Above (aka, Aboveb + 4). Play it safe by reserving enough stack + space here. Similary for "Left". */ +#if HAVE_VSX + unsigned char Aboveb[20]; +#else + unsigned char Aboveb[12]; +#endif + unsigned char *Above = Aboveb + 4; #if HAVE_NEON // Neon intrinsics are unable to load 32 bits, or 4 8 bit values. Instead, it // over reads but does not use the extra 4 values. @@ -50,6 +58,8 @@ void vp8_intra4x4_predict(unsigned char *above, unsigned char *yleft, // indeed read, they are not used. vp8_zero_array(Left, 8); #endif // VPX_WITH_ASAN +#elif HAVE_VSX + unsigned char Left[16]; #else unsigned char Left[4]; #endif // HAVE_NEON |