VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

IntHalfBandFilterEO1: rename size attribute

This commit is contained in:
f4exb 2016-11-06 00:23:08 +01:00
parent 3410d289d1
commit de8640caae
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sdrbase/dsp/inthalfbandfiltereo1.h
View File

@ -412,7 +412,7 @@ protected:
qint32 m_odd[2][HBFIRFilterTraits<HBFilterOrder>::hbOrder]; // double buffer technique qint32 m_odd[2][HBFIRFilterTraits<HBFilterOrder>::hbOrder]; // double buffer technique
int m_ptr; int m_ptr;
int m_sizeEO; int m_size;
int m_state; int m_state;
void storeSample(const FixReal& sampleI, const FixReal& sampleQ) void storeSample(const FixReal& sampleI, const FixReal& sampleQ)
@ -421,15 +421,15 @@ protected:
{ {
m_even[0][m_ptr/2] = sampleI; m_even[0][m_ptr/2] = sampleI;
m_even[1][m_ptr/2] = sampleQ; m_even[1][m_ptr/2] = sampleQ;
m_even[0][m_ptr/2 + m_sizeEO] = sampleI; m_even[0][m_ptr/2 + m_size] = sampleI;
m_even[1][m_ptr/2 + m_sizeEO] = sampleQ; m_even[1][m_ptr/2 + m_size] = sampleQ;
} }
else else
{ {
m_odd[0][m_ptr/2] = sampleI; m_odd[0][m_ptr/2] = sampleI;
m_odd[1][m_ptr/2] = sampleQ; m_odd[1][m_ptr/2] = sampleQ;
m_odd[0][m_ptr/2 + m_sizeEO] = sampleI; m_odd[0][m_ptr/2 + m_size] = sampleI;
m_odd[1][m_ptr/2 + m_sizeEO] = sampleQ; m_odd[1][m_ptr/2 + m_size] = sampleQ;
} }
} }
@ -439,26 +439,26 @@ protected:
{ {
m_even[0][m_ptr/2] = x; m_even[0][m_ptr/2] = x;
m_even[1][m_ptr/2] = y; m_even[1][m_ptr/2] = y;
m_even[0][m_ptr/2 + m_sizeEO] = x; m_even[0][m_ptr/2 + m_size] = x;
m_even[1][m_ptr/2 + m_sizeEO] = y; m_even[1][m_ptr/2 + m_size] = y;
} }
else else
{ {
m_odd[0][m_ptr/2] = x; m_odd[0][m_ptr/2] = x;
m_odd[1][m_ptr/2] = y; m_odd[1][m_ptr/2] = y;
m_odd[0][m_ptr/2 + m_sizeEO] = x; m_odd[0][m_ptr/2 + m_size] = x;
m_odd[1][m_ptr/2 + m_sizeEO] = y; m_odd[1][m_ptr/2 + m_size] = y;
} }
} }
void advancePointer() void advancePointer()
{ {
m_ptr = (m_ptr + 1) % (2*m_sizeEO); m_ptr = (m_ptr + 1) % (2*m_size);
} }
void doFIR(Sample* sample) void doFIR(Sample* sample)
{ {
int a = m_ptr/2 + m_sizeEO; // tip pointer int a = m_ptr/2 + m_size; // tip pointer
int b = m_ptr/2 + 1; // tail pointer int b = m_ptr/2 + 1; // tail pointer
qint32 iAcc = 0; qint32 iAcc = 0;
@ -530,13 +530,13 @@ protected:
if ((m_ptr % 2) == 0) if ((m_ptr % 2) == 0)
{ {
iAcc += ((qint32)m_odd[0][m_ptr/2 + m_sizeEO/2]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1); iAcc += ((qint32)m_odd[0][m_ptr/2 + m_size/2]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1);
qAcc += ((qint32)m_odd[1][m_ptr/2 + m_sizeEO/2]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1); qAcc += ((qint32)m_odd[1][m_ptr/2 + m_size/2]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1);
} }
else else
{ {
iAcc += ((qint32)m_even[0][m_ptr/2 + m_sizeEO/2 + 1]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1); iAcc += ((qint32)m_even[0][m_ptr/2 + m_size/2 + 1]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1);
qAcc += ((qint32)m_even[1][m_ptr/2 + m_sizeEO/2 + 1]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1); qAcc += ((qint32)m_even[1][m_ptr/2 + m_size/2 + 1]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1);
} }
sample->setReal(iAcc >> HBFIRFilterTraits<HBFilterOrder>::hbShift -1); sample->setReal(iAcc >> HBFIRFilterTraits<HBFilterOrder>::hbShift -1);
@ -545,7 +545,7 @@ protected:
void doFIR(qint32 *x, qint32 *y) void doFIR(qint32 *x, qint32 *y)
{ {
int a = m_ptr/2 + m_sizeEO; // tip pointer int a = m_ptr/2 + m_size; // tip pointer
int b = m_ptr/2 + 1; // tail pointer int b = m_ptr/2 + 1; // tail pointer
qint32 iAcc = 0; qint32 iAcc = 0;
@ -615,13 +615,13 @@ protected:
#endif #endif
if ((m_ptr % 2) == 0) if ((m_ptr % 2) == 0)
{ {
iAcc += ((qint32)m_odd[0][m_ptr/2 + m_sizeEO/2]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1); iAcc += ((qint32)m_odd[0][m_ptr/2 + m_size/2]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1);
qAcc += ((qint32)m_odd[1][m_ptr/2 + m_sizeEO/2]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1); qAcc += ((qint32)m_odd[1][m_ptr/2 + m_size/2]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1);
} }
else else
{ {
iAcc += ((qint32)m_even[0][m_ptr/2 + m_sizeEO/2 + 1]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1); iAcc += ((qint32)m_even[0][m_ptr/2 + m_size/2 + 1]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1);
qAcc += ((qint32)m_even[1][m_ptr/2 + m_sizeEO/2 + 1]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1); qAcc += ((qint32)m_even[1][m_ptr/2 + m_size/2 + 1]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1);
} }
*x = iAcc >> (HBFIRFilterTraits<HBFilterOrder>::hbShift -1); // HB_SHIFT incorrect do not loose the gained bit *x = iAcc >> (HBFIRFilterTraits<HBFilterOrder>::hbShift -1); // HB_SHIFT incorrect do not loose the gained bit
@ -632,9 +632,9 @@ protected:
template<uint32_t HBFilterOrder> template<uint32_t HBFilterOrder>
IntHalfbandFilterEO1<HBFilterOrder>::IntHalfbandFilterEO1() IntHalfbandFilterEO1<HBFilterOrder>::IntHalfbandFilterEO1()
{ {
m_sizeEO = HBFIRFilterTraits<HBFilterOrder>::hbOrder/2; m_size = HBFIRFilterTraits<HBFilterOrder>::hbOrder/2;
for (int i = 0; i < 2*m_sizeEO; i++) for (int i = 0; i < 2*m_size; i++)
{ {
m_even[0][i] = 0; m_even[0][i] = 0;
m_even[1][i] = 0; m_even[1][i] = 0;