commit e1ebb418ebdcc5202ed6a3bea38547fd6ed4b7ca
author Jerome Jiang <jianj@google.com> Wed Jun 17 11:45:52 2020 -0700
committer Jerome Jiang <jianj@google.com> Wed Jun 17 21:05:26 2020 +0000
tree 475f15e32d201fa4021bf8021b4ce6c6d3a0a01e
parent a908224042c9679164f9b18976e0aba5b7b00a6d

Free allocated memory before allocating again in svc init.

Prevent memory leak when svc init is called more than once.

Change-Id: Ib16ca00e24c05d57f2a22c5943f4a2a9838fe76a

av1/encoder/svc_layercontext.c

diff --git a/av1/encoder/svc_layercontext.c b/av1/encoder/svc_layercontext.c
index 1936d52..0890e7d 100644
--- a/av1/encoder/svc_layercontext.c
+++ b/av1/encoder/svc_layercontext.c
@@ -64,11 +64,13 @@
         lc->actual_num_seg1_blocks = 0;
         lc->actual_num_seg2_blocks = 0;
         lc->counter_encode_maxq_scene_change = 0;
+        if (lc->map) aom_free(lc->map);
         CHECK_MEM_ERROR(cm, lc->map,
                         aom_malloc(mi_rows * mi_cols * sizeof(*lc->map)));
         memset(lc->map, 0, mi_rows * mi_cols);
         last_coded_q_map_size =
             mi_rows * mi_cols * sizeof(*lc->last_coded_q_map);
+        if (lc->last_coded_q_map) aom_free(lc->last_coded_q_map);
         CHECK_MEM_ERROR(cm, lc->last_coded_q_map,
                         aom_malloc(last_coded_q_map_size));
         assert(MAXQ <= 255);