From 326a32b1eacefed4ecc6b716c33524a427889a0b Mon Sep 17 00:00:00 2001
From: Dominik Loidolt <dominik.loidolt@univie.ac.at>
Date: Fri, 2 Sep 2022 09:26:07 +0200
Subject: [PATCH] Change compression data types containing DFX to EFX
---
include/cmp_support.h | 12 +++++-----
lib/cmp_data_types.c | 24 +++++++++----------
lib/cmp_entity.c | 48 ++++++++++++++++++-------------------
lib/cmp_icu.c | 12 +++++-----
lib/cmp_io.c | 12 +++++-----
lib/cmp_support.c | 24 +++++++++----------
lib/decmp.c | 16 ++++++-------
test/cmp_icu/test_cmp_icu.c | 38 ++++++++++++++---------------
8 files changed, 93 insertions(+), 93 deletions(-)
diff --git a/include/cmp_support.h b/include/cmp_support.h
index 5c85a99..aa455a5 100644
--- a/include/cmp_support.h
+++ b/include/cmp_support.h
@@ -103,17 +103,17 @@ enum cmp_data_type {
DATA_TYPE_BACKGROUND,
DATA_TYPE_SMEARING,
DATA_TYPE_S_FX,
- DATA_TYPE_S_FX_DFX,
+ DATA_TYPE_S_FX_EFX,
DATA_TYPE_S_FX_NCOB,
- DATA_TYPE_S_FX_DFX_NCOB_ECOB,
+ DATA_TYPE_S_FX_EFX_NCOB_ECOB,
DATA_TYPE_L_FX,
- DATA_TYPE_L_FX_DFX,
+ DATA_TYPE_L_FX_EFX,
DATA_TYPE_L_FX_NCOB,
- DATA_TYPE_L_FX_DFX_NCOB_ECOB,
+ DATA_TYPE_L_FX_EFX_NCOB_ECOB,
DATA_TYPE_F_FX,
- DATA_TYPE_F_FX_DFX,
+ DATA_TYPE_F_FX_EFX,
DATA_TYPE_F_FX_NCOB,
- DATA_TYPE_F_FX_DFX_NCOB_ECOB,
+ DATA_TYPE_F_FX_EFX_NCOB_ECOB,
DATA_TYPE_F_CAM_IMAGETTE,
DATA_TYPE_F_CAM_IMAGETTE_ADAPTIVE,
DATA_TYPE_F_CAM_OFFSET,
diff --git a/lib/cmp_data_types.c b/lib/cmp_data_types.c
index 5a01f8b..6ce5f4b 100644
--- a/lib/cmp_data_types.c
+++ b/lib/cmp_data_types.c
@@ -135,37 +135,37 @@ size_t size_of_a_sample(enum cmp_data_type data_type)
case DATA_TYPE_S_FX:
sample_size = sizeof(struct s_fx);
break;
- case DATA_TYPE_S_FX_DFX:
+ case DATA_TYPE_S_FX_EFX:
sample_size = sizeof(struct s_fx_efx);
break;
case DATA_TYPE_S_FX_NCOB:
sample_size = sizeof(struct s_fx_ncob);
break;
- case DATA_TYPE_S_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_S_FX_EFX_NCOB_ECOB:
sample_size = sizeof(struct s_fx_efx_ncob_ecob);
break;
case DATA_TYPE_L_FX:
sample_size = sizeof(struct l_fx);
break;
- case DATA_TYPE_L_FX_DFX:
+ case DATA_TYPE_L_FX_EFX:
sample_size = sizeof(struct l_fx_efx);
break;
case DATA_TYPE_L_FX_NCOB:
sample_size = sizeof(struct l_fx_ncob);
break;
- case DATA_TYPE_L_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_L_FX_EFX_NCOB_ECOB:
sample_size = sizeof(struct l_fx_efx_ncob_ecob);
break;
case DATA_TYPE_F_FX:
sample_size = sizeof(struct f_fx);
break;
- case DATA_TYPE_F_FX_DFX:
+ case DATA_TYPE_F_FX_EFX:
sample_size = sizeof(struct f_fx_efx);
break;
case DATA_TYPE_F_FX_NCOB:
sample_size = sizeof(struct f_fx_ncob);
break;
- case DATA_TYPE_F_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_F_FX_EFX_NCOB_ECOB:
sample_size = sizeof(struct f_fx_efx_ncob_ecob);
break;
case DATA_TYPE_F_CAM_OFFSET:
@@ -493,37 +493,37 @@ int cmp_input_big_to_cpu_endianness(void *data, uint32_t data_size_byte,
case DATA_TYPE_S_FX:
be_to_cpus_s_fx(data, samples);
break;
- case DATA_TYPE_S_FX_DFX:
+ case DATA_TYPE_S_FX_EFX:
be_to_cpus_s_fx_efx(data, samples);
break;
case DATA_TYPE_S_FX_NCOB:
be_to_cpus_s_fx_ncob(data, samples);
break;
- case DATA_TYPE_S_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_S_FX_EFX_NCOB_ECOB:
be_to_cpus_s_fx_efx_ncob_ecob(data, samples);
break;
case DATA_TYPE_L_FX:
be_to_cpus_l_fx(data, samples);
break;
- case DATA_TYPE_L_FX_DFX:
+ case DATA_TYPE_L_FX_EFX:
be_to_cpus_l_fx_efx(data, samples);
break;
case DATA_TYPE_L_FX_NCOB:
be_to_cpus_l_fx_ncob(data, samples);
break;
- case DATA_TYPE_L_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_L_FX_EFX_NCOB_ECOB:
be_to_cpus_l_fx_efx_ncob_ecob(data, samples);
break;
case DATA_TYPE_F_FX:
be_to_cpus_f_fx(data, samples);
break;
- case DATA_TYPE_F_FX_DFX:
+ case DATA_TYPE_F_FX_EFX:
be_to_cpus_f_fx_efx(data, samples);
break;
case DATA_TYPE_F_FX_NCOB:
be_to_cpus_f_fx_ncob(data, samples);
break;
- case DATA_TYPE_F_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_F_FX_EFX_NCOB_ECOB:
be_to_cpus_f_fx_efx_ncob_ecob(data, samples);
break;
/* TODO: implement F_CAM conversion */
diff --git a/lib/cmp_entity.c b/lib/cmp_entity.c
index 6a5b040..c0b2898 100644
--- a/lib/cmp_entity.c
+++ b/lib/cmp_entity.c
@@ -82,17 +82,17 @@ uint32_t cmp_ent_cal_hdr_size(enum cmp_data_type data_type, int raw_mode_flag)
case DATA_TYPE_BACKGROUND:
case DATA_TYPE_SMEARING:
case DATA_TYPE_S_FX:
- case DATA_TYPE_S_FX_DFX:
+ case DATA_TYPE_S_FX_EFX:
case DATA_TYPE_S_FX_NCOB:
- case DATA_TYPE_S_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_S_FX_EFX_NCOB_ECOB:
case DATA_TYPE_L_FX:
- case DATA_TYPE_L_FX_DFX:
+ case DATA_TYPE_L_FX_EFX:
case DATA_TYPE_L_FX_NCOB:
- case DATA_TYPE_L_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_L_FX_EFX_NCOB_ECOB:
case DATA_TYPE_F_FX:
- case DATA_TYPE_F_FX_DFX:
+ case DATA_TYPE_F_FX_EFX:
case DATA_TYPE_F_FX_NCOB:
- case DATA_TYPE_F_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_F_FX_EFX_NCOB_ECOB:
case DATA_TYPE_F_CAM_OFFSET:
case DATA_TYPE_F_CAM_BACKGROUND:
size = NON_IMAGETTE_HEADER_SIZE;
@@ -1661,17 +1661,17 @@ void *cmp_ent_get_data_buf(struct cmp_entity *ent)
case DATA_TYPE_BACKGROUND:
case DATA_TYPE_SMEARING:
case DATA_TYPE_S_FX:
- case DATA_TYPE_S_FX_DFX:
+ case DATA_TYPE_S_FX_EFX:
case DATA_TYPE_S_FX_NCOB:
- case DATA_TYPE_S_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_S_FX_EFX_NCOB_ECOB:
case DATA_TYPE_L_FX:
- case DATA_TYPE_L_FX_DFX:
+ case DATA_TYPE_L_FX_EFX:
case DATA_TYPE_L_FX_NCOB:
- case DATA_TYPE_L_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_L_FX_EFX_NCOB_ECOB:
case DATA_TYPE_F_FX:
- case DATA_TYPE_F_FX_DFX:
+ case DATA_TYPE_F_FX_EFX:
case DATA_TYPE_F_FX_NCOB:
- case DATA_TYPE_F_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_F_FX_EFX_NCOB_ECOB:
case DATA_TYPE_F_CAM_OFFSET:
case DATA_TYPE_F_CAM_BACKGROUND:
return ent->non_ima.cmp_data;
@@ -1893,17 +1893,17 @@ int cmp_ent_write_cmp_pars(struct cmp_entity *ent, const struct cmp_cfg *cfg,
return -1;
break;
case DATA_TYPE_S_FX:
- case DATA_TYPE_S_FX_DFX:
+ case DATA_TYPE_S_FX_EFX:
case DATA_TYPE_S_FX_NCOB:
- case DATA_TYPE_S_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_S_FX_EFX_NCOB_ECOB:
case DATA_TYPE_L_FX:
- case DATA_TYPE_L_FX_DFX:
+ case DATA_TYPE_L_FX_EFX:
case DATA_TYPE_L_FX_NCOB:
- case DATA_TYPE_L_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_L_FX_EFX_NCOB_ECOB:
case DATA_TYPE_F_FX:
- case DATA_TYPE_F_FX_DFX:
+ case DATA_TYPE_F_FX_EFX:
case DATA_TYPE_F_FX_NCOB:
- case DATA_TYPE_F_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_F_FX_EFX_NCOB_ECOB:
if (cmp_ent_set_non_ima_cmp_par1(ent, cfg->cmp_par_exp_flags))
return -1;
if (cmp_ent_set_non_ima_spill1(ent, cfg->spill_exp_flags))
@@ -2206,17 +2206,17 @@ int cmp_ent_read_header(struct cmp_entity *ent, struct cmp_cfg *cfg)
cfg->spill_pixels_error = cmp_ent_get_non_ima_spill3(ent);
break;
case DATA_TYPE_S_FX:
- case DATA_TYPE_S_FX_DFX:
+ case DATA_TYPE_S_FX_EFX:
case DATA_TYPE_S_FX_NCOB:
- case DATA_TYPE_S_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_S_FX_EFX_NCOB_ECOB:
case DATA_TYPE_L_FX:
- case DATA_TYPE_L_FX_DFX:
+ case DATA_TYPE_L_FX_EFX:
case DATA_TYPE_L_FX_NCOB:
- case DATA_TYPE_L_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_L_FX_EFX_NCOB_ECOB:
case DATA_TYPE_F_FX:
- case DATA_TYPE_F_FX_DFX:
+ case DATA_TYPE_F_FX_EFX:
case DATA_TYPE_F_FX_NCOB:
- case DATA_TYPE_F_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_F_FX_EFX_NCOB_ECOB:
cfg->cmp_par_exp_flags = cmp_ent_get_non_ima_cmp_par1(ent);
cfg->spill_exp_flags = cmp_ent_get_non_ima_spill1(ent);
cfg->cmp_par_fx = cmp_ent_get_non_ima_cmp_par2(ent);
diff --git a/lib/cmp_icu.c b/lib/cmp_icu.c
index c6d4a27..2d04120 100644
--- a/lib/cmp_icu.c
+++ b/lib/cmp_icu.c
@@ -2354,39 +2354,39 @@ int icu_compress_data(const struct cmp_cfg *cfg)
case DATA_TYPE_S_FX:
cmp_size = compress_s_fx(cfg);
break;
- case DATA_TYPE_S_FX_DFX:
+ case DATA_TYPE_S_FX_EFX:
cmp_size = compress_s_fx_efx(cfg);
break;
case DATA_TYPE_S_FX_NCOB:
cmp_size = compress_s_fx_ncob(cfg);
break;
- case DATA_TYPE_S_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_S_FX_EFX_NCOB_ECOB:
cmp_size = compress_s_fx_efx_ncob_ecob(cfg);
break;
case DATA_TYPE_F_FX:
cmp_size = compress_f_fx(cfg);
break;
- case DATA_TYPE_F_FX_DFX:
+ case DATA_TYPE_F_FX_EFX:
cmp_size = compress_f_fx_efx(cfg);
break;
case DATA_TYPE_F_FX_NCOB:
cmp_size = compress_f_fx_ncob(cfg);
break;
- case DATA_TYPE_F_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_F_FX_EFX_NCOB_ECOB:
cmp_size = compress_f_fx_efx_ncob_ecob(cfg);
break;
case DATA_TYPE_L_FX:
cmp_size = compress_l_fx(cfg);
break;
- case DATA_TYPE_L_FX_DFX:
+ case DATA_TYPE_L_FX_EFX:
cmp_size = compress_l_fx_efx(cfg);
break;
case DATA_TYPE_L_FX_NCOB:
cmp_size = compress_l_fx_ncob(cfg);
break;
- case DATA_TYPE_L_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_L_FX_EFX_NCOB_ECOB:
cmp_size = compress_l_fx_efx_ncob_ecob(cfg);
break;
diff --git a/lib/cmp_io.c b/lib/cmp_io.c
index 83c6906..be0f8ed 100644
--- a/lib/cmp_io.c
+++ b/lib/cmp_io.c
@@ -46,17 +46,17 @@ static const struct {
{DATA_TYPE_BACKGROUND, "DATA_TYPE_BACKGROUND"},
{DATA_TYPE_SMEARING, "DATA_TYPE_SMEARING"},
{DATA_TYPE_S_FX, "DATA_TYPE_S_FX"},
- {DATA_TYPE_S_FX_DFX, "DATA_TYPE_S_FX_DFX"},
+ {DATA_TYPE_S_FX_EFX, "DATA_TYPE_S_FX_EFX"},
{DATA_TYPE_S_FX_NCOB, "DATA_TYPE_S_FX_NCOB"},
- {DATA_TYPE_S_FX_DFX_NCOB_ECOB, "DATA_TYPE_S_FX_DFX_NCOB_ECOB"},
+ {DATA_TYPE_S_FX_EFX_NCOB_ECOB, "DATA_TYPE_S_FX_EFX_NCOB_ECOB"},
{DATA_TYPE_L_FX, "DATA_TYPE_L_FX"},
- {DATA_TYPE_L_FX_DFX, "DATA_TYPE_L_FX_DFX"},
+ {DATA_TYPE_L_FX_EFX, "DATA_TYPE_L_FX_EFX"},
{DATA_TYPE_L_FX_NCOB, "DATA_TYPE_L_FX_NCOB"},
- {DATA_TYPE_L_FX_DFX_NCOB_ECOB, "DATA_TYPE_L_FX_DFX_NCOB_ECOB"},
+ {DATA_TYPE_L_FX_EFX_NCOB_ECOB, "DATA_TYPE_L_FX_EFX_NCOB_ECOB"},
{DATA_TYPE_F_FX, "DATA_TYPE_F_FX"},
- {DATA_TYPE_F_FX_DFX, "DATA_TYPE_F_FX_DFX"},
+ {DATA_TYPE_F_FX_EFX, "DATA_TYPE_F_FX_EFX"},
{DATA_TYPE_F_FX_NCOB, "DATA_TYPE_F_FX_NCOB"},
- {DATA_TYPE_F_FX_DFX_NCOB_ECOB, "DATA_TYPE_F_FX_DFX_NCOB_ECOB"},
+ {DATA_TYPE_F_FX_EFX_NCOB_ECOB, "DATA_TYPE_F_FX_EFX_NCOB_ECOB"},
{DATA_TYPE_F_CAM_IMAGETTE, "DATA_TYPE_F_CAM_IMAGETTE"},
{DATA_TYPE_F_CAM_IMAGETTE_ADAPTIVE, "DATA_TYPE_F_CAM_IMAGETTE_ADAPTIVE"},
{DATA_TYPE_F_CAM_OFFSET, "DATA_TYPE_F_CAM_OFFSET"},
diff --git a/lib/cmp_support.c b/lib/cmp_support.c
index cfa7dc5..ae7941b 100644
--- a/lib/cmp_support.c
+++ b/lib/cmp_support.c
@@ -297,17 +297,17 @@ int cmp_fx_cob_data_type_is_used(enum cmp_data_type data_type)
{
switch (data_type) {
case DATA_TYPE_S_FX:
- case DATA_TYPE_S_FX_DFX:
+ case DATA_TYPE_S_FX_EFX:
case DATA_TYPE_S_FX_NCOB:
- case DATA_TYPE_S_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_S_FX_EFX_NCOB_ECOB:
case DATA_TYPE_L_FX:
- case DATA_TYPE_L_FX_DFX:
+ case DATA_TYPE_L_FX_EFX:
case DATA_TYPE_L_FX_NCOB:
- case DATA_TYPE_L_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_L_FX_EFX_NCOB_ECOB:
case DATA_TYPE_F_FX:
- case DATA_TYPE_F_FX_DFX:
+ case DATA_TYPE_F_FX_EFX:
case DATA_TYPE_F_FX_NCOB:
- case DATA_TYPE_F_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_F_FX_EFX_NCOB_ECOB:
return 1;
default:
return 0;
@@ -723,7 +723,7 @@ int cmp_cfg_fx_cob_is_valid(const struct cmp_cfg *cfg)
case DATA_TYPE_S_FX:
check_exp_flags = 1;
break;
- case DATA_TYPE_S_FX_DFX:
+ case DATA_TYPE_S_FX_EFX:
check_exp_flags = 1;
check_efx = 1;
break;
@@ -731,7 +731,7 @@ int cmp_cfg_fx_cob_is_valid(const struct cmp_cfg *cfg)
check_exp_flags = 1;
check_ncob = 1;
break;
- case DATA_TYPE_S_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_S_FX_EFX_NCOB_ECOB:
check_exp_flags = 1;
check_ncob = 1;
check_efx = 1;
@@ -741,7 +741,7 @@ int cmp_cfg_fx_cob_is_valid(const struct cmp_cfg *cfg)
check_exp_flags = 1;
check_var = 1;
break;
- case DATA_TYPE_L_FX_DFX:
+ case DATA_TYPE_L_FX_EFX:
check_exp_flags = 1;
check_efx = 1;
check_var = 1;
@@ -751,7 +751,7 @@ int cmp_cfg_fx_cob_is_valid(const struct cmp_cfg *cfg)
check_ncob = 1;
check_var = 1;
break;
- case DATA_TYPE_L_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_L_FX_EFX_NCOB_ECOB:
check_exp_flags = 1;
check_ncob = 1;
check_efx = 1;
@@ -760,13 +760,13 @@ int cmp_cfg_fx_cob_is_valid(const struct cmp_cfg *cfg)
break;
case DATA_TYPE_F_FX:
break;
- case DATA_TYPE_F_FX_DFX:
+ case DATA_TYPE_F_FX_EFX:
check_efx = 1;
break;
case DATA_TYPE_F_FX_NCOB:
check_ncob = 1;
break;
- case DATA_TYPE_F_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_F_FX_EFX_NCOB_ECOB:
check_ncob = 1;
check_efx = 1;
check_ecob = 1;
diff --git a/lib/decmp.c b/lib/decmp.c
index 3c7acfb..534fc46 100644
--- a/lib/decmp.c
+++ b/lib/decmp.c
@@ -664,7 +664,7 @@ static int decompress_s_fx(const struct cmp_cfg *cfg)
/**
- * @brief decompress S_FX_DFX data
+ * @brief decompress S_FX_EFX data
*
* @param cfg pointer to the compression configuration structure
*
@@ -1019,7 +1019,7 @@ static int decompress_f_fx(const struct cmp_cfg *cfg)
/**
- * @brief decompress F_FX_DFX data
+ * @brief decompress F_FX_EFX data
*
* @param cfg pointer to the compression configuration structure
*
@@ -2005,39 +2005,39 @@ static int decompressed_data_internal(struct cmp_cfg *cfg)
case DATA_TYPE_S_FX:
strem_len_bit = decompress_s_fx(cfg);
break;
- case DATA_TYPE_S_FX_DFX:
+ case DATA_TYPE_S_FX_EFX:
strem_len_bit = decompress_s_fx_efx(cfg);
break;
case DATA_TYPE_S_FX_NCOB:
strem_len_bit = decompress_s_fx_ncob(cfg);
break;
- case DATA_TYPE_S_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_S_FX_EFX_NCOB_ECOB:
strem_len_bit = decompress_s_fx_efx_ncob_ecob(cfg);
break;
case DATA_TYPE_F_FX:
strem_len_bit = decompress_f_fx(cfg);
break;
- case DATA_TYPE_F_FX_DFX:
+ case DATA_TYPE_F_FX_EFX:
strem_len_bit = decompress_f_fx_efx(cfg);
break;
case DATA_TYPE_F_FX_NCOB:
strem_len_bit = decompress_f_fx_ncob(cfg);
break;
- case DATA_TYPE_F_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_F_FX_EFX_NCOB_ECOB:
strem_len_bit = decompress_f_fx_efx_ncob_ecob(cfg);
break;
case DATA_TYPE_L_FX:
strem_len_bit = decompress_l_fx(cfg);
break;
- case DATA_TYPE_L_FX_DFX:
+ case DATA_TYPE_L_FX_EFX:
strem_len_bit = decompress_l_fx_efx(cfg);
break;
case DATA_TYPE_L_FX_NCOB:
strem_len_bit = decompress_l_fx_ncob(cfg);
break;
- case DATA_TYPE_L_FX_DFX_NCOB_ECOB:
+ case DATA_TYPE_L_FX_EFX_NCOB_ECOB:
strem_len_bit = decompress_l_fx_efx_ncob_ecob(cfg);
break;
diff --git a/test/cmp_icu/test_cmp_icu.c b/test/cmp_icu/test_cmp_icu.c
index d2c46ce..9038a39 100644
--- a/test/cmp_icu/test_cmp_icu.c
+++ b/test/cmp_icu/test_cmp_icu.c
@@ -582,17 +582,17 @@ void test_cmp_cfg_fx_cob(void)
cmp_par_efx, spillover_efx, cmp_par_ecob, spillover_ecob,
cmp_par_fx_cob_variance, spillover_fx_cob_variance);
if (data_type == DATA_TYPE_S_FX ||
- data_type == DATA_TYPE_S_FX_DFX ||
+ data_type == DATA_TYPE_S_FX_EFX ||
data_type == DATA_TYPE_S_FX_NCOB ||
- data_type == DATA_TYPE_S_FX_DFX_NCOB_ECOB ||
+ data_type == DATA_TYPE_S_FX_EFX_NCOB_ECOB ||
data_type == DATA_TYPE_L_FX ||
- data_type == DATA_TYPE_L_FX_DFX ||
+ data_type == DATA_TYPE_L_FX_EFX ||
data_type == DATA_TYPE_L_FX_NCOB ||
- data_type == DATA_TYPE_L_FX_DFX_NCOB_ECOB ||
+ data_type == DATA_TYPE_L_FX_EFX_NCOB_ECOB ||
data_type == DATA_TYPE_F_FX ||
- data_type == DATA_TYPE_F_FX_DFX ||
+ data_type == DATA_TYPE_F_FX_EFX ||
data_type == DATA_TYPE_F_FX_NCOB ||
- data_type == DATA_TYPE_F_FX_DFX_NCOB_ECOB) {
+ data_type == DATA_TYPE_F_FX_EFX_NCOB_ECOB) {
TEST_ASSERT_FALSE(error);
TEST_ASSERT_EQUAL_INT(data_type, cfg.data_type);
TEST_ASSERT_EQUAL_INT(2, cfg.cmp_par_fx);
@@ -665,8 +665,8 @@ void test_cmp_cfg_fx_cob(void)
TEST_ASSERT_TRUE(error);
- /* test DATA_TYPE_S_FX_DFX */
- cfg = cmp_cfg_icu_create(DATA_TYPE_S_FX_DFX, CMP_MODE_MODEL_ZERO, 0, 1);
+ /* test DATA_TYPE_S_FX_EFX */
+ cfg = cmp_cfg_icu_create(DATA_TYPE_S_FX_EFX, CMP_MODE_MODEL_ZERO, 0, 1);
cmp_par_exp_flags = MAX_ICU_GOLOMB_PAR;
spillover_exp_flags = cmp_icu_max_spill(cmp_par_exp_flags);
cmp_par_fx = MIN_ICU_GOLOMB_PAR;
@@ -735,8 +735,8 @@ void test_cmp_cfg_fx_cob(void)
TEST_ASSERT_TRUE(error);
- /* test DATA_TYPE_S_FX_DFX_NCOB_ECOB */
- cfg = cmp_cfg_icu_create(DATA_TYPE_S_FX_DFX_NCOB_ECOB, CMP_MODE_DIFF_ZERO, 7, CMP_LOSSLESS);
+ /* test DATA_TYPE_S_FX_EFX_NCOB_ECOB */
+ cfg = cmp_cfg_icu_create(DATA_TYPE_S_FX_EFX_NCOB_ECOB, CMP_MODE_DIFF_ZERO, 7, CMP_LOSSLESS);
cmp_par_exp_flags = MAX_ICU_GOLOMB_PAR;
spillover_exp_flags = cmp_icu_max_spill(cmp_par_exp_flags);
cmp_par_fx = MIN_ICU_GOLOMB_PAR;
@@ -810,8 +810,8 @@ void test_cmp_cfg_fx_cob(void)
TEST_ASSERT_TRUE(error);
- /* DATA_TYPE_L_FX_DFX */
- cfg = cmp_cfg_icu_create(DATA_TYPE_L_FX_DFX, CMP_MODE_DIFF_ZERO, 7, CMP_LOSSLESS);
+ /* DATA_TYPE_L_FX_EFX */
+ cfg = cmp_cfg_icu_create(DATA_TYPE_L_FX_EFX, CMP_MODE_DIFF_ZERO, 7, CMP_LOSSLESS);
cmp_par_exp_flags = MAX_ICU_GOLOMB_PAR;
spillover_exp_flags = cmp_icu_max_spill(cmp_par_exp_flags);
cmp_par_fx = MIN_ICU_GOLOMB_PAR;
@@ -870,8 +870,8 @@ void test_cmp_cfg_fx_cob(void)
TEST_ASSERT_EQUAL_INT(spillover_fx_cob_variance, cfg.spill_fx_cob_variance);
- /* DATA_TYPE_L_FX_DFX_NCOB_ECOB */
- cfg = cmp_cfg_icu_create(DATA_TYPE_L_FX_DFX_NCOB_ECOB, CMP_MODE_DIFF_ZERO, 7, CMP_LOSSLESS);
+ /* DATA_TYPE_L_FX_EFX_NCOB_ECOB */
+ cfg = cmp_cfg_icu_create(DATA_TYPE_L_FX_EFX_NCOB_ECOB, CMP_MODE_DIFF_ZERO, 7, CMP_LOSSLESS);
cmp_par_exp_flags = MAX_ICU_GOLOMB_PAR;
spillover_exp_flags = cmp_icu_max_spill(cmp_par_exp_flags);
cmp_par_fx = MIN_ICU_GOLOMB_PAR;
@@ -928,8 +928,8 @@ void test_cmp_cfg_fx_cob(void)
TEST_ASSERT_EQUAL_INT(spillover_fx, cfg.spill_fx);
- /* DATA_TYPE_F_FX_DFX */
- cfg = cmp_cfg_icu_create(DATA_TYPE_F_FX_DFX, CMP_MODE_DIFF_ZERO, 7, CMP_LOSSLESS);
+ /* DATA_TYPE_F_FX_EFX */
+ cfg = cmp_cfg_icu_create(DATA_TYPE_F_FX_EFX, CMP_MODE_DIFF_ZERO, 7, CMP_LOSSLESS);
cmp_par_exp_flags = ~0; /* invalid parameter */
spillover_exp_flags = ~0; /* invalid parameter */
cmp_par_fx = MIN_ICU_GOLOMB_PAR;
@@ -980,8 +980,8 @@ void test_cmp_cfg_fx_cob(void)
TEST_ASSERT_EQUAL_INT(spillover_ncob, cfg.spill_ncob);
- /* DATA_TYPE_F_FX_DFX_NCOB_ECOB */
- cfg = cmp_cfg_icu_create(DATA_TYPE_F_FX_DFX_NCOB_ECOB, CMP_MODE_DIFF_ZERO, 7, CMP_LOSSLESS);
+ /* DATA_TYPE_F_FX_EFX_NCOB_ECOB */
+ cfg = cmp_cfg_icu_create(DATA_TYPE_F_FX_EFX_NCOB_ECOB, CMP_MODE_DIFF_ZERO, 7, CMP_LOSSLESS);
cmp_par_exp_flags = ~0; /* invalid parameter */
spillover_exp_flags = ~0; /* invalid parameter */
cmp_par_fx = MIN_ICU_GOLOMB_PAR;
@@ -2920,7 +2920,7 @@ void test_compress_s_fx_efx_model_multi(void)
cmp_set_max_used_bits(&max_used_bits);
/* setup configuration */
- cfg.data_type = DATA_TYPE_S_FX_DFX;
+ cfg.data_type = DATA_TYPE_S_FX_EFX;
cfg.cmp_mode = CMP_MODE_MODEL_MULTI;
cfg.model_value = 16;
cfg.samples = 6;
--
GitLab