summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/bitloading/test
diff options
context:
space:
mode:
authorCyril Jourdan2013-06-03 15:28:00 +0200
committerCyril Jourdan2013-06-14 15:47:13 +0200
commitab201b5e54d2c07c489cf7fac7bcb4581a5a7ab6 (patch)
treee17fbbfe7ae2473c3f3db4722331e84099a57dc1 /cesar/ce/rx/bitloading/test
parentcc38f2802734a7d7adf8c9ba42c0228d74072d44 (diff)
cesar/ce/rx/bl/fsm: use PBProc interval matching computation, refs #4018
Instead of re-computing frame date and trying to match it on an interval. In the same time, correct management of sound frame SRC in the tests when we want to test the data case and update ce_rx_bl_fsm_measure_to_event stub in cesar/ce/rx/test.
Diffstat (limited to 'cesar/ce/rx/bitloading/test')
-rw-r--r--cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c5
-rw-r--r--cesar/ce/rx/bitloading/test/src/test_intervals.c22
2 files changed, 18 insertions, 9 deletions
diff --git a/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c b/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c
index f69fa5290a..e63afa8d76 100644
--- a/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c
+++ b/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c
@@ -346,6 +346,11 @@ test_ce_rx_bl_fsm_INTERVALS (test_t t)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
tonemaps_reset, .tms = sta.rx_tonemaps);
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
+ mac_interval_clear, .tms = sta.rx_tonemaps);
+ fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
+ mac_interval_commit_changes,
+ .tms = sta.rx_tonemaps, .group_intervals_nb = 0);
+ fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
ce_rx_bl_nsr_sum_init, .bl = &sta.ce_rx_bt);
fsm_base[pos++] = (scenario_entry_t) SCENARIO_END;
scenario_run (t, fsm_base, &globals);
diff --git a/cesar/ce/rx/bitloading/test/src/test_intervals.c b/cesar/ce/rx/bitloading/test/src/test_intervals.c
index 99a5f36cbd..50e1cd88d9 100644
--- a/cesar/ce/rx/bitloading/test/src/test_intervals.c
+++ b/cesar/ce/rx/bitloading/test/src/test_intervals.c
@@ -317,12 +317,15 @@ test_suite_ce_rx_bl_intervals_measure_to_event_master_test (
bp_atu = MAC_TCK_TO_ATU (bp_tck);
if (intervals)
{
+ sta.intervals = ce_rx_bl_intervals_alloc (&sta.ce_rx_bt,
+ TONEMAP_INDEX_NEGOTIATED_FIRST);
for (i = 1; i <= 24; i++)
mac_interval_append (tms, bp_atu * i / 24, i);
mac_interval_commit_changes (tms, ce_rx_bl_intervals_fsm_count_);
}
+ else
+ sta.intervals = NULL;
sta.rx_tonemaps = tms;
- sta.intervals = NULL;
data.measure = &measure;
/* Configure measure. */
@@ -332,14 +335,13 @@ test_suite_ce_rx_bl_intervals_measure_to_event_master_test (
measure.rx_params.sound_src = TONEMAP_SRC_INTERVAL_UNAVAILABLE;
else
measure.rx_params.sound_src = TONEMAP_SRC_INITIAL;
- measure.rx_params.preamble_ntb = 0;
- measure.rx_params.beacon_period_start_ntb = 0;
+
+ /* Measure is located on an interval. */
+ if (mea_interval && (!sound || src_interval))
+ measure.rx_params.interval_group = 0;
/* Measure is global. */
- if (!mea_interval)
- measure.rx_params.fl_tck = bp_tck;
- /* Measure is located on an interval */
else
- measure.rx_params.fl_tck = bp_tck / 25;
+ measure.rx_params.interval_group = -1;
*event = ce_rx_bl_fsm_measure_to_event (&sta, data);
*fsm_id = measure.fsm_id;
@@ -347,6 +349,8 @@ test_suite_ce_rx_bl_intervals_measure_to_event_master_test (
/* Clean. */
tonemaps_release (tms);
ce_rx_bitloading_uninit (&sta.ce_rx_bt);
+ if (sta.intervals)
+ ce_rx_bl_intervals_free (sta.intervals);
}
void
@@ -479,7 +483,7 @@ test_suite_ce_rx_bl_intervals_measure_to_event (test_t t)
/* Measure is positioned on an interval ? */
false,
/* SRC is interval specific ? */
- true,
+ false,
&out, &fsm_id);
test_fail_if (out != CE_RX_BL_FSM_EVENT_TYPE_data);
test_fail_if (fsm_id != -1);
@@ -495,7 +499,7 @@ test_suite_ce_rx_bl_intervals_measure_to_event (test_t t)
/* Measure is positioned on an interval ? */
true,
/* SRC is interval specific ? */
- true,
+ false,
&out, &fsm_id);
test_fail_if (out != CE_RX_BL_FSM_EVENT_TYPE_interval_data);
test_fail_if (fsm_id != 0);