diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2015-04-28 19:07:40 +0530 |
|---|---|---|
| committer | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2015-04-28 19:17:04 +0530 |
| commit | c72323e7234ceda6c2c5be5bc2622d87cd4fbaf5 (patch) | |
| tree | ee7914d40fe6226b5c9e0e25d9e3b9e4f578eab1 /test | |
| parent | fab9a811d267f2c71bd031512e2a230cea1fb96f (diff) | |
| download | android_external_libavc-c72323e7234ceda6c2c5be5bc2622d87cd4fbaf5.tar.gz android_external_libavc-c72323e7234ceda6c2c5be5bc2622d87cd4fbaf5.tar.bz2 android_external_libavc-c72323e7234ceda6c2c5be5bc2622d87cd4fbaf5.zip | |
Fixed few issues seen in CTS tests
Added support for encoding non-multiple of 16 dimensions
Added support for encoding dimensions smaller than 64x64
Aligned coeff data to 4 byte boundary
Change-Id: I111093950f94698296d8499a2845cfe2db6c557b
Diffstat (limited to 'test')
| -rwxr-xr-x | test/encoder/app.h | 1 | ||||
| -rwxr-xr-x | test/encoder/input.c | 6 | ||||
| -rwxr-xr-x | test/encoder/main.c | 8 |
3 files changed, 6 insertions, 9 deletions
diff --git a/test/encoder/app.h b/test/encoder/app.h index 8c409b8..7c16fcd 100755 --- a/test/encoder/app.h +++ b/test/encoder/app.h @@ -127,7 +127,6 @@ #define DEFAULT_EPROFILE IV_PROFILE_BASE #define DEFAULT_SLICE_MODE 0 #define DEFAULT_SLICE_PARAM 256 -#define DEFAULT_ARCH ARCH_ARM_A9Q #define STRLENGTH 500 diff --git a/test/encoder/input.c b/test/encoder/input.c index aa52b45..c292612 100755 --- a/test/encoder/input.c +++ b/test/encoder/input.c @@ -243,10 +243,8 @@ void allocate_input(app_ctxt_t *ps_app_ctxt) num_bufs = MIN(DEFAULT_MAX_INPUT_BUFS, num_bufs); /* Size of buffer */ - luma_size = ps_get_buf_info_op->s_ive_op.au4_min_in_buf_size[0]; - chroma_size = ps_get_buf_info_op->s_ive_op.au4_min_in_buf_size[1]+ - ps_get_buf_info_op->s_ive_op.au4_min_in_buf_size[2]; - + luma_size = ps_app_ctxt->u4_wd * ps_app_ctxt->u4_ht; + chroma_size = luma_size >> 1; pic_size = luma_size + chroma_size; num_mbs = ALIGN16(ps_app_ctxt->u4_max_wd) * ALIGN16(ps_app_ctxt->u4_max_ht); diff --git a/test/encoder/main.c b/test/encoder/main.c index b02958a..2a9635d 100755 --- a/test/encoder/main.c +++ b/test/encoder/main.c @@ -905,7 +905,7 @@ void init_default_params(app_ctxt_t *ps_app_ctxt) ps_app_ctxt->u4_pics_cnt = 0; ps_app_ctxt->e_inp_color_fmt = DEFAULT_INP_COLOR_FMT; ps_app_ctxt->e_recon_color_fmt = DEFAULT_RECON_COLOR_FMT; - ps_app_ctxt->e_arch = DEFAULT_ARCH; + ps_app_ctxt->e_arch = ARCH_ARM_A9Q; ps_app_ctxt->e_soc = SOC_GENERIC; ps_app_ctxt->header_generated = 0; ps_app_ctxt->pv_codec_obj = NULL; @@ -1604,9 +1604,9 @@ void synchronous_encode(iv_obj_t *ps_enc, app_ctxt_t *ps_app_ctxt) { /* init buffers */ ps_inp_raw_buf->apv_bufs[0] = pu1_buf; - pu1_buf += (ps_app_ctxt->u4_strd) * ALIGN16(ps_app_ctxt->u4_ht); + pu1_buf += (ps_app_ctxt->u4_wd) * ps_app_ctxt->u4_ht; ps_inp_raw_buf->apv_bufs[1] = pu1_buf; - pu1_buf += (ps_app_ctxt->u4_strd >> 1) * (ALIGN16(ps_app_ctxt->u4_ht) >> 1); + pu1_buf += (ps_app_ctxt->u4_wd >> 1) * (ps_app_ctxt->u4_ht >> 1); ps_inp_raw_buf->apv_bufs[2] = pu1_buf; ps_inp_raw_buf->au4_wd[0] = ps_app_ctxt->u4_wd; @@ -2346,7 +2346,7 @@ int main(int argc, char *argv[]) /*****************************************************************************/ /* Video control Set Frame dimensions */ /*****************************************************************************/ - s_app_ctxt.u4_strd = ALIGN16(s_app_ctxt.u4_wd); + s_app_ctxt.u4_strd = s_app_ctxt.u4_wd; set_dimensions(&s_app_ctxt, 0, 0); /*****************************************************************************/ |