summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Economos <w6rz@comcast.net>2018-12-28 15:14:16 -0800
committerMartin Braun <martin.braun@ettus.com>2018-12-28 20:50:48 -0800
commitc35fdf1b64bd2556ff827d25312c4daeeb31aa95 (patch)
tree0522b13b212f0caf6750fc2076ad6c4dee7786b9
parent9bbf8d12ceb8eee0f53e951bd3c797d6c0524130 (diff)
dtv: Fix indentation and white space.
Diffstat
-rw-r--r--gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc210
1 files changed, 105 insertions, 105 deletions
diff --git a/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc
index b08b83a1ea..a0d5fc447b 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2015,2016 Free Software Foundation, Inc.
+ * Copyright 2015,2016,2018 Free Software Foundation, Inc.
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -189,96 +189,24 @@ namespace gr {
const int *c1, *c2, *c3, *c4, *c5, *c6, *c7, *c8;
const int *c9, *c10, *c11, *c12, *c13, *c14, *c15, *c16;
- for(int i=0; i<FRAME_SIZE_NORMAL; i++) {
+ for(int i = 0; i < FRAME_SIZE_NORMAL; i++) {
lookup_table[i] = i;
}
const int *in = &lookup_table[0];
switch (signal_constellation) {
- //ignore QPSK, not worth it, as there is no column interleaving
- case MOD_16QAM:
- rows = frame_size / (mod * 2);
-
- if (frame_size == FRAME_SIZE_NORMAL) {
- twist = &twist16n[0];
- }
- else {
- twist = &twist16s[0];
- }
-
- interleave_parity_bits(tempu, in);
-
- c1 = &tempv[0];
- c2 = &tempv[rows];
- c3 = &tempv[rows * 2];
- c4 = &tempv[rows * 3];
- c5 = &tempv[rows * 4];
- c6 = &tempv[rows * 5];
- c7 = &tempv[rows * 6];
- c8 = &tempv[rows * 7];
-
- twist_interleave_columns(tempv, tempu, rows, twist);
-
- for (int j = 0; j < rows; j++) {
- tempu[index++] = c1[j];
- tempu[index++] = c2[j];
- tempu[index++] = c3[j];
- tempu[index++] = c4[j];
- tempu[index++] = c5[j];
- tempu[index++] = c6[j];
- tempu[index++] = c7[j];
- tempu[index++] = c8[j];
- }
- break;
-
- case MOD_64QAM:
- rows = frame_size / (mod * 2);
-
- if (frame_size == FRAME_SIZE_NORMAL) {
- twist = twist64n;
- }
- else {
- twist = twist64s;
- }
-
- interleave_parity_bits(tempu, in);
-
- c1 = &tempv[0];
- c2 = &tempv[rows];
- c3 = &tempv[rows * 2];
- c4 = &tempv[rows * 3];
- c5 = &tempv[rows * 4];
- c6 = &tempv[rows * 5];
- c7 = &tempv[rows * 6];
- c8 = &tempv[rows * 7];
- c9 = &tempv[rows * 8];
- c10 = &tempv[rows * 9];
- c11 = &tempv[rows * 10];
- c12 = &tempv[rows * 11];
-
- twist_interleave_columns(tempv, tempu, rows, twist);
-
- for (int j = 0; j < rows; j++) {
- tempu[index++] = c1[j];
- tempu[index++] = c2[j];
- tempu[index++] = c3[j];
- tempu[index++] = c4[j];
- tempu[index++] = c5[j];
- tempu[index++] = c6[j];
- tempu[index++] = c7[j];
- tempu[index++] = c8[j];
- tempu[index++] = c9[j];
- tempu[index++] = c10[j];
- tempu[index++] = c11[j];
- tempu[index++] = c12[j];
- }
- break;
-
- case MOD_256QAM:
- if (frame_size == FRAME_SIZE_NORMAL) {
+ //ignore QPSK, not worth it, as there is no column interleaving
+ case MOD_16QAM:
rows = frame_size / (mod * 2);
+ if (frame_size == FRAME_SIZE_NORMAL) {
+ twist = &twist16n[0];
+ }
+ else {
+ twist = &twist16s[0];
+ }
+
interleave_parity_bits(tempu, in);
c1 = &tempv[0];
@@ -289,16 +217,8 @@ namespace gr {
c6 = &tempv[rows * 5];
c7 = &tempv[rows * 6];
c8 = &tempv[rows * 7];
- c9 = &tempv[rows * 8];
- c10 = &tempv[rows * 9];
- c11 = &tempv[rows * 10];
- c12 = &tempv[rows * 11];
- c13 = &tempv[rows * 12];
- c14 = &tempv[rows * 13];
- c15 = &tempv[rows * 14];
- c16 = &tempv[rows * 15];
- twist_interleave_columns(tempv, tempu, rows, twist256n);
+ twist_interleave_columns(tempv, tempu, rows, twist);
for (int j = 0; j < rows; j++) {
tempu[index++] = c1[j];
@@ -309,18 +229,18 @@ namespace gr {
tempu[index++] = c6[j];
tempu[index++] = c7[j];
tempu[index++] = c8[j];
- tempu[index++] = c9[j];
- tempu[index++] = c10[j];
- tempu[index++] = c11[j];
- tempu[index++] = c12[j];
- tempu[index++] = c13[j];
- tempu[index++] = c14[j];
- tempu[index++] = c15[j];
- tempu[index++] = c16[j];
}
- }
- else { //frame_size == FRAME_SIZE_SHORT
- rows = frame_size / mod;
+ break;
+
+ case MOD_64QAM:
+ rows = frame_size / (mod * 2);
+
+ if (frame_size == FRAME_SIZE_NORMAL) {
+ twist = twist64n;
+ }
+ else {
+ twist = twist64s;
+ }
interleave_parity_bits(tempu, in);
@@ -332,8 +252,12 @@ namespace gr {
c6 = &tempv[rows * 5];
c7 = &tempv[rows * 6];
c8 = &tempv[rows * 7];
+ c9 = &tempv[rows * 8];
+ c10 = &tempv[rows * 9];
+ c11 = &tempv[rows * 10];
+ c12 = &tempv[rows * 11];
- twist_interleave_columns(tempv, tempu, rows, twist256s);
+ twist_interleave_columns(tempv, tempu, rows, twist);
for (int j = 0; j < rows; j++) {
tempu[index++] = c1[j];
@@ -344,8 +268,84 @@ namespace gr {
tempu[index++] = c6[j];
tempu[index++] = c7[j];
tempu[index++] = c8[j];
+ tempu[index++] = c9[j];
+ tempu[index++] = c10[j];
+ tempu[index++] = c11[j];
+ tempu[index++] = c12[j];
+ }
+ break;
+
+ case MOD_256QAM:
+ if (frame_size == FRAME_SIZE_NORMAL) {
+ rows = frame_size / (mod * 2);
+
+ interleave_parity_bits(tempu, in);
+
+ c1 = &tempv[0];
+ c2 = &tempv[rows];
+ c3 = &tempv[rows * 2];
+ c4 = &tempv[rows * 3];
+ c5 = &tempv[rows * 4];
+ c6 = &tempv[rows * 5];
+ c7 = &tempv[rows * 6];
+ c8 = &tempv[rows * 7];
+ c9 = &tempv[rows * 8];
+ c10 = &tempv[rows * 9];
+ c11 = &tempv[rows * 10];
+ c12 = &tempv[rows * 11];
+ c13 = &tempv[rows * 12];
+ c14 = &tempv[rows * 13];
+ c15 = &tempv[rows * 14];
+ c16 = &tempv[rows * 15];
+
+ twist_interleave_columns(tempv, tempu, rows, twist256n);
+
+ for (int j = 0; j < rows; j++) {
+ tempu[index++] = c1[j];
+ tempu[index++] = c2[j];
+ tempu[index++] = c3[j];
+ tempu[index++] = c4[j];
+ tempu[index++] = c5[j];
+ tempu[index++] = c6[j];
+ tempu[index++] = c7[j];
+ tempu[index++] = c8[j];
+ tempu[index++] = c9[j];
+ tempu[index++] = c10[j];
+ tempu[index++] = c11[j];
+ tempu[index++] = c12[j];
+ tempu[index++] = c13[j];
+ tempu[index++] = c14[j];
+ tempu[index++] = c15[j];
+ tempu[index++] = c16[j];
+ }
+ }
+ else { //frame_size == FRAME_SIZE_SHORT
+ rows = frame_size / mod;
+
+ interleave_parity_bits(tempu, in);
+
+ c1 = &tempv[0];
+ c2 = &tempv[rows];
+ c3 = &tempv[rows * 2];
+ c4 = &tempv[rows * 3];
+ c5 = &tempv[rows * 4];
+ c6 = &tempv[rows * 5];
+ c7 = &tempv[rows * 6];
+ c8 = &tempv[rows * 7];
+
+ twist_interleave_columns(tempv, tempu, rows, twist256s);
+
+ for (int j = 0; j < rows; j++) {
+ tempu[index++] = c1[j];
+ tempu[index++] = c2[j];
+ tempu[index++] = c3[j];
+ tempu[index++] = c4[j];
+ tempu[index++] = c5[j];
+ tempu[index++] = c6[j];
+ tempu[index++] = c7[j];
+ tempu[index++] = c8[j];
+ }
}
- }
}
//tempu now has the input indices interleaved correctly, so save it
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-27 05:25:56 +0000