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

New scope: cache mechanism for projectors

Browse Source
This commit is contained in:
f4exb 2017-02-16 19:09:16 +01:00
parent 5584fec183
commit eaffa127b8
1 changed files with 65 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
sdrbase/dsp/scopevisng.h
View File

@ -38,12 +38,13 @@ class SDRANGEL_API ScopeVisNG : public BasebandSampleSink {
public: public:
enum ProjectionType enum ProjectionType
{ {
ProjectionReal, //!< Extract real part ProjectionReal = 0, //!< Extract real part
ProjectionImag, //!< Extract imaginary part ProjectionImag, //!< Extract imaginary part
ProjectionMagLin, //!< Calculate linear magnitude or modulus ProjectionMagLin, //!< Calculate linear magnitude or modulus
ProjectionMagDB, //!< Calculate logarithmic (dB) of squared magnitude ProjectionMagDB, //!< Calculate logarithmic (dB) of squared magnitude
ProjectionPhase, //!< Calculate phase ProjectionPhase, //!< Calculate phase
ProjectionDPhase //!< Calculate phase derivative i.e. instantaneous frequency scaled to sample rate ProjectionDPhase, //!< Calculate phase derivative i.e. instantaneous frequency scaled to sample rate
nbProjectionTypes //!< Gives the number of projections in the enum
}; };
struct TraceData struct TraceData
@ -401,7 +402,9 @@ private:
public: public:
Projector(ProjectionType projectionType) : Projector(ProjectionType projectionType) :
m_projectionType(projectionType), m_projectionType(projectionType),
m_prevArg(0.0f) m_prevArg(0.0f),
m_cache(0),
m_cacheMaster(true)
{} {}
~Projector() ~Projector()
@ -409,54 +412,72 @@ private:
ProjectionType getProjectionType() const { return m_projectionType; } ProjectionType getProjectionType() const { return m_projectionType; }
void settProjectionType(ProjectionType projectionType) { m_projectionType = projectionType; } void settProjectionType(ProjectionType projectionType) { m_projectionType = projectionType; }
void setCache(Real *cache) { m_cache = cache; }
void setCacheMaster(bool cacheMaster) { m_cacheMaster = cacheMaster; }
Real run(const Sample& s) Real run(const Sample& s)
{ {
switch (m_projectionType) Real v;
{
case ProjectionImag:
return s.m_imag / 32768.0f;
break;
case ProjectionMagLin:
{
uint32_t magsq = s.m_real*s.m_real + s.m_imag*s.m_imag;
return std::sqrt(magsq/1073741824.0f);
}
break;
case ProjectionMagDB:
{
uint32_t magsq = s.m_real*s.m_real + s.m_imag*s.m_imag;
return log10f(magsq/1073741824.0f) * 10.0f;
}
break;
case ProjectionPhase:
return std::atan2((float) s.m_imag, (float) s.m_real) / M_PI;
break;
case ProjectionDPhase:
{
Real curArg = std::atan2((float) s.m_imag, (float) s.m_real);
Real dPhi = (curArg - m_prevArg) / M_PI;
m_prevArg = curArg;
if (dPhi < -1.0f) { if ((m_cache) && !m_cacheMaster) {
dPhi += 2.0f; return m_cache[(int) m_projectionType];
} else if (dPhi > 1.0f) { }
dPhi -= 2.0f; else
{
switch (m_projectionType)
{
case ProjectionImag:
v = s.m_imag / 32768.0f;
break;
case ProjectionMagLin:
{
uint32_t magsq = s.m_real*s.m_real + s.m_imag*s.m_imag;
v = std::sqrt(magsq/1073741824.0f);
}
break;
case ProjectionMagDB:
{
uint32_t magsq = s.m_real*s.m_real + s.m_imag*s.m_imag;
v = log10f(magsq/1073741824.0f) * 10.0f;
}
break;
case ProjectionPhase:
v = std::atan2((float) s.m_imag, (float) s.m_real) / M_PI;
break;
case ProjectionDPhase:
{
Real curArg = std::atan2((float) s.m_imag, (float) s.m_real);
Real dPhi = (curArg - m_prevArg) / M_PI;
m_prevArg = curArg;
if (dPhi < -1.0f) {
dPhi += 2.0f;
} else if (dPhi > 1.0f) {
dPhi -= 2.0f;
}
v = dPhi;
}
break;
case ProjectionReal:
default:
v = s.m_real / 32768.0f;
break;
} }
return dPhi; if (m_cache) {
} m_cache[(int) m_projectionType] = v;
break; }
case ProjectionReal:
default: return v;
return s.m_real / 32768.0f; }
break;
}
} }
private: private:
ProjectionType m_projectionType; ProjectionType m_projectionType;
Real m_prevArg; Real m_prevArg;
Real *m_cache;
bool m_cacheMaster;
}; };
/** /**