Restructure core side & EuPI Improvement Patch (#215)

### Summary
- It has been reorganized as follows in the `core` folder. (with test code)
  - base
  - charset
  - fft
  - modem
  - packet
  - renderer
  - wakeup
  - wave

- Update gradle.properties setting for build speed.
```
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 
```
- Remove `samplerate` argument from `FFTModel` interface
- Add `initialize` function for re-using FFT in `FFTProcessor` & `BlueFFT`
- Refactoring `renderer` for `EuPI` Tx
- Refactoring `EuPI` for `Eupi` Rx
  - Improve EuPI listening performance
- Remove one test case from `FFTHelperTest`
  - Build errors sometimes occur. (not everytime).

After this patch, `v0.8.1.1` will be published.

Author: designe

euphony/src/main/cpp/CMakeLists.txt

@@ -24,37 +24,37 @@ target_link_libraries(
 set(EUPHONY_SRC
         arms/kiss_fft.c
         arms/kiss_fftr.c
-        core/source/AudioStreamCallback.cpp
-        core/source/ASCIICharset.cpp
-        core/source/ASK.cpp
-        core/source/UTF8Charset.cpp
-        core/source/UTF16Charset.cpp
-        core/source/UTF32Charset.cpp
-        core/source/DefaultCharset.cpp
-        core/source/Base2.cpp
-        core/source/Base16.cpp
-        core/source/Base32.cpp
-        core/source/Base64.cpp
-        core/source/Base16Exception.cpp
-        core/source/Base32Exception.cpp
-        core/source/Base64Exception.cpp
-        core/source/EuPIOscillator.cpp
-        core/source/EuPIRenderer.cpp
-        core/source/FFTHelper.cpp
-        core/source/FFTModel.cpp
-        core/source/FFTProcessor.cpp
-        core/source/BlueFFT.cpp
-        core/source/FSK.cpp
-        core/source/HexVector.cpp
-        core/source/Packet.cpp
-        core/source/PacketBuilder.cpp
-        core/source/PacketErrorDetector.cpp
-        core/source/TxEngine.cpp
-        core/source/RxEngine.cpp
-        core/source/Wave.cpp
-        core/source/WaveBuilder.cpp
-        core/source/WaveRenderer.cpp
-        core/source/WakeUpFFTSensor.cpp
+        core/AudioStreamCallback.cpp
+        core/charset/ASCIICharset.cpp
+        core/modem/ASK.cpp
+        core/charset/UTF8Charset.cpp
+        core/charset/UTF16Charset.cpp
+        core/charset/UTF32Charset.cpp
+        core/charset/DefaultCharset.cpp
+        core/base/Base2.cpp
+        core/base/Base16.cpp
+        core/base/Base32.cpp
+        core/base/Base64.cpp
+        core/base/Base16Exception.cpp
+        core/base/Base32Exception.cpp
+        core/base/Base64Exception.cpp
+        core/renderer/EuPIOscillator.cpp
+        core/renderer/EuPIRenderer.cpp
+        core/fft/FFTHelper.cpp
+        core/fft/FFTModel.cpp
+        core/fft/FFTProcessor.cpp
+        core/fft/BlueFFT.cpp
+        core/modem/FSK.cpp
+        core/HexVector.cpp
+        core/packet/Packet.cpp
+        core/packet/PacketBuilder.cpp
+        core/packet/PacketErrorDetector.cpp
+        core/TxEngine.cpp
+        core/RxEngine.cpp
+        core/wave/Wave.cpp
+        core/wave/WaveBuilder.cpp
+        core/renderer/WaveRenderer.cpp
+        core/wakeup/WakeUpFFTSensor.cpp
         native-connector.cpp
         )
 

euphony/src/main/cpp/core/source/AudioStreamCallback.cpp euphony/src/main/cpp/core/AudioStreamCallback.cpp

@@ -3,7 +3,7 @@
 
 #include <cstdint>
 #include <math.h>
-#include "Wave.h"
+#include "wave/Wave.h"
 
 namespace Euphony {
     typedef std::vector<std::shared_ptr<Wave>> WaveList;

euphony/src/main/cpp/core/Definitions.h

@@ -1,4 +1,4 @@
-#include "../HexVector.h"
+#include "HexVector.h"
 #include <string>
 #include <sstream>
 

euphony/src/main/cpp/core/source/HexVector.cpp euphony/src/main/cpp/core/HexVector.cpp

@@ -1,5 +1,5 @@
-#include "../RxEngine.h"
-#include "../FFTProcessor.h"
+#include "RxEngine.h"
+#include "fft/FFTProcessor.h"
 #include <oboe/Oboe.h>
 #include <Log.h>
 

euphony/src/main/cpp/core/source/RxEngine.cpp euphony/src/main/cpp/core/RxEngine.cpp

@@ -5,13 +5,13 @@
 
 #include <utility>
 #include <Log.h>
-#include "../Base2.h"
-#include "../ModemFactory.h"
-#include "../PacketBuilder.h"
-#include "../TxEngine.h"
-#include "../EuPIRenderer.h"
-#include "../AudioStreamCallback.h"
-#include "../WaveRenderer.h"
+#include "base/Base2.h"
+#include "modem/ModemFactory.h"
+#include "packet/PacketBuilder.h"
+#include "TxEngine.h"
+#include "renderer/EuPIRenderer.h"
+#include "AudioStreamCallback.h"
+#include "renderer/WaveRenderer.h"
 
 using namespace Euphony;
 

euphony/src/main/cpp/core/source/TxEngine.cpp euphony/src/main/cpp/core/TxEngine.cpp

@@ -1,4 +1,4 @@
-#include "../Base16.h"
+#include "base/Base16.h"
 #include <iomanip>
 
 using namespace Euphony;

euphony/src/main/cpp/core/Base.h euphony/src/main/cpp/core/base/Base.h

@@ -1,5 +1,5 @@
-#include "../Definitions.h"
-#include "../Base16Exception.h"
+#include "Definitions.h"
+#include "base/Base16Exception.h"
 
 using namespace Euphony;
 

euphony/src/main/cpp/core/source/Base16.cpp euphony/src/main/cpp/core/base/Base16.cpp

@@ -1,4 +1,4 @@
-#include "../Base2.h"
+#include "base/Base2.h"
 #include <sstream>
 
 using namespace Euphony;

euphony/src/main/cpp/core/Base16.h euphony/src/main/cpp/core/base/Base16.h

@@ -1,4 +1,4 @@
-#include "../Base32.h"
+#include "base/Base32.h"
 #include <iomanip>
 #include <sstream>
 #include <cmath>

euphony/src/main/cpp/core/source/Base16Exception.cpp euphony/src/main/cpp/core/base/Base16Exception.cpp

@@ -1,5 +1,5 @@
-#include "../Definitions.h"
-#include "../Base32Exception.h"
+#include "Definitions.h"
+#include "base/Base32Exception.h"
 
 using namespace Euphony;
 

euphony/src/main/cpp/core/Base16Exception.h euphony/src/main/cpp/core/base/Base16Exception.h

@@ -1,4 +1,4 @@
-#include "../Base64.h"
+#include "base/Base64.h"
 #include <iomanip>
 #include <sstream>
 #include <cmath>

euphony/src/main/cpp/core/source/Base2.cpp euphony/src/main/cpp/core/base/Base2.cpp

@@ -1,5 +1,5 @@
-#include "../Definitions.h"
-#include "../Base64Exception.h"
+#include "Definitions.h"
+#include "base/Base64Exception.h"
 
 using namespace Euphony;
 

euphony/src/main/cpp/core/Base2.h euphony/src/main/cpp/core/base/Base2.h

@@ -1,7 +1,7 @@
 #ifndef EUPHONY_BASEFACTORY_H
 #define EUPHONY_BASEFACTORY_H
 
-#include "Definitions.h"
+#include "../Definitions.h"
 #include "Base2.h"
 #include "Base16.h"
 

euphony/src/main/cpp/core/source/Base32.cpp euphony/src/main/cpp/core/base/Base32.cpp

@@ -1,4 +1,4 @@
-#include "../ASCIICharset.h"
+#include "ASCIICharset.h"
 #include <sstream>
 #include <iomanip>
 

euphony/src/main/cpp/core/Base32.h euphony/src/main/cpp/core/base/Base32.h

@@ -1,4 +1,5 @@
-#include "../DefaultCharset.h"
+#include "DefaultCharset.h"
+
 using namespace Euphony;
 
 HexVector DefaultCharset::encode(std::string src) {

euphony/src/main/cpp/core/source/Base32Exception.cpp euphony/src/main/cpp/core/base/Base32Exception.cpp

@@ -1,4 +1,4 @@
-#include "../UTF16Charset.h"
+#include "UTF16Charset.h"
 #include <codecvt>
 #include <iomanip>
 

euphony/src/main/cpp/core/Base32Exception.h euphony/src/main/cpp/core/base/Base32Exception.h

@@ -1,4 +1,4 @@
-#include "../UTF32Charset.h"
+#include "UTF32Charset.h"
 #include <bitset>
 #include <codecvt>
 #include <iomanip>

euphony/src/main/cpp/core/source/Base64.cpp euphony/src/main/cpp/core/base/Base64.cpp

@@ -1,4 +1,4 @@
-#include "../UTF8Charset.h"
+#include "UTF8Charset.h"
 
 #include <iostream>
 #include <string>

euphony/src/main/cpp/core/Base64.h euphony/src/main/cpp/core/base/Base64.h

@@ -1,10 +1,10 @@
-#include "../BlueFFT.h"
-#include "../Definitions.h"
+#include "BlueFFT.h"
+#include <Definitions.h>
 
 using namespace Euphony;
 
-BlueFFT::BlueFFT(int fft_size, int sample_rate)
-: FFTModel(fft_size, sample_rate)
+BlueFFT::BlueFFT(int fft_size)
+: FFTModel(fft_size)
 , fftSize(fft_size)
 , halfOfFFTSize(fft_size >> 1)
 {
@@ -21,26 +21,35 @@ BlueFFT::~BlueFFT() {
     std::vector<float>().swap(phaseSpectrum);
 }
 
-void BlueFFT::initFloatSrc() {
-    floatSrc.clear();
+void BlueFFT::initialize() {
     std::vector<fcpx>().swap(floatSrc);
-    floatSrc.resize(fftSize);
+    floatSrc.resize(fftSize, 0);
+
+    std::vector<i16cpx>().swap(i16Src);
+    i16Src.resize(fftSize, 0);
+
+    std::vector<float>().swap(amplitudeSpectrum);
+    amplitudeSpectrum.resize(halfOfFFTSize, 0);
+
+    std::vector<float>().swap(phaseSpectrum);
+    phaseSpectrum.resize(halfOfFFTSize, 0);
 }
+
 Spectrums BlueFFT::makeSpectrum(const short *src) {
     /* TODO: should implement makeSpectrum for short source */
-    return {0, 0};
+    return {nullptr, nullptr};
 }
 
 Spectrums BlueFFT::makeSpectrum(const float *src) {
-    initFloatSrc();
+    initialize();
 
     for(int i = 0; i < fftSize; i++) {
         floatSrc[i].real(src[i]);
     }
 
     FFT(floatSrc, false);
 
-    int startIdx = frequencyToIndex(kStartSignalFrequency) - 1;
+    int startIdx = 0;
     int lenHalfOfNumSamples = halfOfFFTSize;
 
     for(int i = startIdx; i <= lenHalfOfNumSamples; ++i) {
@@ -54,21 +63,6 @@ Spectrums BlueFFT::makeSpectrum(const float *src) {
     return {&amplitudeSpectrum[0], &phaseSpectrum[0]};
 }
 
-int BlueFFT::getResultSize() const {
-    return halfOfFFTSize + 1;
-}
-
-inline float BlueFFT::shortToFloat(const short val) {
-    if( val < 0 )
-        return val * ( 1 / 32768.0f );
-    else
-        return val * ( 1 / 32767.0f );
-}
-
-inline int BlueFFT::frequencyToIndex(const int freq) const {
-    return (int)(((halfOfFFTSize) + 1) * ((double)freq / (double)getSampleRate()));
-}
-
 template <typename T>
 void BlueFFT::FFT(std::vector<T> &spectrum, bool inv) {
     int N = fftSize;

euphony/src/main/cpp/core/source/Base64Exception.cpp euphony/src/main/cpp/core/base/Base64Exception.cpp

@@ -13,16 +13,13 @@ namespace Euphony {
 
     class BlueFFT : public FFTModel {
     public:
-        BlueFFT(int fft_size, int sample_rate);
+        BlueFFT(int fft_size);
         ~BlueFFT();
         virtual Spectrums makeSpectrum(const short* src);
         virtual Spectrums makeSpectrum(const float* src);
-        int getResultSize() const;
 
     private:
-        void initFloatSrc();
-        static float shortToFloat(const short val);
-        int frequencyToIndex(const int freq) const;
+        void initialize();
         template <typename T>
         void FFT(std::vector<T> &data, bool inv);
 

euphony/src/main/cpp/core/Base64Exception.h euphony/src/main/cpp/core/base/Base64Exception.h

@@ -1,4 +1,4 @@
-#include "../FFTHelper.h"
+#include "FFTHelper.h"
 #include <cmath>
 
 using namespace Euphony;
@@ -38,7 +38,11 @@ int FFTHelper::getMaxIdxFromSource(const float *fft_source, const int standardFr
     int maxIndex = 0;
     float maxValue = 0;
     const int startIdx = getIndexOfFrequency(standardFrequency, fftSize, sampleRate);
-    const int endIdx = startIdx + range;
+    int endIdx = startIdx + range;
+    const int halfFFTSize = fftSize >> 1;
+    if(endIdx > halfFFTSize)
+        endIdx = halfFFTSize;
+
     for(int i = startIdx - 1; i < endIdx; i++) {
         if(fft_source[i] > maxValue) {
             maxValue = fft_source[i];

euphony/src/main/cpp/core/BaseFactory.h euphony/src/main/cpp/core/base/BaseFactory.h

@@ -1,11 +1,10 @@
-#include "../FFTModel.h"
-#include "../Definitions.h"
+#include "FFTModel.h"
+#include <Definitions.h>
 
 using namespace Euphony;
 
-FFTModel::FFTModel(int fftSizeSrc, int sampleRateSrc)
+FFTModel::FFTModel(int fftSizeSrc)
 : fftSize(fftSizeSrc)
-, sampleRate(sampleRateSrc)
 { }
 
 int FFTModel::getFFTSize() const {
@@ -16,14 +15,6 @@ void FFTModel::setFFTSize(int fftSizeSrc) {
     fftSize = fftSizeSrc;
 }
 
-int FFTModel::getSampleRate() const {
-    return sampleRate;
-}
-
-void FFTModel::setSampleRate(int sampleRateSrc) {
-    sampleRate = sampleRateSrc;
-}
-
 float FFTModel::makeAmplitudeSpectrum(float real, float im) const {
     return sqrtf(real * real + im * im ) / (float) (fftSize >> 1);
 }

euphony/src/main/cpp/core/source/ASCIICharset.cpp euphony/src/main/cpp/core/charset/ASCIICharset.cpp

@@ -16,7 +16,7 @@ namespace Euphony {
 
     class FFTModel {
     public:
-        FFTModel(int fftSizeSrc, int sampleRateSrc);
+        FFTModel(int fftSizeSrc);
         virtual ~FFTModel() = default;
 
         virtual Spectrums makeSpectrum(const short *pcmSrc) = 0;
@@ -27,12 +27,9 @@ namespace Euphony {
 
         int getFFTSize() const;
         void setFFTSize(int fftSize);
-        int getSampleRate() const;
-        void setSampleRate(int sampleRate);
 
     private:
         int fftSize;
-        int sampleRate;
 
     };
 }