summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cesar/ce/rx/bitloading/inc/intervals.h3
-rw-r--r--cesar/ce/rx/bitloading/src/common.c2
-rw-r--r--cesar/ce/rx/bitloading/src/intervals.c4
-rw-r--r--cesar/ce/rx/bitloading/test/src/test_intervals.c21
4 files changed, 16 insertions, 14 deletions
diff --git a/cesar/ce/rx/bitloading/inc/intervals.h b/cesar/ce/rx/bitloading/inc/intervals.h
index 7f00f3aee6..ab95a45c9b 100644
--- a/cesar/ce/rx/bitloading/inc/intervals.h
+++ b/cesar/ce/rx/bitloading/inc/intervals.h
@@ -71,10 +71,11 @@ ce_rx_bl_intervals_update_tmi (sta_t *sta, const bsu_aclf_bp_t bp_tck);
/*
* Update global default tonemap according to intervals states.
+ * \param ce_rx CE RX context.
* \param sta station context.
*/
void
-ce_rx_bl_intervals_update_default_tm (sta_t *sta);
+ce_rx_bl_intervals_update_default_tm (ce_rx_t *ce_rx, sta_t *sta);
/**
* Reset intervals which have a specific fsm id.
diff --git a/cesar/ce/rx/bitloading/src/common.c b/cesar/ce/rx/bitloading/src/common.c
index 09677c5002..fc111aeaaf 100644
--- a/cesar/ce/rx/bitloading/src/common.c
+++ b/cesar/ce/rx/bitloading/src/common.c
@@ -138,7 +138,7 @@ ce_rx_bl_start_bl (ce_rx_t *ce_rx, sta_t *sta, int fsm_id)
sta->intervals->tmi[fsm_id] = new_tmi;
/* Update default global tonemap. */
- ce_rx_bl_intervals_update_default_tm (sta);
+ ce_rx_bl_intervals_update_default_tm (ce_rx, sta);
/* Update intervals in rx_tonemaps. */
ce_rx_bl_intervals_update_tmi (sta,
diff --git a/cesar/ce/rx/bitloading/src/intervals.c b/cesar/ce/rx/bitloading/src/intervals.c
index cd4cb4f0fd..39b67865bf 100644
--- a/cesar/ce/rx/bitloading/src/intervals.c
+++ b/cesar/ce/rx/bitloading/src/intervals.c
@@ -157,7 +157,7 @@ ce_rx_bl_intervals_update_tmi (sta_t *sta, const bsu_aclf_bp_t bp_tck)
}
void
-ce_rx_bl_intervals_update_default_tm (sta_t *sta)
+ce_rx_bl_intervals_update_default_tm (ce_rx_t *ce_rx, sta_t *sta)
{
dbg_assert (sta);
dbg_assert (sta->intervals);
@@ -242,7 +242,7 @@ ce_rx_bl_intervals_reset (ce_rx_t *ce_rx, sta_t *sta, int fsm_id)
*tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE;
/* Update default tonemap. */
- ce_rx_bl_intervals_update_default_tm (sta);
+ ce_rx_bl_intervals_update_default_tm (ce_rx, sta);
/* Mark the intervals TMI to be released if this fsm had negotiated
* its own tone map. */
diff --git a/cesar/ce/rx/bitloading/test/src/test_intervals.c b/cesar/ce/rx/bitloading/test/src/test_intervals.c
index 6960e997af..d159ab444f 100644
--- a/cesar/ce/rx/bitloading/test/src/test_intervals.c
+++ b/cesar/ce/rx/bitloading/test/src/test_intervals.c
@@ -569,6 +569,7 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t)
uint old_fsm_nb = ce_rx_bl_intervals_fsm_count_;
uint old_repetition_nb = ce_rx_bl_intervals_repetition_count_;
+ ce_rx_t ce_rx;
sta_t sta;
tonemap_t tm;
int i;
@@ -588,16 +589,16 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t)
test_begin (t, "One interval, not restarting.")
{
sta.rx_tonemaps->default_tmi = 0;
- ce_rx_bl_intervals_update_default_tm (&sta);
+ ce_rx_bl_intervals_update_default_tm (&ce_rx, &sta);
test_fail_if (sta.rx_tonemaps->default_tmi != 4);
sta.rx_tonemaps->default_tmi = 4;
- ce_rx_bl_intervals_update_default_tm (&sta);
+ ce_rx_bl_intervals_update_default_tm (&ce_rx, &sta);
test_fail_if (sta.rx_tonemaps->default_tmi != 4);
test_fail_if (sta.rx_tonemaps->tm[4]->released != 0);
sta.intervals->tmi[0] = 5;
- ce_rx_bl_intervals_update_default_tm (&sta);
+ ce_rx_bl_intervals_update_default_tm (&ce_rx, &sta);
test_fail_if (sta.rx_tonemaps->default_tmi != 5);
test_fail_if (sta.rx_tonemaps->tm[4]->released
!= TONEMAP_RELEASE_TIMER_S);
@@ -610,14 +611,14 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t)
{
sta.intervals->tmi[0] = TONEMAP_SRC_INTERVAL_UNAVAILABLE;
sta.intervals->intervals[0]->default_robo = false;
- ce_rx_bl_intervals_update_default_tm (&sta);
+ ce_rx_bl_intervals_update_default_tm (&ce_rx, &sta);
test_fail_if (sta.rx_tonemaps->default_tmi != 4);
test_fail_if (sta.rx_tonemaps->tm[4]->released != 0);
} test_end;
test_begin (t, "One interval, restarting for a worst tonemap.")
{
sta.intervals->intervals[0]->default_robo = true;
- ce_rx_bl_intervals_update_default_tm (&sta);
+ ce_rx_bl_intervals_update_default_tm (&ce_rx, &sta);
test_fail_if (sta.rx_tonemaps->default_tmi != 0);
test_fail_if (sta.rx_tonemaps->tm[4]->released
!= TONEMAP_RELEASE_TIMER_S);
@@ -636,17 +637,17 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t)
test_begin (t, "Several intervals, no one restarting.")
{
sta.rx_tonemaps->default_tmi = 0;
- ce_rx_bl_intervals_update_default_tm (&sta);
+ ce_rx_bl_intervals_update_default_tm (&ce_rx, &sta);
test_fail_if (sta.rx_tonemaps->default_tmi != 4);
sta.rx_tonemaps->default_tmi = 4;
- ce_rx_bl_intervals_update_default_tm (&sta);
+ ce_rx_bl_intervals_update_default_tm (&ce_rx, &sta);
test_fail_if (sta.rx_tonemaps->default_tmi != 4);
test_fail_if (sta.rx_tonemaps->tm[4]->released != 0);
for (i = 0; i < ce_rx_bl_intervals_fsm_count_; i++)
sta.intervals->tmi[i] = 5;
- ce_rx_bl_intervals_update_default_tm (&sta);
+ ce_rx_bl_intervals_update_default_tm (&ce_rx, &sta);
test_fail_if (sta.rx_tonemaps->default_tmi != 5);
test_fail_if (sta.rx_tonemaps->tm[4]->released
!= TONEMAP_RELEASE_TIMER_S);
@@ -662,7 +663,7 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t)
/* TODO: This will change with new tonemap calculation (see #3880). */
sta.intervals->tmi[0] = TONEMAP_SRC_INTERVAL_UNAVAILABLE;
sta.intervals->intervals[0]->default_robo = false;
- ce_rx_bl_intervals_update_default_tm (&sta);
+ ce_rx_bl_intervals_update_default_tm (&ce_rx, &sta);
test_fail_if (sta.rx_tonemaps->default_tmi != 4);
test_fail_if (sta.rx_tonemaps->tm[4]->released != 0);
} test_end;
@@ -670,7 +671,7 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t)
{
sta.intervals->tmi[1] = TONEMAP_SRC_INTERVAL_UNAVAILABLE;
sta.intervals->intervals[1]->default_robo = true;
- ce_rx_bl_intervals_update_default_tm (&sta);
+ ce_rx_bl_intervals_update_default_tm (&ce_rx, &sta);
test_fail_if (sta.rx_tonemaps->default_tmi != 0);
test_fail_if (sta.rx_tonemaps->tm[4]->released
!= TONEMAP_RELEASE_TIMER_S);