generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

multi-res: modify memory allocation code

Browse Source 
Reverted part of change in memory alllocation code, which ensures
that the function returns 0 and encoder works correctly when
CONFIG_MULTI_RES_ENCODING isn't turned on.

Change-Id: Id5d5e7f2c8bd9e961a6dca79d257e8185f0d592a
This commit is contained in:
Yunqing Wang 2012-05-23 13:40:24 -04:00
parent eb5b965b44
commit ad479a9b3d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vp8/vp8_cx_iface.c
View File

@ -539,6 +539,8 @@ static vpx_codec_err_t set_param(vpx_codec_alg_priv_t *ctx,
static vpx_codec_err_t vp8e_mr_alloc_mem(const vpx_codec_enc_cfg_t *cfg, static vpx_codec_err_t vp8e_mr_alloc_mem(const vpx_codec_enc_cfg_t *cfg,
void **mem_loc) void **mem_loc)
{ {
vpx_codec_err_t res = 0;
#if CONFIG_MULTI_RES_ENCODING #if CONFIG_MULTI_RES_ENCODING
LOWER_RES_FRAME_INFO *shared_mem_loc; LOWER_RES_FRAME_INFO *shared_mem_loc;
int mb_rows = ((cfg->g_w + 15) >>4); int mb_rows = ((cfg->g_w + 15) >>4);
@ -547,20 +549,21 @@ static vpx_codec_err_t vp8e_mr_alloc_mem(const vpx_codec_enc_cfg_t *cfg,
shared_mem_loc = calloc(1, sizeof(LOWER_RES_FRAME_INFO)); shared_mem_loc = calloc(1, sizeof(LOWER_RES_FRAME_INFO));
if(!shared_mem_loc) if(!shared_mem_loc)
{ {
return VPX_CODEC_MEM_ERROR; res = VPX_CODEC_MEM_ERROR;
} }
shared_mem_loc->mb_info = calloc(mb_rows*mb_cols, sizeof(LOWER_RES_MB_INFO)); shared_mem_loc->mb_info = calloc(mb_rows*mb_cols, sizeof(LOWER_RES_MB_INFO));
if(!(shared_mem_loc->mb_info)) if(!(shared_mem_loc->mb_info))
{ {
return VPX_CODEC_MEM_ERROR; res = VPX_CODEC_MEM_ERROR;
} }
else else
{ {
*mem_loc = (void *)shared_mem_loc; *mem_loc = (void *)shared_mem_loc;
return VPX_CODEC_OK; res = VPX_CODEC_OK;
} }
#endif #endif
return res;
} }
static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx, static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx,