ref: 9520f4b3cc0710729347ea156ff32ad536ea6a45
parent: d283d9bb307fe2e93107a4271bb984d8cd6c6736
author: Yunqing Wang <yunqingwang@google.com>
date: Mon Dec 6 12:21:37 EST 2010
Fix a memory leak problem in encoder Deallocating the buffers before re-allocating them. The fix passed James Berry's test program for memory leak check. Change-Id: I18c3cf665412c0e313a523e3d435106c03ca438d
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -324,8 +324,15 @@
cpi->mb.pip = 0;
- vpx_free(cpi->total_stats);
- vpx_free(cpi->this_frame_stats);
+ if(cpi->total_stats)
+ vpx_free(cpi->total_stats);
+
+ cpi->total_stats = 0;
+
+ if(cpi->this_frame_stats)
+ vpx_free(cpi->this_frame_stats);
+
+ cpi->this_frame_stats = 0;
}
static void enable_segmentation(VP8_PTR ptr)
@@ -1326,6 +1333,9 @@
static int vp8_alloc_partition_data(VP8_COMP *cpi)
{
+ if(cpi->mb.pip)
+ vpx_free(cpi->mb.pip);
+
cpi->mb.pip = vpx_calloc((cpi->common.mb_cols + 1) *
(cpi->common.mb_rows + 1),
sizeof(PARTITION_INFO));
@@ -1393,8 +1403,16 @@
cpi->gf_active_count = cm->mb_rows * cm->mb_cols;
+ if(cpi->total_stats)
+ vpx_free(cpi->total_stats);
+
cpi->total_stats = vpx_calloc(1, vp8_firstpass_stats_sz(cpi->common.MBs));
+
+ if(cpi->this_frame_stats)
+ vpx_free(cpi->this_frame_stats);
+
cpi->this_frame_stats = vpx_calloc(1, vp8_firstpass_stats_sz(cpi->common.MBs));
+
if(!cpi->total_stats || !cpi->this_frame_stats)
vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,
"Failed to allocate firstpass stats");
--
⑨