From b5fd4a6ab6ac92af2141233f802e71c861cd89f4 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Sun, 25 Dec 2016 14:11:26 +0100 Subject: Remove ModFormat --- Makefile.am | 2 -- src/BlockPartitioner.cpp | 5 +--- src/CicEqualizer.cpp | 3 +- src/ConvEncoder.cpp | 2 +- src/DabModulator.cpp | 5 +--- src/DifferentialModulator.cpp | 2 +- src/FIRFilter.cpp | 2 +- src/FicSource.cpp | 4 +-- src/FormatConverter.cpp | 3 +- src/FrameMultiplexer.cpp | 2 +- src/FrequencyInterleaver.cpp | 2 +- src/GainControl.cpp | 3 +- src/GuardIntervalInserter.cpp | 5 +--- src/InputMemory.cpp | 3 +- src/ModCodec.cpp | 4 +-- src/ModCodec.h | 8 ++--- src/ModFormat.cpp | 68 ------------------------------------------- src/ModFormat.h | 50 ------------------------------- src/ModInput.cpp | 4 +-- src/ModInput.h | 2 +- src/ModMux.cpp | 4 +-- src/ModMux.h | 2 +- src/ModOutput.cpp | 4 +-- src/ModOutput.h | 2 +- src/ModPlugin.cpp | 22 -------------- src/ModPlugin.h | 18 +----------- src/NullSymbol.cpp | 2 +- src/OfdmGenerator.cpp | 3 +- src/OutputFile.cpp | 2 +- src/OutputMemory.cpp | 3 +- src/OutputUHD.cpp | 2 +- src/OutputZeroMQ.cpp | 2 +- src/PhaseReference.cpp | 4 +-- src/PrbsGenerator.cpp | 2 +- src/PuncturingEncoder.cpp | 5 ++-- src/QpskSymbolMapper.cpp | 2 +- src/Resampler.cpp | 3 +- src/SignalMultiplexer.cpp | 2 +- src/SubchannelSource.cpp | 2 +- src/TII.cpp | 4 +-- src/TimeInterleaver.cpp | 2 +- 41 files changed, 44 insertions(+), 227 deletions(-) delete mode 100644 src/ModFormat.cpp delete mode 100644 src/ModFormat.h diff --git a/Makefile.am b/Makefile.am index 4f44c64..8345277 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,8 +52,6 @@ odr_dabmod_SOURCES = src/DabMod.cpp \ src/ModCodec.h \ src/ModPlugin.cpp \ src/ModPlugin.h \ - src/ModFormat.cpp \ - src/ModFormat.h \ src/EtiReader.cpp \ src/EtiReader.h \ src/Eti.cpp \ diff --git a/src/BlockPartitioner.cpp b/src/BlockPartitioner.cpp index 86d9cca..9e9f80b 100644 --- a/src/BlockPartitioner.cpp +++ b/src/BlockPartitioner.cpp @@ -30,7 +30,7 @@ BlockPartitioner::BlockPartitioner(unsigned mode, unsigned phase) : - ModMux(ModFormat(0), ModFormat(0)), + ModMux(), d_mode(mode) { PDEBUG("BlockPartitioner::BlockPartitioner(%i)\n", mode); @@ -69,9 +69,6 @@ BlockPartitioner::BlockPartitioner(unsigned mode, unsigned phase) : // For Synchronisation purpose, count nb of CIF to drop d_cifPhase = phase % d_cifCount; d_cifSize = 864 * 8; - - myInputFormat.size(d_cifSize); - myOutputFormat.size(d_cifSize * d_cifCount); } diff --git a/src/CicEqualizer.cpp b/src/CicEqualizer.cpp index 2b74672..a290852 100644 --- a/src/CicEqualizer.cpp +++ b/src/CicEqualizer.cpp @@ -27,8 +27,7 @@ CicEqualizer::CicEqualizer(size_t nbCarriers, size_t spacing, int R) : - ModCodec(ModFormat(nbCarriers * sizeof(complexf)), - ModFormat(nbCarriers * sizeof(complexf))), + ModCodec(), myNbCarriers(nbCarriers), mySpacing(spacing), myFilter(nbCarriers) diff --git a/src/ConvEncoder.cpp b/src/ConvEncoder.cpp index f3fc0f9..0aaec7f 100644 --- a/src/ConvEncoder.cpp +++ b/src/ConvEncoder.cpp @@ -48,7 +48,7 @@ const static uint8_t PARITY[] = { ConvEncoder::ConvEncoder(size_t framesize) : - ModCodec(ModFormat(framesize), ModFormat((framesize * 4) + 3)), + ModCodec(), d_framesize(framesize) { PDEBUG("ConvEncoder::ConvEncoder(%zu)\n", framesize); diff --git a/src/DabModulator.cpp b/src/DabModulator.cpp index 6d22f2d..c96a763 100644 --- a/src/DabModulator.cpp +++ b/src/DabModulator.cpp @@ -62,7 +62,7 @@ DabModulator::DabModulator( float& digGain, float normalise, const std::string& filterTapsFilename ) : - ModCodec(ModFormat(1), ModFormat(0)), + ModCodec(), myOutputRate(outputRate), myClockRate(clockRate), myDabMode(dabMode), @@ -131,9 +131,6 @@ void DabModulator::setMode(unsigned mode) default: throw std::runtime_error("DabModulator::setMode invalid mode size"); } - - myOutputFormat.size((size_t)((myNullSize + (myNbSymbols * mySymSize)) - * sizeof(complexf) / 2048000.0 * myOutputRate)); } diff --git a/src/DifferentialModulator.cpp b/src/DifferentialModulator.cpp index 11ae415..b3926c1 100644 --- a/src/DifferentialModulator.cpp +++ b/src/DifferentialModulator.cpp @@ -31,7 +31,7 @@ typedef std::complex complexf; DifferentialModulator::DifferentialModulator(size_t carriers) : - ModMux(ModFormat(carriers * sizeof(complexf)), ModFormat(carriers * sizeof(complexf))), + ModMux(), d_carriers(carriers) { PDEBUG("DifferentialModulator::DifferentialModulator(%zu)\n", carriers); diff --git a/src/FIRFilter.cpp b/src/FIRFilter.cpp index 7e6014c..2feb702 100644 --- a/src/FIRFilter.cpp +++ b/src/FIRFilter.cpp @@ -265,7 +265,7 @@ void FIRFilterWorker::process(struct FIRFilterWorkerData *fwd) FIRFilter::FIRFilter(const std::string& taps_file) : - ModCodec(ModFormat(sizeof(complexf)), ModFormat(sizeof(complexf))), + ModCodec(), RemoteControllable("firfilter"), myTapsFile(taps_file) { diff --git a/src/FicSource.cpp b/src/FicSource.cpp index b106955..64bd1a7 100644 --- a/src/FicSource.cpp +++ b/src/FicSource.cpp @@ -35,7 +35,7 @@ const std::vector& FicSource::get_rules() FicSource::FicSource(eti_FC &fc) : - ModInput(ModFormat(0), ModFormat(0)) + ModInput() { // PDEBUG("FicSource::FicSource(...)\n"); // PDEBUG(" Start address: %i\n", d_start_address); @@ -58,8 +58,6 @@ FicSource::FicSource(eti_FC &fc) : d_puncturing_rules.push_back(new PuncturingRule(3 * 16, 0xeeeeeeec)); } d_buffer.setLength(d_framesize); - - myOutputFormat.size(d_framesize); } diff --git a/src/FormatConverter.cpp b/src/FormatConverter.cpp index 766b6d8..89b3274 100644 --- a/src/FormatConverter.cpp +++ b/src/FormatConverter.cpp @@ -40,8 +40,7 @@ #endif FormatConverter::FormatConverter(void) : - ModCodec(ModFormat(sizeof(complexf)), - ModFormat(sizeof(int8_t))) { } + ModCodec() { } /* Expect the input samples to be in the range [-255.0, 255.0] */ int FormatConverter::process(Buffer* const dataIn, Buffer* dataOut) diff --git a/src/FrameMultiplexer.cpp b/src/FrameMultiplexer.cpp index 80d347e..0bea1d1 100644 --- a/src/FrameMultiplexer.cpp +++ b/src/FrameMultiplexer.cpp @@ -34,7 +34,7 @@ typedef std::complex complexf; FrameMultiplexer::FrameMultiplexer( size_t framesize, const std::vector >* subchannels) : - ModMux(ModFormat(framesize), ModFormat(framesize)), + ModMux(), d_frameSize(framesize), mySubchannels(subchannels) { diff --git a/src/FrequencyInterleaver.cpp b/src/FrequencyInterleaver.cpp index 886a03c..29d54bb 100644 --- a/src/FrequencyInterleaver.cpp +++ b/src/FrequencyInterleaver.cpp @@ -31,7 +31,7 @@ typedef std::complex complexf; FrequencyInterleaver::FrequencyInterleaver(size_t mode) : - ModCodec(ModFormat(0), ModFormat(0)) + ModCodec() { PDEBUG("FrequencyInterleaver::FrequencyInterleaver(%zu) @ %p\n", mode, this); diff --git a/src/GainControl.cpp b/src/GainControl.cpp index f575133..ec3e90f 100644 --- a/src/GainControl.cpp +++ b/src/GainControl.cpp @@ -48,8 +48,7 @@ GainControl::GainControl(size_t framesize, GainMode mode, float& digGain, float normalise) : - ModCodec(ModFormat(framesize * sizeof(complexf)), - ModFormat(framesize * sizeof(complexf))), + ModCodec(), RemoteControllable("gain"), #ifdef __SSE__ m_frameSize(framesize * sizeof(complexf) / sizeof(__m128)), diff --git a/src/GuardIntervalInserter.cpp b/src/GuardIntervalInserter.cpp index 50faf65..80ba900 100644 --- a/src/GuardIntervalInserter.cpp +++ b/src/GuardIntervalInserter.cpp @@ -35,9 +35,7 @@ GuardIntervalInserter::GuardIntervalInserter(size_t nbSymbols, size_t spacing, size_t nullSize, size_t symSize) : - ModCodec(ModFormat(nbSymbols * spacing * sizeof(complexf)), - ModFormat((nullSize + (nbSymbols * symSize)) - * sizeof(complexf))), + ModCodec(), d_nbSymbols(nbSymbols), d_spacing(spacing), d_nullSize(nullSize), @@ -48,7 +46,6 @@ GuardIntervalInserter::GuardIntervalInserter(size_t nbSymbols, if (d_nullSize) { myHasNull = true; - myInputFormat.size((d_nbSymbols + 1) * d_spacing * sizeof(complexf)); } else { myHasNull = false; } diff --git a/src/InputMemory.cpp b/src/InputMemory.cpp index ff46b4e..e27e967 100644 --- a/src/InputMemory.cpp +++ b/src/InputMemory.cpp @@ -27,7 +27,7 @@ InputMemory::InputMemory(Buffer* dataIn) - : ModInput(ModFormat(0), ModFormat(1)) + : ModInput() { PDEBUG("InputMemory::InputMemory(%p) @ %p\n", dataIn, this); @@ -45,7 +45,6 @@ InputMemory::~InputMemory() void InputMemory::setInput(Buffer* dataIn) { myDataIn = dataIn; - myOutputFormat.size(dataIn->getLength()); } diff --git a/src/ModCodec.cpp b/src/ModCodec.cpp index ab77204..9e7cf72 100644 --- a/src/ModCodec.cpp +++ b/src/ModCodec.cpp @@ -29,8 +29,8 @@ size_t ModCodec::myCount = 0; #endif -ModCodec::ModCodec(ModFormat inputFormat, ModFormat outputFormat) : - ModPlugin((inputFormat), (outputFormat)) +ModCodec::ModCodec() : + ModPlugin() { #ifdef DEBUG myOutputFile = NULL; diff --git a/src/ModCodec.h b/src/ModCodec.h index ab33fe7..465af46 100644 --- a/src/ModCodec.h +++ b/src/ModCodec.h @@ -19,8 +19,7 @@ along with ODR-DabMod. If not, see . */ -#ifndef MOD_CODEC_H -#define MOD_CODEC_H +#pragma once #ifdef HAVE_CONFIG_H # include @@ -36,13 +35,13 @@ class ModCodec : public ModPlugin { public: - ModCodec(ModFormat inputFormat, ModFormat outputFormat); + ModCodec(); virtual ~ModCodec(); virtual int process(std::vector dataIn, std::vector dataOut); virtual int process(Buffer* const dataIn, Buffer* dataOut) = 0; - + protected: #ifdef DEBUG FILE* myOutputFile; @@ -51,4 +50,3 @@ protected: }; -#endif // MOD_CODEC_H diff --git a/src/ModFormat.cpp b/src/ModFormat.cpp deleted file mode 100644 index 638afb8..0000000 --- a/src/ModFormat.cpp +++ /dev/null @@ -1,68 +0,0 @@ -/* - Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Her Majesty the - Queen in Right of Canada (Communications Research Center Canada) - */ -/* - This file is part of ODR-DabMod. - - ODR-DabMod is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - ODR-DabMod is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with ODR-DabMod. If not, see . - */ - -#include "ModFormat.h" -#include "PcDebug.h" - - -ModFormat::ModFormat() : mySize(0) -{ - PDEBUG("ModFormat::ModFormat() @ %p\n", this); - -} - - -ModFormat::ModFormat(size_t size) : mySize(size) -{ - PDEBUG("ModFormat::ModFormat(%zu) @ %p\n", size, this); - -} - - -ModFormat::~ModFormat() -{ -// PDEBUG("ModFormat::~ModFormat()\n"); -// PDEBUG(" size: %zu\n", mySize); - -} - - -ModFormat::ModFormat(const ModFormat& copy) -{ -// PDEBUG("ModFormat::ModFormat(copy)\n"); -// PDEBUG(" size: %zu\n", copy.mySize); - - mySize = copy.mySize; -} - - -size_t ModFormat::size() -{ - return mySize; -} - - -void ModFormat::size(size_t size) -{ - PDEBUG("ModFormat::size(%zu)\n", size); - mySize = size; -} - diff --git a/src/ModFormat.h b/src/ModFormat.h deleted file mode 100644 index c5eb302..0000000 --- a/src/ModFormat.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Her Majesty the - Queen in Right of Canada (Communications Research Center Canada) - */ -/* - This file is part of ODR-DabMod. - - ODR-DabMod is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - ODR-DabMod is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with ODR-DabMod. If not, see . - */ - -#ifndef MOD_FORMAT_H -#define MOD_FORMAT_H - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include - - -class ModFormat -{ -public: - ModFormat(); - ModFormat(size_t size); - virtual ~ModFormat(); - ModFormat(const ModFormat&); - ModFormat& operator=(const ModFormat&); - - size_t size(); - void size(size_t size); - -protected: - size_t mySize; -}; - - -#endif // MOD_FORMAT_H diff --git a/src/ModInput.cpp b/src/ModInput.cpp index 8e8b2f9..392b2ae 100644 --- a/src/ModInput.cpp +++ b/src/ModInput.cpp @@ -29,8 +29,8 @@ size_t ModInput::myCount = 0; #endif -ModInput::ModInput(ModFormat inputFormat, ModFormat outputFormat) : - ModPlugin((inputFormat), (outputFormat)) +ModInput::ModInput() : + ModPlugin() { #ifdef DEBUG myOutputFile = NULL; diff --git a/src/ModInput.h b/src/ModInput.h index 3712b6b..2f1619c 100644 --- a/src/ModInput.h +++ b/src/ModInput.h @@ -35,7 +35,7 @@ class ModInput : public ModPlugin { public: - ModInput(ModFormat inputFormat, ModFormat outputFormat); + ModInput(); virtual ~ModInput(); virtual int process(std::vector dataIn, diff --git a/src/ModMux.cpp b/src/ModMux.cpp index 59c6281..2ab9b43 100644 --- a/src/ModMux.cpp +++ b/src/ModMux.cpp @@ -29,8 +29,8 @@ size_t ModMux::myCount = 0; #endif -ModMux::ModMux(ModFormat inputFormat, ModFormat outputFormat) : - ModPlugin((inputFormat), (outputFormat)) +ModMux::ModMux() : + ModPlugin() { #ifdef DEBUG myOutputFile = NULL; diff --git a/src/ModMux.h b/src/ModMux.h index 0b71603..45f2ce2 100644 --- a/src/ModMux.h +++ b/src/ModMux.h @@ -36,7 +36,7 @@ class ModMux : public ModPlugin { public: - ModMux(ModFormat inputFormat, ModFormat outputFormat); + ModMux(); virtual ~ModMux(); virtual int process(std::vector dataIn, diff --git a/src/ModOutput.cpp b/src/ModOutput.cpp index 71aabce..12818c7 100644 --- a/src/ModOutput.cpp +++ b/src/ModOutput.cpp @@ -29,8 +29,8 @@ size_t ModOutput::myCount = 0; #endif -ModOutput::ModOutput(ModFormat inputFormat, ModFormat outputFormat) : - ModPlugin((inputFormat), (outputFormat)) +ModOutput::ModOutput() : + ModPlugin() { #ifdef DEBUG myOutputFile = NULL; diff --git a/src/ModOutput.h b/src/ModOutput.h index 8191312..5e370e8 100644 --- a/src/ModOutput.h +++ b/src/ModOutput.h @@ -35,7 +35,7 @@ class ModOutput : public ModPlugin { public: - ModOutput(ModFormat inputFormat, ModFormat outputFormat); + ModOutput(); virtual ~ModOutput(); virtual int process(std::vector dataIn, diff --git a/src/ModPlugin.cpp b/src/ModPlugin.cpp index 76e3d78..1f94770 100644 --- a/src/ModPlugin.cpp +++ b/src/ModPlugin.cpp @@ -21,25 +21,3 @@ #include "ModPlugin.h" -ModPlugin::ModPlugin(ModFormat inputFormat, ModFormat outputFormat) : - myInputFormat(inputFormat), - myOutputFormat(outputFormat) -{ -} - - -ModPlugin::~ModPlugin() -{ -} - - -ModFormat ModPlugin::inputFormat() -{ - return myInputFormat; -} - - -ModFormat ModPlugin::outputFormat() -{ - return myOutputFormat; -} diff --git a/src/ModPlugin.h b/src/ModPlugin.h index 10a04e1..215951a 100644 --- a/src/ModPlugin.h +++ b/src/ModPlugin.h @@ -19,15 +19,13 @@ along with ODR-DabMod. If not, see . */ -#ifndef MOD_PLUGIN_H -#define MOD_PLUGIN_H +#pragma once #ifdef HAVE_CONFIG_H # include #endif -#include "ModFormat.h" #include "Buffer.h" #include @@ -40,22 +38,8 @@ class ModPlugin { public: - ModPlugin(ModFormat inputFormat, ModFormat outputFormat); - virtual ~ModPlugin(); - - ModFormat inputFormat(); - ModFormat outputFormat(); virtual int process(std::vector dataIn, std::vector dataOut) = 0; virtual const char* name() = 0; - -protected: - ModFormat myInputFormat; - ModFormat myOutputFormat; - - void inputFormat(ModFormat format); - void outputFormat(ModFormat format); }; - -#endif // MOD_PLUGIN_H diff --git a/src/NullSymbol.cpp b/src/NullSymbol.cpp index d7f6ba5..f2c600e 100644 --- a/src/NullSymbol.cpp +++ b/src/NullSymbol.cpp @@ -31,7 +31,7 @@ typedef std::complex complexf; NullSymbol::NullSymbol(size_t nbCarriers) : - ModCodec(ModFormat(0), ModFormat(nbCarriers * sizeof(complexf))), + ModCodec(), myNbCarriers(nbCarriers) { PDEBUG("NullSymbol::NullSymbol(%zu) @ %p\n", nbCarriers, this); diff --git a/src/OfdmGenerator.cpp b/src/OfdmGenerator.cpp index 55dba0c..20ba2b7 100644 --- a/src/OfdmGenerator.cpp +++ b/src/OfdmGenerator.cpp @@ -41,8 +41,7 @@ OfdmGenerator::OfdmGenerator(size_t nbSymbols, size_t nbCarriers, size_t spacing, bool inverse) : - ModCodec(ModFormat(nbSymbols * nbCarriers * sizeof(FFT_TYPE)), - ModFormat(nbSymbols * spacing * sizeof(FFT_TYPE))), + ModCodec(), myFftPlan(NULL), myFftIn(NULL), myFftOut(NULL), myNbSymbols(nbSymbols), diff --git a/src/OutputFile.cpp b/src/OutputFile.cpp index 6928c25..d1a7a4c 100644 --- a/src/OutputFile.cpp +++ b/src/OutputFile.cpp @@ -28,7 +28,7 @@ OutputFile::OutputFile(std::string filename) : - ModOutput(ModFormat(1), ModFormat(0)), + ModOutput(), myFilename(filename) { PDEBUG("OutputFile::OutputFile(filename: %s) @ %p\n", diff --git a/src/OutputMemory.cpp b/src/OutputMemory.cpp index 4fb8bc1..6e81cba 100644 --- a/src/OutputMemory.cpp +++ b/src/OutputMemory.cpp @@ -33,7 +33,7 @@ OutputMemory::OutputMemory(Buffer* dataOut) - : ModOutput(ModFormat(1), ModFormat(0)) + : ModOutput() { PDEBUG("OutputMemory::OutputMemory(%p) @ %p\n", dataOut, this); @@ -68,7 +68,6 @@ OutputMemory::~OutputMemory() void OutputMemory::setOutput(Buffer* dataOut) { myDataOut = dataOut; - myInputFormat.size(dataOut == NULL ? 0 : dataOut->getLength()); } diff --git a/src/OutputUHD.cpp b/src/OutputUHD.cpp index 8f988f3..d5caa15 100644 --- a/src/OutputUHD.cpp +++ b/src/OutputUHD.cpp @@ -116,7 +116,7 @@ bool check_gps_locked(uhd::usrp::multi_usrp::sptr usrp) OutputUHD::OutputUHD( OutputUHDConfig& config) : - ModOutput(ModFormat(1), ModFormat(0)), + ModOutput(), RemoteControllable("uhd"), myConf(config), // Since we don't know the buffer size, we cannot initialise diff --git a/src/OutputZeroMQ.cpp b/src/OutputZeroMQ.cpp index da4473e..1148a42 100644 --- a/src/OutputZeroMQ.cpp +++ b/src/OutputZeroMQ.cpp @@ -33,7 +33,7 @@ #if defined(HAVE_ZEROMQ) OutputZeroMQ::OutputZeroMQ(std::string endpoint, int type, Buffer* dataOut) - : ModOutput(ModFormat(1), ModFormat(0)), + : ModOutput(), m_type(type), m_zmq_context(1), m_zmq_sock(m_zmq_context, type), diff --git a/src/PhaseReference.cpp b/src/PhaseReference.cpp index 691226b..2fbd32d 100644 --- a/src/PhaseReference.cpp +++ b/src/PhaseReference.cpp @@ -55,7 +55,7 @@ const uint8_t PhaseReference::d_h[4][32] = { PhaseReference::PhaseReference(unsigned int dabmode) : - ModCodec(ModFormat(0), ModFormat(0)), + ModCodec(), d_dabmode(dabmode) { PDEBUG("PhaseReference::PhaseReference(%u) @ %p\n", dabmode, this); @@ -85,8 +85,6 @@ PhaseReference::PhaseReference(unsigned int dabmode) : } d_dataIn.resize(d_carriers); fillData(); - - myOutputFormat.size(d_carriers * sizeof(complexf)); } diff --git a/src/PrbsGenerator.cpp b/src/PrbsGenerator.cpp index 64baf89..baec9b7 100644 --- a/src/PrbsGenerator.cpp +++ b/src/PrbsGenerator.cpp @@ -29,7 +29,7 @@ PrbsGenerator::PrbsGenerator(size_t framesize, uint32_t polynomial, uint32_t accum, size_t init) : - ModCodec(ModFormat(0), ModFormat(framesize)), + ModCodec(), d_framesize(framesize), d_polynomial(polynomial), d_accum(accum), diff --git a/src/PuncturingEncoder.cpp b/src/PuncturingEncoder.cpp index aed82e3..66fd0e0 100644 --- a/src/PuncturingEncoder.cpp +++ b/src/PuncturingEncoder.cpp @@ -29,7 +29,7 @@ PuncturingEncoder::PuncturingEncoder() : - ModCodec(ModFormat(0), ModFormat(0)), + ModCodec(), d_in_block_size(0), d_out_block_size(0), d_tail_rule(NULL) @@ -77,8 +77,7 @@ void PuncturingEncoder::adjust_item_size() d_in_block_size = in_size; d_out_block_size = (out_size + 7) / 8; - myOutputFormat.size(d_out_block_size); - + PDEBUG(" Puncturing encoder ratio (out/in): %zu / %zu\n", d_out_block_size, d_in_block_size); } diff --git a/src/QpskSymbolMapper.cpp b/src/QpskSymbolMapper.cpp index b82cc61..7c4299c 100644 --- a/src/QpskSymbolMapper.cpp +++ b/src/QpskSymbolMapper.cpp @@ -35,7 +35,7 @@ typedef std::complex complexf; QpskSymbolMapper::QpskSymbolMapper(size_t carriers) : - ModCodec(ModFormat(carriers / 4), ModFormat(carriers * 8)), + ModCodec(), d_carriers(carriers) { PDEBUG("QpskSymbolMapper::QpskSymbolMapper(%zu) @ %p\n", carriers, this); diff --git a/src/Resampler.cpp b/src/Resampler.cpp index 50e1897..ee2b865 100644 --- a/src/Resampler.cpp +++ b/src/Resampler.cpp @@ -48,8 +48,7 @@ T gcd(T a, T b) Resampler::Resampler(size_t inputRate, size_t outputRate, size_t resolution) : - ModCodec(ModFormat(inputRate * sizeof(complexf)), - ModFormat(outputRate * sizeof(complexf))), + ModCodec(), myFftPlan1(NULL), myFftPlan2(NULL), myFftIn(NULL), diff --git a/src/SignalMultiplexer.cpp b/src/SignalMultiplexer.cpp index 8edcdc2..d2c9c66 100644 --- a/src/SignalMultiplexer.cpp +++ b/src/SignalMultiplexer.cpp @@ -29,7 +29,7 @@ SignalMultiplexer::SignalMultiplexer(size_t framesize) : - ModMux(ModFormat(framesize), ModFormat(framesize)), + ModMux(), d_frameSize(framesize) { PDEBUG("SignalMultiplexer::SignalMultiplexer(%zu) @ %p\n", framesize, this); diff --git a/src/SubchannelSource.cpp b/src/SubchannelSource.cpp index 39b1e07..14d6399 100644 --- a/src/SubchannelSource.cpp +++ b/src/SubchannelSource.cpp @@ -61,7 +61,7 @@ const std::vector& SubchannelSource::get_rules() SubchannelSource::SubchannelSource(eti_STC &stc) : - ModInput(ModFormat(0), ModFormat(stc.getSTL() * 8)), + ModInput(), d_start_address(stc.getStartAddress()), d_framesize(stc.getSTL() * 8), d_protection(stc.TPL) diff --git a/src/TII.cpp b/src/TII.cpp index 00106ed..15e5b4a 100644 --- a/src/TII.cpp +++ b/src/TII.cpp @@ -107,7 +107,7 @@ const int pattern_tm1_2_4[][8] = { // {{{ {1,1,1,1,0,0,0,0} }; // }}} TII::TII(unsigned int dabmode, tii_config_t& tii_config) : - ModCodec(ModFormat(0), ModFormat(0)), + ModCodec(), RemoteControllable("tii"), m_dabmode(dabmode), m_conf(tii_config), @@ -156,8 +156,6 @@ TII::TII(unsigned int dabmode, tii_config_t& tii_config) : m_dataIn.clear(); m_dataIn.resize(m_carriers); prepare_pattern(); - - myOutputFormat.size(m_carriers * sizeof(complexf)); } diff --git a/src/TimeInterleaver.cpp b/src/TimeInterleaver.cpp index 2bd4b6c..7f44caf 100644 --- a/src/TimeInterleaver.cpp +++ b/src/TimeInterleaver.cpp @@ -28,7 +28,7 @@ TimeInterleaver::TimeInterleaver(size_t framesize) throw (std::invalid_argument) : - ModCodec(ModFormat(framesize), ModFormat(framesize)), + ModCodec(), d_framesize(framesize) { PDEBUG("TimeInterleaver::TimeInterleaver(%zu) @ %p\n", framesize, this); -- cgit v1.2.3