diff options
| author | andreas128 <Andreas> | 2017-03-26 13:28:02 +0200 |
|---|---|---|
| committer | andreas128 <Andreas> | 2017-03-26 13:28:02 +0200 |
| commit | b49d5c3898f4a6f03d7cb033508ba1416e30c6f0 (patch) | |
| tree | 41339282a8691e6a2501cce1eaed37b878374390 /src/DabModulator.cpp | |
| parent | e45d89bdd7ad54bf4fcd4f3220a35ec1d80e94bf (diff) | |
| download | dabmod-b49d5c3898f4a6f03d7cb033508ba1416e30c6f0.tar.gz dabmod-b49d5c3898f4a6f03d7cb033508ba1416e30c6f0.tar.bz2 dabmod-b49d5c3898f4a6f03d7cb033508ba1416e30c6f0.zip | |
Working pipeline
Diffstat (limited to 'src/DabModulator.cpp')
| -rw-r--r-- | src/DabModulator.cpp | 47 |
1 files changed, 30 insertions, 17 deletions
diff --git a/src/DabModulator.cpp b/src/DabModulator.cpp index c41b8fc..bd14396 100644 --- a/src/DabModulator.cpp +++ b/src/DabModulator.cpp @@ -47,6 +47,7 @@ #include "Resampler.h" #include "ConvEncoder.h" #include "FIRFilter.h" +#include "MemlessPoly.h" #include "TII.h" #include "PuncturingEncoder.h" #include "TimeInterleaver.h" @@ -215,6 +216,11 @@ int DabModulator::process(Buffer* dataOut) cifFilter = make_shared<FIRFilter>(myFilterTapsFilename); rcs.enrol(cifFilter.get()); } + + shared_ptr<MemlessPoly> cifPoly; + cifPoly = make_shared<MemlessPoly>("default"); + rcs.enrol(cifPoly.get()); + auto myOutput = make_shared<OutputMemory>(dataOut); shared_ptr<Resampler> cifRes; @@ -348,23 +354,30 @@ int DabModulator::process(Buffer* dataOut) myFlowgraph->connect(cifOfdm, cifGain); myFlowgraph->connect(cifGain, cifGuard); - if (cifFilter) { - myFlowgraph->connect(cifGuard, cifFilter); - if (cifRes) { - myFlowgraph->connect(cifFilter, cifRes); - myFlowgraph->connect(cifRes, myOutput); - } else { - myFlowgraph->connect(cifFilter, myOutput); - } - } - else { //no filtering - if (cifRes) { - myFlowgraph->connect(cifGuard, cifRes); - myFlowgraph->connect(cifRes, myOutput); - } else { - myFlowgraph->connect(cifGuard, myOutput); - } - + //if (cifFilter) { + // myFlowgraph->connect(cifGuard, cifFilter); + // if (cifRes) { + // myFlowgraph->connect(cifFilter, cifRes); + // myFlowgraph->connect(cifRes, myOutput); + // } else { + // myFlowgraph->connect(cifFilter, myOutput); + // } + //} + //else { //no filtering + // if (cifRes) { + // myFlowgraph->connect(cifGuard, cifRes); + // myFlowgraph->connect(cifRes, myOutput); + // } else { + // myFlowgraph->connect(cifGuard, myOutput); + // } + //} + if (cifRes) { + myFlowgraph->connect(cifGuard, cifRes); + myFlowgraph->connect(cifRes, cifPoly); + myFlowgraph->connect(cifPoly, myOutput); + } else { + myFlowgraph->connect(cifGuard, cifPoly); + myFlowgraph->connect(cifPoly, myOutput); } } |