summaryrefslogtreecommitdiff
path: root/cesar/ce
diff options
context:
space:
mode:
authordufour2010-04-06 13:19:27 +0000
committerdufour2010-04-06 13:19:27 +0000
commitebe2dfae40bd35b23164ae04754b1c934859f585 (patch)
tree44dfbcbffa68b9902ac612704902e588e11d4ead /cesar/ce
parent9fa03da8239aff9fc17a5859bd84e7c1261b9127 (diff)
cesar/ce/rx/bitloading: import new coefficients for BER consign, closes #1427
Those coefficients are only for code rate 1/2 and are based on revision 11785 for the TNS SVN. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6886 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/ce')
-rw-r--r--cesar/ce/rx/bitloading/src/ber.c6
-rw-r--r--cesar/ce/rx/bitloading/test/data/bl_initial_final.data804
-rw-r--r--cesar/ce/rx/bitloading/test/src/test_bl.c2
3 files changed, 406 insertions, 406 deletions
diff --git a/cesar/ce/rx/bitloading/src/ber.c b/cesar/ce/rx/bitloading/src/ber.c
index 463ddc9d84..4d52d0e7d9 100644
--- a/cesar/ce/rx/bitloading/src/ber.c
+++ b/cesar/ce/rx/bitloading/src/ber.c
@@ -28,7 +28,7 @@ u64 ce_rx_bl_ber_margin_[] = { 0ull, 0ull };
/* Imported from
* http://stestephe/svn/spidcom_digital_svn/projects/DSP_350/DSP_chain/SW/Bit_Loading/BER_vs_NSR/Polynomes_BERinq_vs_NSRq_normalises.m
- * Revision: 11375.
+ * Revision: 11785.
*/
ce_rx_bl_ber_poly_coef_t ce_rx_bl_ber_poly_coef[PHY_FEC_RATE_NB][CE_MOD_COUNT - 1] =
{
@@ -152,13 +152,13 @@ ce_rx_bl_ber_poly_coef_t ce_rx_bl_ber_poly_coef[PHY_FEC_RATE_NB][CE_MOD_COUNT -
static const s64
ce_rx_bl_ber_consign_coefs[PHY_FEC_RATE_NB][CE_RX_BL_BER_POLY_MAX_DEGREE] = {
- { 11596365685ll, 938876543335643ll },
+ { -106541828252ll, 841188148187808ll },
{ -5639041049ll, 127893477397182ll },
};
static const u8 ce_rx_bl_ber_consign_degrees[PHY_FEC_RATE_NB] = { 1, 1, };
const u64 ce_rx_bl_initial_bpt[PHY_FEC_RATE_NB] = {
- 1 * CE_RX_BL_BPT_QUANT_FACTOR,
+ 10 * CE_RX_BL_BPT_QUANT_FACTOR,
10 * CE_RX_BL_BPT_QUANT_FACTOR
};
diff --git a/cesar/ce/rx/bitloading/test/data/bl_initial_final.data b/cesar/ce/rx/bitloading/test/data/bl_initial_final.data
index bd26b2c160..938ad9a90b 100644
--- a/cesar/ce/rx/bitloading/test/data/bl_initial_final.data
+++ b/cesar/ce/rx/bitloading/test/data/bl_initial_final.data
@@ -84,6 +84,52 @@
0
0
0
+4
+4
+4
+4
+4
+4
+4
+4
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
6
6
6
@@ -92,52 +138,6 @@
6
6
6
-8
-8
-8
-8
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
0
0
0
@@ -166,107 +166,12 @@
0
0
0
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-8
-10
-10
-10
-10
-8
-10
-10
-8
-8
6
-8
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
6
6
6
6
6
-8
-8
-8
-10
-10
-8
-10
-8
-8
-8
-8
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-10
-8
-10
-8
-10
-8
6
6
6
@@ -281,6 +186,33 @@
6
6
6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+6
+4
+6
0
0
0
@@ -292,26 +224,26 @@
0
0
0
-0
-0
-0
-0
-0
-0
-0
-0
-0
+4
+4
+4
+4
+4
+6
+6
+6
+6
+6
+6
+6
6
6
6
6
6
6
-8
-8
6
6
-8
6
6
6
@@ -334,11 +266,9 @@
6
6
6
-4
6
4
4
-6
4
4
4
@@ -351,14 +281,38 @@
4
4
4
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
4
4
4
4
4
4
+6
+6
4
4
+6
+6
4
4
4
@@ -388,44 +342,51 @@
4
4
4
+3
+3
+4
+3
+3
+3
+3
+3
+3
+3
+3
+3
+3
+3
+3
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+3
+3
+3
+3
+3
+3
+4
4
-6
-6
-6
-6
-6
-6
-6
-6
-6
-6
-6
-6
-6
-6
-6
-6
-6
-6
-6
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-6
-6
-6
-6
-6
-6
4
-6
4
4
4
@@ -445,32 +406,8 @@
4
4
4
-3
4
4
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-1
-1
-1
-1
-1
-1
-1
-0
0
0
0
@@ -480,32 +417,26 @@
0
0
0
-1
-1
0
-1
-1
-1
-1
-1
-1
-2
-1
-2
-1
-2
-2
-1
-1
-1
-1
-1
-1
-2
-1
-1
-2
-2
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+3
+3
+3
+3
+3
2
2
2
@@ -530,20 +461,153 @@
1
1
1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
1
1
1
1
1
1
-2
-1
-2
-1
-1
-1
-1
-1
1
1
1
@@ -553,17 +617,32 @@
1
1
1
+0
+0
+0
1
1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
1
-2
-2
-2
-2
-2
-2
1
+0
1
+0
+0
+0
1
0
0
@@ -590,73 +669,8 @@
0
0
0
-1
-1
-1
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-1
-2
-1
-1
-1
-1
-1
-1
0
0
-1
0
0
0
@@ -669,19 +683,57 @@
0
0
0
-1
-1
0
0
-1
-1
0
0
0
-1
-1
-1
-1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
0
0
0
@@ -721,6 +773,9 @@
1
1
1
+1
+1
+1
0
0
0
@@ -738,6 +793,26 @@
0
0
0
+1
+0
+0
+1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
0
0
0
@@ -747,81 +822,6 @@
0
0
0
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-1
-1
-1
-2
-2
-2
-2
-2
-2
-1
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-1
-2
-1
-2
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
0
0
0
diff --git a/cesar/ce/rx/bitloading/test/src/test_bl.c b/cesar/ce/rx/bitloading/test/src/test_bl.c
index 2c3a00f8ec..299e8cebaa 100644
--- a/cesar/ce/rx/bitloading/test/src/test_bl.c
+++ b/cesar/ce/rx/bitloading/test/src/test_bl.c
@@ -525,7 +525,7 @@ test_suite_ce_rx_bl_initial (test_t t)
#undef TONEMAP_READ_OPEN
#undef TONEMAP_READ_CLOSE
tonemap_free (tm);
- test_fail_if (tm->fecrate != PHY_FEC_RATE_1_2);
+ test_fail_if (tm->fecrate != PHY_FEC_RATE_16_21);
test_fail_if (bit_per_tone != bit_per_tone_vect);
test_fail_if (tone_diff > TONE_TOLERATED_ERROR, "%d computed "
"tone(s) differs from test vector", tone_diff);