diff --git a/src/engine/media/MT_AudioReceiver.cpp b/src/engine/media/MT_AudioReceiver.cpp
index d73a5e71..4de2bc8d 100644
--- a/src/engine/media/MT_AudioReceiver.cpp
+++ b/src/engine/media/MT_AudioReceiver.cpp
@@ -648,12 +648,8 @@ void AudioReceiver::initPvqa()
     // Instantiate & open PVQA analyzer
     if (!mPVQA)
     {
-        mPVQA = std::make_shared<MT::SevanaPVQA>();
-#if defined(USE_PVQA_STREAM)
-        mPVQA->open(PVQA_INTERVAL, MT::SevanaPVQA::Model::Stream);
-#else
-        mPVQA->open(PVQA_INTERVAL, MT::SevanaPVQA::Model::Interval);
-#endif
+        mPVQA = std::make_shared<sevana::pvqa>();
+        mPVQA->open(AUDIO_SAMPLERATE, 1, PVQA_INTERVAL);
     }
 }
 
@@ -676,12 +672,8 @@ void AudioReceiver::updatePvqa(const void *data, int size)
             int time4pvqa = (int)(frames * PVQA_INTERVAL * 1000);
             int size4pvqa = (int)fmt.sizeFromTime(time4pvqa);
             ICELogInfo(<< "PVQA buffer has " << time4pvqa << " milliseconds of audio.");
-#if defined(USE_PVQA_STREAM)
-            mPVQA->update(fmt.mRate, fmt.mChannels, mPvqaBuffer->data(), size4pvqa);
+            mPVQA->update(mPvqaBuffer->data(), size4pvqa);
             mPvqaBuffer->erase(size4pvqa);
-#else
-            // Just wait for getResults() to make analysis
-#endif
         }
     }
 }
@@ -690,14 +682,11 @@ float AudioReceiver::calculatePvqaMos(int rate, std::string& report)
 {
     if (mPVQA && mPvqaBuffer)
     {
-        if (mPVQA->getModel() == MT::SevanaPVQA::Model::Interval)
-        {
-            Audio::Format fmt;
-            return mPVQA->process(fmt.mRate, fmt.mChannels, mPvqaBuffer->data(), mPvqaBuffer->filled(),
-                                  report, MT::SevanaPVQA::Codec::None);
+        sevana::pvqa::result result;
+        if (mPVQA->get_result(result)) {
+            report = result.mReport;
+            return result.mMos;
         }
-        else
-            return mPVQA->getResults(report, nullptr, rate, MT::SevanaPVQA::Codec::None);
     }
     return 0.0f;
 }
diff --git a/src/engine/media/MT_AudioReceiver.h b/src/engine/media/MT_AudioReceiver.h
index 66b31f3b..730935d4 100644
--- a/src/engine/media/MT_AudioReceiver.h
+++ b/src/engine/media/MT_AudioReceiver.h
@@ -20,6 +20,10 @@
 #include "../audio/Audio_DataWindow.h"
 #include "../audio/Audio_Resampler.h"
 
+#if defined(USE_PVQA_LIBRARY)
+# include "pvqa++.h"
+#endif
+
 #include <map>
 
 // #define DUMP_DECODED
@@ -170,7 +174,7 @@ namespace MT
     void processDecoded(Audio::DataWindow& output, int options);
 
 #if defined(USE_PVQA_LIBRARY) && defined(PVQA_IN_RECEIVER)
-    std::shared_ptr<SevanaPVQA> mPVQA;
+    std::shared_ptr<sevana::pvqa> mPVQA;
     void initPvqa();
     void updatePvqa(const void* data, int size);
     float calculatePvqaMos(int rate, std::string& report);
diff --git a/src/engine/media/MT_CodecList.cpp b/src/engine/media/MT_CodecList.cpp
index 1e1aba99..7fe89f45 100644
--- a/src/engine/media/MT_CodecList.cpp
+++ b/src/engine/media/MT_CodecList.cpp
@@ -10,9 +10,9 @@
 
 #if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_RPI)
 # include "MT_AmrCodec.h"
+# include "MT_EvsCodec.h"
 #endif
 
-#include "MT_EvsCodec.h"
 #include "helper/HL_String.h"
 
 using namespace MT;
@@ -139,11 +139,6 @@ CodecList::CodecList(const Settings& settings)
     mFactoryList.push_back(new EVSCodec::EVSFactory(evs_params));
   }
 #endif
-
-  EVSCodec::StreamParameters evs_params;
-  evs_params.mime = true;
-  evs_params.bw = WB;
-  mFactoryList.push_back(new EVSCodec::EVSFactory(evs_params));
 }
 
 CodecList::~CodecList()