Skip to content
Snippets Groups Projects
Commit 8fd82c6d authored by Dominik Loidolt's avatar Dominik Loidolt
Browse files

fix cmp_rdcu_cfg and cmp_entity test

parent 5ac13b55
No related branches found
No related tags found
1 merge request!12increase code coverage, general code refactoring
...@@ -174,13 +174,12 @@ void test_cmp_input_size_to_samples(void) ...@@ -174,13 +174,12 @@ void test_cmp_input_size_to_samples(void)
data_type = DATA_TYPE_S_FX_NCOB; data_type = DATA_TYPE_S_FX_NCOB;
size = MULTI_ENTRY_HDR_SIZE - 1; size = MULTI_ENTRY_HDR_SIZE - 1;
samples_get = cmp_input_size_to_samples(size, data_type); samples_get = cmp_input_size_to_samples(size, data_type);
TEST_ASSERT_EQUAL(-1, samples_get);
data_type = DATA_TYPE_S_FX_NCOB; data_type = DATA_TYPE_S_FX_NCOB;
data_type = DATA_TYPE_S_FX_NCOB;
size = MULTI_ENTRY_HDR_SIZE + 4*sizeof(struct s_fx_ncob) - 1; size = MULTI_ENTRY_HDR_SIZE + 4*sizeof(struct s_fx_ncob) - 1;
samples_get = cmp_input_size_to_samples(size, data_type); samples_get = cmp_input_size_to_samples(size, data_type);
TEST_ASSERT_EQUAL(-1, samples_get); TEST_ASSERT_EQUAL(-1, samples_get);
TEST_ASSERT_EQUAL(-1, samples_get);
} }
......
...@@ -2156,6 +2156,7 @@ void test_cmp_ent_write_rdcu_cmp_pars(void) ...@@ -2156,6 +2156,7 @@ void test_cmp_ent_write_rdcu_cmp_pars(void)
/* golomb_par to high */ /* golomb_par to high */
info.golomb_par_used = 0x100; info.golomb_par_used = 0x100;
error = cmp_ent_write_rdcu_cmp_pars(ent, &info, &cfg); error = cmp_ent_write_rdcu_cmp_pars(ent, &info, &cfg);
TEST_ASSERT_TRUE(error);
info.golomb_par_used = 0xFF; info.golomb_par_used = 0xFF;
/* this should work */ /* this should work */
error = cmp_ent_write_rdcu_cmp_pars(ent, &info, &cfg); error = cmp_ent_write_rdcu_cmp_pars(ent, &info, &cfg);
......
...@@ -9,4 +9,4 @@ test_cmp_rdcu_cfg = executable('test_cmp_rdcu_cfg', ...@@ -9,4 +9,4 @@ test_cmp_rdcu_cfg = executable('test_cmp_rdcu_cfg',
build_by_default : false build_by_default : false
) )
test('Hardware Compressor Configuration Library Tests', test_cmp_rdcu_cfg) test('Hardware Compressor Configuration Tests', test_cmp_rdcu_cfg)
...@@ -47,7 +47,7 @@ void test_rdcu_cfg_create(void) ...@@ -47,7 +47,7 @@ void test_rdcu_cfg_create(void)
cfg = rdcu_cfg_create(data_type, cmp_mode, model_value, lossy_par); cfg = rdcu_cfg_create(data_type, cmp_mode, model_value, lossy_par);
TEST_ASSERT_EQUAL(DATA_TYPE_UNKNOWN, cfg.data_type); TEST_ASSERT_EQUAL(DATA_TYPE_UNKNOWN, cfg.data_type);
data_type = -1; /* not valid data type */ data_type = -1U; /* not valid data type */
cfg = rdcu_cfg_create(data_type, cmp_mode, model_value, lossy_par); cfg = rdcu_cfg_create(data_type, cmp_mode, model_value, lossy_par);
TEST_ASSERT_EQUAL(DATA_TYPE_UNKNOWN, cfg.data_type); TEST_ASSERT_EQUAL(DATA_TYPE_UNKNOWN, cfg.data_type);
...@@ -65,7 +65,7 @@ void test_rdcu_cfg_create(void) ...@@ -65,7 +65,7 @@ void test_rdcu_cfg_create(void)
cfg = rdcu_cfg_create(data_type, cmp_mode, model_value, lossy_par); cfg = rdcu_cfg_create(data_type, cmp_mode, model_value, lossy_par);
TEST_ASSERT_EQUAL(DATA_TYPE_UNKNOWN, cfg.data_type); TEST_ASSERT_EQUAL(DATA_TYPE_UNKNOWN, cfg.data_type);
cmp_mode = -1; cmp_mode = -1U;
cfg = rdcu_cfg_create(data_type, cmp_mode, model_value, lossy_par); cfg = rdcu_cfg_create(data_type, cmp_mode, model_value, lossy_par);
TEST_ASSERT_EQUAL(DATA_TYPE_UNKNOWN, cfg.data_type); TEST_ASSERT_EQUAL(DATA_TYPE_UNKNOWN, cfg.data_type);
...@@ -538,11 +538,13 @@ void test_rdcu_cfg_imagette(void) ...@@ -538,11 +538,13 @@ void test_rdcu_cfg_imagette(void)
error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par, error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par,
ap1_golomb_par, ap1_spillover_par, ap1_golomb_par, ap1_spillover_par,
ap2_golomb_par, ap2_spillover_par); ap2_golomb_par, ap2_spillover_par);
TEST_ASSERT_EQUAL(1, error);
golomb_par = MAX_IMA_GOLOMB_PAR; golomb_par = MAX_IMA_GOLOMB_PAR;
spillover_par = cmp_ima_max_spill(golomb_par)+1; spillover_par = cmp_ima_max_spill(golomb_par)+1;
error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par, error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par,
ap1_golomb_par, ap1_spillover_par, ap1_golomb_par, ap1_spillover_par,
ap2_golomb_par, ap2_spillover_par); ap2_golomb_par, ap2_spillover_par);
TEST_ASSERT_EQUAL(1, error);
golomb_par = MIN_IMA_GOLOMB_PAR; golomb_par = MIN_IMA_GOLOMB_PAR;
spillover_par = MIN_IMA_SPILL - 1; spillover_par = MIN_IMA_SPILL - 1;
...@@ -572,11 +574,13 @@ void test_rdcu_cfg_imagette(void) ...@@ -572,11 +574,13 @@ void test_rdcu_cfg_imagette(void)
error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par, error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par,
ap1_golomb_par, ap1_spillover_par, ap1_golomb_par, ap1_spillover_par,
ap2_golomb_par, ap2_spillover_par); ap2_golomb_par, ap2_spillover_par);
TEST_ASSERT_EQUAL(1, error);
ap1_golomb_par = MAX_IMA_GOLOMB_PAR; ap1_golomb_par = MAX_IMA_GOLOMB_PAR;
ap1_spillover_par = cmp_ima_max_spill(golomb_par)+1; ap1_spillover_par = cmp_ima_max_spill(golomb_par)+1;
error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par, error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par,
ap1_golomb_par, ap1_spillover_par, ap1_golomb_par, ap1_spillover_par,
ap2_golomb_par, ap2_spillover_par); ap2_golomb_par, ap2_spillover_par);
TEST_ASSERT_EQUAL(1, error);
ap1_golomb_par = MIN_IMA_GOLOMB_PAR; ap1_golomb_par = MIN_IMA_GOLOMB_PAR;
ap1_spillover_par = MIN_IMA_SPILL - 1; ap1_spillover_par = MIN_IMA_SPILL - 1;
...@@ -606,11 +610,13 @@ void test_rdcu_cfg_imagette(void) ...@@ -606,11 +610,13 @@ void test_rdcu_cfg_imagette(void)
error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par, error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par,
ap1_golomb_par, ap1_spillover_par, ap1_golomb_par, ap1_spillover_par,
ap2_golomb_par, ap2_spillover_par); ap2_golomb_par, ap2_spillover_par);
TEST_ASSERT_EQUAL(1, error);
ap2_golomb_par = MAX_IMA_GOLOMB_PAR; ap2_golomb_par = MAX_IMA_GOLOMB_PAR;
ap2_spillover_par = cmp_ima_max_spill(golomb_par)+1; ap2_spillover_par = cmp_ima_max_spill(golomb_par)+1;
error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par, error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par,
ap1_golomb_par, ap1_spillover_par, ap1_golomb_par, ap1_spillover_par,
ap2_golomb_par, ap2_spillover_par); ap2_golomb_par, ap2_spillover_par);
TEST_ASSERT_EQUAL(1, error);
ap2_golomb_par = MIN_IMA_GOLOMB_PAR; ap2_golomb_par = MIN_IMA_GOLOMB_PAR;
ap2_spillover_par = MIN_IMA_SPILL - 1; ap2_spillover_par = MIN_IMA_SPILL - 1;
...@@ -684,10 +690,12 @@ void test_rdcu_cmp_cfg_is_invalid(void) ...@@ -684,10 +690,12 @@ void test_rdcu_cmp_cfg_is_invalid(void)
error = rdcu_cfg_buffers(&cfg, NULL, 0, NULL, CMP_DEF_IMA_MODEL_RDCU_DATA_ADR, error = rdcu_cfg_buffers(&cfg, NULL, 0, NULL, CMP_DEF_IMA_MODEL_RDCU_DATA_ADR,
CMP_DEF_IMA_MODEL_RDCU_MODEL_ADR, CMP_DEF_IMA_MODEL_RDCU_UP_MODEL_ADR, CMP_DEF_IMA_MODEL_RDCU_MODEL_ADR, CMP_DEF_IMA_MODEL_RDCU_UP_MODEL_ADR,
CMP_DEF_IMA_MODEL_RDCU_BUFFER_ADR, 1); CMP_DEF_IMA_MODEL_RDCU_BUFFER_ADR, 1);
TEST_ASSERT_FALSE(error);
error = rdcu_cfg_imagette(&cfg, error = rdcu_cfg_imagette(&cfg,
CMP_DEF_IMA_MODEL_GOLOMB_PAR, CMP_DEF_IMA_MODEL_SPILL_PAR, CMP_DEF_IMA_MODEL_GOLOMB_PAR, CMP_DEF_IMA_MODEL_SPILL_PAR,
CMP_DEF_IMA_MODEL_AP1_GOLOMB_PAR, CMP_DEF_IMA_MODEL_AP1_SPILL_PAR, CMP_DEF_IMA_MODEL_AP1_GOLOMB_PAR, CMP_DEF_IMA_MODEL_AP1_SPILL_PAR,
CMP_DEF_IMA_MODEL_AP2_GOLOMB_PAR, CMP_DEF_IMA_MODEL_AP2_SPILL_PAR); CMP_DEF_IMA_MODEL_AP2_GOLOMB_PAR, CMP_DEF_IMA_MODEL_AP2_SPILL_PAR);
TEST_ASSERT_FALSE(error);
cfg.icu_new_model_buf = data; cfg.icu_new_model_buf = data;
cfg.icu_output_buf = (void *)model; cfg.icu_output_buf = (void *)model;
error = rdcu_cmp_cfg_is_invalid(&cfg); error = rdcu_cmp_cfg_is_invalid(&cfg);
...@@ -703,10 +711,12 @@ void test_rdcu_cmp_cfg_is_invalid(void) ...@@ -703,10 +711,12 @@ void test_rdcu_cmp_cfg_is_invalid(void)
error = rdcu_cfg_buffers(&cfg, data, 1, model, CMP_DEF_IMA_MODEL_RDCU_DATA_ADR, error = rdcu_cfg_buffers(&cfg, data, 1, model, CMP_DEF_IMA_MODEL_RDCU_DATA_ADR,
CMP_DEF_IMA_MODEL_RDCU_MODEL_ADR, CMP_DEF_IMA_MODEL_RDCU_UP_MODEL_ADR, CMP_DEF_IMA_MODEL_RDCU_MODEL_ADR, CMP_DEF_IMA_MODEL_RDCU_UP_MODEL_ADR,
CMP_DEF_IMA_MODEL_RDCU_BUFFER_ADR, 0); CMP_DEF_IMA_MODEL_RDCU_BUFFER_ADR, 0);
TEST_ASSERT_FALSE(error);
error = rdcu_cfg_imagette(&cfg, error = rdcu_cfg_imagette(&cfg,
CMP_DEF_IMA_MODEL_GOLOMB_PAR, CMP_DEF_IMA_MODEL_SPILL_PAR, CMP_DEF_IMA_MODEL_GOLOMB_PAR, CMP_DEF_IMA_MODEL_SPILL_PAR,
CMP_DEF_IMA_MODEL_AP1_GOLOMB_PAR, CMP_DEF_IMA_MODEL_AP1_SPILL_PAR, CMP_DEF_IMA_MODEL_AP1_GOLOMB_PAR, CMP_DEF_IMA_MODEL_AP1_SPILL_PAR,
CMP_DEF_IMA_MODEL_AP2_GOLOMB_PAR, CMP_DEF_IMA_MODEL_AP2_SPILL_PAR); CMP_DEF_IMA_MODEL_AP2_GOLOMB_PAR, CMP_DEF_IMA_MODEL_AP2_SPILL_PAR);
TEST_ASSERT_FALSE(error);
error = rdcu_cmp_cfg_is_invalid(&cfg); error = rdcu_cmp_cfg_is_invalid(&cfg);
TEST_ASSERT_TRUE(error); TEST_ASSERT_TRUE(error);
...@@ -717,10 +727,12 @@ void test_rdcu_cmp_cfg_is_invalid(void) ...@@ -717,10 +727,12 @@ void test_rdcu_cmp_cfg_is_invalid(void)
error = rdcu_cfg_buffers(&cfg, data, 1, NULL, CMP_DEF_IMA_DIFF_RDCU_DATA_ADR, error = rdcu_cfg_buffers(&cfg, data, 1, NULL, CMP_DEF_IMA_DIFF_RDCU_DATA_ADR,
CMP_DEF_IMA_DIFF_RDCU_MODEL_ADR, CMP_DEF_IMA_DIFF_RDCU_UP_MODEL_ADR, CMP_DEF_IMA_DIFF_RDCU_MODEL_ADR, CMP_DEF_IMA_DIFF_RDCU_UP_MODEL_ADR,
CMP_DEF_IMA_DIFF_RDCU_BUFFER_ADR, 1); CMP_DEF_IMA_DIFF_RDCU_BUFFER_ADR, 1);
TEST_ASSERT_FALSE(error);
error = rdcu_cfg_imagette(&cfg, error = rdcu_cfg_imagette(&cfg,
CMP_DEF_IMA_DIFF_GOLOMB_PAR, CMP_DEF_IMA_DIFF_SPILL_PAR, CMP_DEF_IMA_DIFF_GOLOMB_PAR, CMP_DEF_IMA_DIFF_SPILL_PAR,
CMP_DEF_IMA_DIFF_AP1_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP1_SPILL_PAR, CMP_DEF_IMA_DIFF_AP1_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP1_SPILL_PAR,
CMP_DEF_IMA_DIFF_AP2_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP2_SPILL_PAR); CMP_DEF_IMA_DIFF_AP2_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP2_SPILL_PAR);
TEST_ASSERT_FALSE(error);
error = rdcu_cmp_cfg_is_invalid(&cfg); error = rdcu_cmp_cfg_is_invalid(&cfg);
TEST_ASSERT_TRUE(error); TEST_ASSERT_TRUE(error);
...@@ -730,10 +742,12 @@ void test_rdcu_cmp_cfg_is_invalid(void) ...@@ -730,10 +742,12 @@ void test_rdcu_cmp_cfg_is_invalid(void)
error = rdcu_cfg_buffers(&cfg, data, 1, NULL, RDCU_SRAM_END+4, error = rdcu_cfg_buffers(&cfg, data, 1, NULL, RDCU_SRAM_END+4,
CMP_DEF_IMA_DIFF_RDCU_MODEL_ADR, CMP_DEF_IMA_DIFF_RDCU_UP_MODEL_ADR, CMP_DEF_IMA_DIFF_RDCU_MODEL_ADR, CMP_DEF_IMA_DIFF_RDCU_UP_MODEL_ADR,
CMP_DEF_IMA_DIFF_RDCU_BUFFER_ADR, 1); CMP_DEF_IMA_DIFF_RDCU_BUFFER_ADR, 1);
TEST_ASSERT_TRUE(error);
error = rdcu_cfg_imagette(&cfg, error = rdcu_cfg_imagette(&cfg,
CMP_DEF_IMA_DIFF_GOLOMB_PAR, CMP_DEF_IMA_DIFF_SPILL_PAR, CMP_DEF_IMA_DIFF_GOLOMB_PAR, CMP_DEF_IMA_DIFF_SPILL_PAR,
CMP_DEF_IMA_DIFF_AP1_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP1_SPILL_PAR, CMP_DEF_IMA_DIFF_AP1_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP1_SPILL_PAR,
CMP_DEF_IMA_DIFF_AP2_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP2_SPILL_PAR); CMP_DEF_IMA_DIFF_AP2_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP2_SPILL_PAR);
TEST_ASSERT_FALSE(error);
error = rdcu_cmp_cfg_is_invalid(&cfg); error = rdcu_cmp_cfg_is_invalid(&cfg);
TEST_ASSERT_TRUE(error); TEST_ASSERT_TRUE(error);
...@@ -743,10 +757,12 @@ void test_rdcu_cmp_cfg_is_invalid(void) ...@@ -743,10 +757,12 @@ void test_rdcu_cmp_cfg_is_invalid(void)
error = rdcu_cfg_buffers(&cfg, data, 1, NULL, CMP_DEF_IMA_DIFF_RDCU_DATA_ADR, error = rdcu_cfg_buffers(&cfg, data, 1, NULL, CMP_DEF_IMA_DIFF_RDCU_DATA_ADR,
CMP_DEF_IMA_DIFF_RDCU_MODEL_ADR, CMP_DEF_IMA_DIFF_RDCU_UP_MODEL_ADR, CMP_DEF_IMA_DIFF_RDCU_MODEL_ADR, CMP_DEF_IMA_DIFF_RDCU_UP_MODEL_ADR,
CMP_DEF_IMA_DIFF_RDCU_BUFFER_ADR, 1); CMP_DEF_IMA_DIFF_RDCU_BUFFER_ADR, 1);
TEST_ASSERT_FALSE(error);
error = rdcu_cfg_imagette(&cfg, error = rdcu_cfg_imagette(&cfg,
MAX_IMA_GOLOMB_PAR+1, CMP_DEF_IMA_DIFF_SPILL_PAR, MAX_IMA_GOLOMB_PAR+1, CMP_DEF_IMA_DIFF_SPILL_PAR,
CMP_DEF_IMA_DIFF_AP1_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP1_SPILL_PAR, CMP_DEF_IMA_DIFF_AP1_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP1_SPILL_PAR,
CMP_DEF_IMA_DIFF_AP2_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP2_SPILL_PAR); CMP_DEF_IMA_DIFF_AP2_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP2_SPILL_PAR);
TEST_ASSERT_TRUE(error);
error = rdcu_cmp_cfg_is_invalid(&cfg); error = rdcu_cmp_cfg_is_invalid(&cfg);
TEST_ASSERT_TRUE(error); TEST_ASSERT_TRUE(error);
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment