VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-25 05:25:27 -04:00
Code Issues Projects Releases Wiki Activity

FreeDV demod: VU meter adjustments

Browse Source
This commit is contained in:
f4exb 2019-02-28 15:31:31 +01:00
parent 4e7b2ac72a
commit 2c8cce0940
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/channelrx/demodfreedv/freedvdemod.cpp
View File

@ -46,7 +46,6 @@ MESSAGE_CLASS_DEFINITION(FreeDVDemod::MsgConfigureChannelizer, Message)
const QString FreeDVDemod::m_channelIdURI = "sdrangel.channel.freedvdemod"; const QString FreeDVDemod::m_channelIdURI = "sdrangel.channel.freedvdemod";
const QString FreeDVDemod::m_channelId = "FreeDVDemod"; const QString FreeDVDemod::m_channelId = "FreeDVDemod";
const int FreeDVDemod::m_levelInNbSamples = 160; // 10ms @ 8kS/s modem input
FreeDVDemod::FreeDVStats::FreeDVStats() FreeDVDemod::FreeDVStats::FreeDVStats()
{ {
@ -170,6 +169,7 @@ FreeDVDemod::FreeDVDemod(DeviceSourceAPI *deviceAPI) :
m_iModem(0), m_iModem(0),
m_speechOut(0), m_speechOut(0),
m_modIn(0), m_modIn(0),
m_levelInNbSamples(480), // 10ms @ 48 kS/s
m_settingsMutex(QMutex::Recursive) m_settingsMutex(QMutex::Recursive)
{ {
setObjectName(m_channelId); setObjectName(m_channelId);
@ -435,7 +435,7 @@ void FreeDVDemod::pushSampleToDV(int16_t sample)
m_levelIn.m_reset = true; m_levelIn.m_reset = true;
} }
m_levelIn.accumulate(sample/32768.0f); m_levelIn.accumulate(sample/29491.2f); // scale on 90% (0.9 * 32768.0)
if (m_iModem == m_nin) if (m_iModem == m_nin)
{ {
@ -538,6 +538,7 @@ void FreeDVDemod::applyFreeDVMode(FreeDVDemodSettings::FreeDVMode mode)
m_modemSampleRate = modemSampleRate; m_modemSampleRate = modemSampleRate;
m_simpleAGC.resizeNew(modemSampleRate/10, 0.003); m_simpleAGC.resizeNew(modemSampleRate/10, 0.003);
m_levelInNbSamples = m_modemSampleRate / 100; // 10ms
if (getMessageQueueToGUI()) if (getMessageQueueToGUI())
{ {

2
plugins/channelrx/demodfreedv/freedvdemod.h
View File

@ -393,7 +393,7 @@ private:
FreeDVStats m_freeDVStats; FreeDVStats m_freeDVStats;
FreeDVSNR m_freeDVSNR; FreeDVSNR m_freeDVSNR;
LevelRMS m_levelIn; LevelRMS m_levelIn;
static const int m_levelInNbSamples; int m_levelInNbSamples;
QMutex m_settingsMutex; QMutex m_settingsMutex;