mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Removed obsolete references to DownChannelizr

pull/480/head
f4exb 2019-12-13 00:40:20 +01:00
rodzic 1359aac9b6
commit 14a21b10cb
20 zmienionych plików z 11 dodań i 31 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
plugins/channelrx/chanalyzer/chanalyzer.cpp
Wyświetl plik

@ -23,7 +23,6 @@
#include "device/deviceapi.h"
#include "audio/audiooutput.h"
#include "dsp/downchannelizer.h"
#include "dsp/dspcommands.h"
#include "chanalyzer.h"

1
plugins/channelrx/chanalyzer/chanalyzergui.cpp
Wyświetl plik

@ -19,7 +19,6 @@
#include <QMainWindow>
#include "device/deviceuiset.h"
#include "dsp/downchannelizer.h"
#include "dsp/spectrumscopecombovis.h"
#include "dsp/spectrumvis.h"
#include "dsp/dspengine.h"

1
plugins/channelrx/demodam/amdemodgui.cpp
Wyświetl plik

@ -23,7 +23,6 @@
#include "amdemodssbdialog.h"
#include "device/deviceuiset.h"
#include "dsp/downchannelizer.h"
#include "dsp/dspengine.h"
#include "ui_amdemodgui.h"
#include "plugin/pluginapi.h"

1
plugins/channelrx/demodatv/atvdemod.cpp
Wyświetl plik

@ -24,7 +24,6 @@
#include <complex.h>
#include "dsp/dspengine.h"
#include "dsp/downchannelizer.h"
#include "device/deviceapi.h"
#include "atvdemod.h"

1
plugins/channelrx/demodatv/atvdemod.h
Wyświetl plik

@ -26,7 +26,6 @@
#include "channel/channelapi.h"
#include "dsp/devicesamplesource.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
#include "util/message.h"
#include "atvdemodbaseband.h"

2
plugins/channelrx/demodatv/atvdemodgui.cpp
Wyświetl plik

@ -22,8 +22,6 @@
#include "atvdemodgui.h"
#include "device/deviceuiset.h"
#include "dsp/downchannelizer.h"
#include "dsp/scopevis.h"
#include "ui_atvdemodgui.h"
#include "plugin/pluginapi.h"

1
plugins/channelrx/demodbfm/bfmdemodgui.cpp
Wyświetl plik

@ -19,7 +19,6 @@
#include "bfmdemodgui.h"
#include "device/deviceuiset.h"
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
#include <QDebug>

1
plugins/channelrx/demoddatv/datvdemodgui.cpp
Wyświetl plik

@ -22,7 +22,6 @@
#include <QMediaMetaData>
#include "device/deviceuiset.h"
#include "dsp/downchannelizer.h"
#include "dsp/dspengine.h"
#include "plugin/pluginapi.h"
#include "util/simpleserializer.h"

1
plugins/channelrx/demoddatv/datvdemodsink.cpp
Wyświetl plik

@ -24,7 +24,6 @@
#include "audio/audiooutput.h"
#include "dsp/dspengine.h"
#include "dsp/downchannelizer.h"
#include "device/deviceapi.h"
#include "datvdemodreport.h"

1
plugins/channelrx/demoddsd/dsddemodgui.cpp
Wyświetl plik

@ -19,7 +19,6 @@
#include "dsddemodgui.h"
#include "device/deviceuiset.h"
#include "dsp/downchannelizer.h"
#include "ui_dsddemodgui.h"
#include "dsp/scopevisxy.h"

1
plugins/channelrx/demodlora/lorademod.cpp
Wyświetl plik

@ -23,7 +23,6 @@
#include <QDebug>
#include <QThread>
#include "dsp/downchannelizer.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"

1
plugins/channelrx/demodlora/lorademodgui.cpp
Wyświetl plik

@ -1,6 +1,5 @@
#include "device/deviceuiset.h"
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>

1
plugins/channelrx/demodssb/ssbdemod.cpp
Wyświetl plik

@ -33,7 +33,6 @@
#include "SWGSSBDemodReport.h"
#include "dsp/dspengine.h"
#include "dsp/downchannelizer.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"

1
plugins/channelrx/demodwfm/wfmdemod.cpp
Wyświetl plik

@ -32,7 +32,6 @@
#include "SWGChannelReport.h"
#include "SWGWFMDemodReport.h"
#include <dsp/downchannelizer.h>
#include "device/deviceapi.h"
#include "audio/audiooutput.h"
#include "dsp/dspengine.h"

1
plugins/channelrx/demodwfm/wfmdemodgui.cpp
Wyświetl plik

@ -1,7 +1,6 @@
#include "wfmdemodgui.h"
#include "device/deviceuiset.h"
#include "dsp/downchannelizer.h"
#include <QDockWidget>
#include <QMainWindow>

1
plugins/channelrx/freqtracker/freqtracker.cpp
Wyświetl plik

@ -33,7 +33,6 @@
#include "SWGChannelReport.h"
#include "SWGFreqTrackerReport.h"
#include "dsp/downchannelizer.h"
#include "audio/audiooutput.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"

1
plugins/channelrx/freqtracker/freqtrackergui.cpp
Wyświetl plik

@ -22,7 +22,6 @@
#include "freqtrackergui.h"
#include "device/deviceuiset.h"
#include "dsp/downchannelizer.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "ui_freqtrackergui.h"

1
plugins/channelrx/localsink/localsink.cpp
Wyświetl plik

@ -26,7 +26,6 @@
#include "SWGChannelSettings.h"
#include "util/simpleserializer.h"
#include "dsp/downchannelizer.h"
#include "dsp/dspcommands.h"
#include "dsp/dspdevicesourceengine.h"
#include "dsp/dspengine.h"

1
plugins/channelrx/udpsink/udpsink.cpp
Wyświetl plik

@ -30,7 +30,6 @@
#include "dsp/dspengine.h"
#include "util/db.h"
#include "dsp/downchannelizer.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"

22
sdrbase/dsp/downsamplechannelizer.cpp
Wyświetl plik

@ -127,7 +127,7 @@ void DownSampleChannelizer::applyChannelization()
m_channelSampleRate = m_basebandSampleRate / (1 << m_filterStages.size());
qDebug() << "DownChannelizer::applyChannelization done:"
qDebug() << "DownSampleChannelizer::applyChannelization done:"
<< " in (baseband):" << m_basebandSampleRate
<< " req:" << m_requestedOutputSampleRate
<< " out (channel):" << m_channelSampleRate
@ -226,12 +226,12 @@ Real DownSampleChannelizer::createFilterChain(Real sigStart, Real sigEnd, Real c
Real sigBw = sigEnd - sigStart;
Real rot = sigBw / 4;
//qDebug("DownChannelizer::createFilterChain: Signal [%.1f, %.1f] (BW %.1f), Channel [%.1f, %.1f], Rot %.1f", sigStart, sigEnd, sigBw, chanStart, chanEnd, rot);
//qDebug("DownSampleChannelizer::createFilterChain: Signal [%.1f, %.1f] (BW %.1f), Channel [%.1f, %.1f], Rot %.1f", sigStart, sigEnd, sigBw, chanStart, chanEnd, rot);
// check if it fits into the left half
if(signalContainsChannel(sigStart, sigStart + sigBw / 2.0, chanStart, chanEnd))
{
//qDebug("DownChannelizer::createFilterChain: -> take left half (rotate by +1/4 and decimate by 2)");
//qDebug("DownSampleChannelizer::createFilterChain: -> take left half (rotate by +1/4 and decimate by 2)");
m_filterStages.push_back(new FilterStage(FilterStage::ModeLowerHalf));
return createFilterChain(sigStart, sigStart + sigBw / 2.0, chanStart, chanEnd);
}
@ -239,7 +239,7 @@ Real DownSampleChannelizer::createFilterChain(Real sigStart, Real sigEnd, Real c
// check if it fits into the right half
if(signalContainsChannel(sigEnd - sigBw / 2.0f, sigEnd, chanStart, chanEnd))
{
//qDebug("DownChannelizer::createFilterChain: -> take right half (rotate by -1/4 and decimate by 2)");
//qDebug("DownSampleChannelizer::createFilterChain: -> take right half (rotate by -1/4 and decimate by 2)");
m_filterStages.push_back(new FilterStage(FilterStage::ModeUpperHalf));
return createFilterChain(sigEnd - sigBw / 2.0f, sigEnd, chanStart, chanEnd);
}
@ -247,13 +247,13 @@ Real DownSampleChannelizer::createFilterChain(Real sigStart, Real sigEnd, Real c
// check if it fits into the center
if(signalContainsChannel(sigStart + rot, sigEnd - rot, chanStart, chanEnd))
{
//qDebug("DownChannelizer::createFilterChain: -> take center half (decimate by 2)");
//qDebug("DownSampleChannelizer::createFilterChain: -> take center half (decimate by 2)");
m_filterStages.push_back(new FilterStage(FilterStage::ModeCenter));
return createFilterChain(sigStart + rot, sigEnd - rot, chanStart, chanEnd);
}
Real ofs = ((chanEnd - chanStart) / 2.0 + chanStart) - ((sigEnd - sigStart) / 2.0 + sigStart);
//qDebug("DownChannelizer::createFilterChain: -> complete (final BW %.1f, frequency offset %.1f)", sigBw, ofs);
//qDebug("DownSampleChannelizer::createFilterChain: -> complete (final BW %.1f, frequency offset %.1f)", sigBw, ofs);
return ofs;
}
@ -299,23 +299,23 @@ void DownSampleChannelizer::freeFilterChain()
void DownSampleChannelizer::debugFilterChain()
{
qDebug("DownChannelizer::debugFilterChain: %lu stages", m_filterStages.size());
qDebug("DownSampleChannelizer::debugFilterChain: %lu stages", m_filterStages.size());
for(FilterStages::iterator it = m_filterStages.begin(); it != m_filterStages.end(); ++it)
{
switch ((*it)->m_mode)
{
case FilterStage::ModeCenter:
qDebug("DownChannelizer::debugFilterChain: center %s", (*it)->m_sse ? "sse" : "no_sse");
qDebug("DownSampleChannelizer::debugFilterChain: center %s", (*it)->m_sse ? "sse" : "no_sse");
break;
case FilterStage::ModeLowerHalf:
qDebug("DownChannelizer::debugFilterChain: lower %s", (*it)->m_sse ? "sse" : "no_sse");
qDebug("DownSampleChannelizer::debugFilterChain: lower %s", (*it)->m_sse ? "sse" : "no_sse");
break;
case FilterStage::ModeUpperHalf:
qDebug("DownChannelizer::debugFilterChain: upper %s", (*it)->m_sse ? "sse" : "no_sse");
qDebug("DownSampleChannelizer::debugFilterChain: upper %s", (*it)->m_sse ? "sse" : "no_sse");
break;
default:
qDebug("DownChannelizer::debugFilterChain: none %s", (*it)->m_sse ? "sse" : "no_sse");
qDebug("DownSampleChannelizer::debugFilterChain: none %s", (*it)->m_sse ? "sse" : "no_sse");
break;
}
}