summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-11-10 14:45:21 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-11-10 14:45:21 +0000
commitcee8dffb17311f26ef35d9f6ee4edbe6abee862a (patch)
tree2e7818c229066dd521270912449cf6234e09531f
parentdd45f94cc0cdfec9b627beaddeb3c2b11d859b57 (diff)
parent7995c17c17c37a5261bc43405457a05a8569500a (diff)
downloadplatform_external_libhevc-android11-qpr1-c-release.tar.gz
platform_external_libhevc-android11-qpr1-c-release.tar.bz2
platform_external_libhevc-android11-qpr1-c-release.zip
Merge cherrypicks of [13026782, 13027364, 13027365, 13027366, 13027416, 13027417, 13027418, 13027367, 13027033, 13027034, 13027419, 13027420, 13027421, 13026821, 13027368, 13027369, 13027370, 13027371, 13026771, 13026772, 13026784, 13027422, 13027372, 13026773, 13027121, 13027373, 13027374, 13027375, 13027496, 13027497, 13026733, 13027144, 13026734, 13027145, 13027146, 13026748, 13026902, 13026822, 13026749, 13026823, 13027498, 13026735, 13027423, 13026785, 13027035, 13026774, 13026775, 13027338, 13026750, 13026751, 13026824, 13026825, 13026633, 13027499, 13027500, 13027122, 13027501, 13026634, 13026635, 13027516, 13027517, 13027518, 13027519, 13027520, 13027521, 13027522, 13027523, 13027524, 13027424, 13027425, 13027426, 13027427, 13027502, 13026786, 13026787, 13026788, 13026789, 13026790, 13026791, 13026792, 13026793, 13026794, 13026795, 13027536, 13027537, 13027538, 13027539, 13027556, 13027557, 13027576, 13026826, 13027503, 13027577] into rvc-qpr1-c-releaseandroid-11.0.0_r30android11-qpr1-c-release
Change-Id: I8414b1b26a14f4c009ed21547737787f6f965f31
-rw-r--r--decoder/ihevcd_sao.c24
1 files changed, 9 insertions, 15 deletions
diff --git a/decoder/ihevcd_sao.c b/decoder/ihevcd_sao.c
index 3940b6a..243e2ce 100644
--- a/decoder/ihevcd_sao.c
+++ b/decoder/ihevcd_sao.c
@@ -103,16 +103,14 @@ void ihevcd_sao_ctb(sao_ctxt_t *ps_sao_ctxt)
UWORD8 *pu1_no_loop_filter_flag;
WORD32 loop_filter_strd;
- WORD8 ai1_offset_y[5];
- WORD8 ai1_offset_cb[5];
- WORD8 ai1_offset_cr[5];
+ /* Only first 5 values are used, but arrays are large
+ enough so that SIMD functions can read 64 bits at a time */
+ WORD8 ai1_offset_y[8] = {0};
+ WORD8 ai1_offset_cb[8] = {0};
+ WORD8 ai1_offset_cr[8] = {0};
PROFILE_DISABLE_SAO();
- ai1_offset_y[0] = 0;
- ai1_offset_cb[0] = 0;
- ai1_offset_cr[0] = 0;
-
ps_sps = ps_sao_ctxt->ps_sps;
log2_ctb_size = ps_sps->i1_log2_ctb_size;
ctb_size = (1 << log2_ctb_size);
@@ -568,19 +566,15 @@ void ihevcd_sao_shift_ctb(sao_ctxt_t *ps_sao_ctxt)
UWORD8 *pu1_sao_src_top_left_luma_bot_left;
UWORD8 *au1_sao_src_top_left_chroma_bot_left;
UWORD8 *pu1_sao_src_top_left_chroma_bot_left;
- /* Only 5 values are used, but arrays are large
+ /* Only first 5 values are used, but arrays are large
enough so that SIMD functions can read 64 bits at a time */
- WORD8 ai1_offset_y[8];
- WORD8 ai1_offset_cb[8];
- WORD8 ai1_offset_cr[8];
+ WORD8 ai1_offset_y[8] = {0};
+ WORD8 ai1_offset_cb[8] = {0};
+ WORD8 ai1_offset_cr[8] = {0};
WORD32 chroma_yuv420sp_vu = ps_sao_ctxt->is_chroma_yuv420sp_vu;
PROFILE_DISABLE_SAO();
- ai1_offset_y[0] = 0;
- ai1_offset_cb[0] = 0;
- ai1_offset_cr[0] = 0;
-
ps_sps = ps_sao_ctxt->ps_sps;
ps_pps = ps_sao_ctxt->ps_pps;
ps_tile = ps_sao_ctxt->ps_tile;