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

Fixed inf and sup decimators by 32 and 64

Browse Source
This commit is contained in:
f4exb 2015-10-12 03:46:45 +02:00
parent dc3bdc62e1
commit 5b1ffd434b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -33,8 +33,8 @@ ENDIF()
############################################################################## ##############################################################################
#include(${QT_USE_FILE}) #include(${QT_USE_FILE})
set( QT_DEFINITIONS "${QT_DEFINITIONS} -DQT_NO_DEBUG_OUTPUT" ) #set( QT_DEFINITIONS "${QT_DEFINITIONS} -DQT_NO_DEBUG_OUTPUT" )
#set( QT_DEFINITIONS "${QT_DEFINITIONS}" ) set( QT_DEFINITIONS "${QT_DEFINITIONS}" )
add_definitions(${QT_DEFINITIONS}) add_definitions(${QT_DEFINITIONS})
if(MSVC) if(MSVC)

8
include/dsp/decimators.h
View File

@ -362,7 +362,7 @@ void Decimators<T, SdrBits, InputBits>::decimate32_inf(SampleVector::iterator* i
m_decimator2.myDecimate(xreal[0], yimag[0], &xreal[1], &yimag[1]); m_decimator2.myDecimate(xreal[0], yimag[0], &xreal[1], &yimag[1]);
m_decimator2.myDecimate(xreal[2], yimag[2], &xreal[3], &yimag[3]); m_decimator2.myDecimate(xreal[2], yimag[2], &xreal[3], &yimag[3]);
m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[3]); m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[5]);
m_decimator2.myDecimate(xreal[6], yimag[6], &xreal[7], &yimag[7]); m_decimator2.myDecimate(xreal[6], yimag[6], &xreal[7], &yimag[7]);
m_decimator4.myDecimate(xreal[1], yimag[1], &xreal[3], &yimag[3]); m_decimator4.myDecimate(xreal[1], yimag[1], &xreal[3], &yimag[3]);
@ -393,7 +393,7 @@ void Decimators<T, SdrBits, InputBits>::decimate32_sup(SampleVector::iterator* i
m_decimator2.myDecimate(xreal[0], yimag[0], &xreal[1], &yimag[1]); m_decimator2.myDecimate(xreal[0], yimag[0], &xreal[1], &yimag[1]);
m_decimator2.myDecimate(xreal[2], yimag[2], &xreal[3], &yimag[3]); m_decimator2.myDecimate(xreal[2], yimag[2], &xreal[3], &yimag[3]);
m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[3]); m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[5]);
m_decimator2.myDecimate(xreal[6], yimag[6], &xreal[7], &yimag[7]); m_decimator2.myDecimate(xreal[6], yimag[6], &xreal[7], &yimag[7]);
m_decimator4.myDecimate(xreal[1], yimag[1], &xreal[3], &yimag[3]); m_decimator4.myDecimate(xreal[1], yimag[1], &xreal[3], &yimag[3]);
@ -424,7 +424,7 @@ void Decimators<T, SdrBits, InputBits>::decimate64_inf(SampleVector::iterator* i
m_decimator2.myDecimate(xreal[0], yimag[0], &xreal[1], &yimag[1]); m_decimator2.myDecimate(xreal[0], yimag[0], &xreal[1], &yimag[1]);
m_decimator2.myDecimate(xreal[2], yimag[2], &xreal[3], &yimag[3]); m_decimator2.myDecimate(xreal[2], yimag[2], &xreal[3], &yimag[3]);
m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[3]); m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[5]);
m_decimator2.myDecimate(xreal[6], yimag[6], &xreal[7], &yimag[7]); m_decimator2.myDecimate(xreal[6], yimag[6], &xreal[7], &yimag[7]);
m_decimator2.myDecimate(xreal[8], yimag[8], &xreal[9], &yimag[9]); m_decimator2.myDecimate(xreal[8], yimag[8], &xreal[9], &yimag[9]);
m_decimator2.myDecimate(xreal[10], yimag[10], &xreal[11], &yimag[11]); m_decimator2.myDecimate(xreal[10], yimag[10], &xreal[11], &yimag[11]);
@ -464,7 +464,7 @@ void Decimators<T, SdrBits, InputBits>::decimate64_sup(SampleVector::iterator* i
m_decimator2.myDecimate(xreal[0], yimag[0], &xreal[1], &yimag[1]); m_decimator2.myDecimate(xreal[0], yimag[0], &xreal[1], &yimag[1]);
m_decimator2.myDecimate(xreal[2], yimag[2], &xreal[3], &yimag[3]); m_decimator2.myDecimate(xreal[2], yimag[2], &xreal[3], &yimag[3]);
m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[3]); m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[5]);
m_decimator2.myDecimate(xreal[6], yimag[6], &xreal[7], &yimag[7]); m_decimator2.myDecimate(xreal[6], yimag[6], &xreal[7], &yimag[7]);
m_decimator2.myDecimate(xreal[8], yimag[8], &xreal[9], &yimag[9]); m_decimator2.myDecimate(xreal[8], yimag[8], &xreal[9], &yimag[9]);
m_decimator2.myDecimate(xreal[10], yimag[10], &xreal[11], &yimag[11]); m_decimator2.myDecimate(xreal[10], yimag[10], &xreal[11], &yimag[11]);