commit 51f4eb6b2176c589746c5b352f2a4218806757d5
author Treehugger Robot <treehugger-gerrit@google.com> Mon Dec 07 22:47:59 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 07 22:47:59 2020 +0000
tree 17bdd1f4375203442b08a3c9bed169d244e90511
parent c238d1ba0a2eebbf6dcae183da54f2f42100d23a
parent 9623000c124facfcee78ffbc341740fa68f3d914

Merge "encoder: Fix divide by zero in all intra encoding case" am: 9623000c12

Original change: https://android-review.googlesource.com/c/platform/external/libhevc/+/1505717

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I641dec7babfcae9bedd749c20a966938cb5143fa

decoder/ihevcd_sao.c

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 @@
     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 @@
     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;