Output sample rate is different from input.

drowe67 · Aug 17, 2024 · 46fd9d2 · 46fd9d2
1 parent 4d22ce9
commit 46fd9d2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/freedv_interface.cpp b/src/freedv_interface.cpp
@@ -597,7 +597,7 @@ IPipelineStep* FreeDVInterface::createTransmitPipeline(int inputSampleRate, int
     if (txMode_ == -1)
     {
         // special handling for external vocoder
-        parallelSteps.push_back(new ExternVocoderStep(externVocoderTxCommand_, 16000));
+        parallelSteps.push_back(new ExternVocoderStep(externVocoderTxCommand_, 16000, 8000));
     }
 
     for (auto& dv : dvObjects_)
@@ -654,7 +654,7 @@ IPipelineStep* FreeDVInterface::createReceivePipeline(
     if (txMode_ == -1)
     {
         // special handling for external vocoder
-        parallelSteps.push_back(new ExternVocoderStep(externVocoderRxCommand_, 16000));
+        parallelSteps.push_back(new ExternVocoderStep(externVocoderRxCommand_, 8000, 16000));
 
         state->preProcessFn = [&](ParallelStep*) { return -1; };
         state->postProcessFn = [&](ParallelStep*) { return 0; };

diff --git a/src/pipeline/ExternVocoderStep.cpp b/src/pipeline/ExternVocoderStep.cpp
@@ -28,8 +28,9 @@
 #include "codec2_fifo.h"
 #include "../defines.h"
 
-ExternVocoderStep::ExternVocoderStep(std::string scriptPath, int workingSampleRate)
+ExternVocoderStep::ExternVocoderStep(std::string scriptPath, int workingSampleRate, int outputSampleRate)
     : sampleRate_(workingSampleRate)
+    , outputSampleRate_(outputSampleRate)
 {
     // Create pipes for stdin/stdout
     int stdinPipes[2];
@@ -114,7 +115,7 @@ int ExternVocoderStep::getInputSampleRate() const
 
 int ExternVocoderStep::getOutputSampleRate() const
 {
-    return sampleRate_;
+    return outputSampleRate_;
 }
 
 std::shared_ptr<short> ExternVocoderStep::execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples)

diff --git a/src/pipeline/ExternVocoderStep.h b/src/pipeline/ExternVocoderStep.h
@@ -30,7 +30,7 @@
 class ExternVocoderStep : public IPipelineStep
 {
 public:
-    ExternVocoderStep(std::string scriptPath, int workingSampleRate);
+    ExternVocoderStep(std::string scriptPath, int workingSampleRate, int outputSampleRate);
     virtual ~ExternVocoderStep();
 
     virtual int getInputSampleRate() const;
@@ -39,6 +39,7 @@ class ExternVocoderStep : public IPipelineStep
 
 private:
     int sampleRate_;
+    int outputSampleRate_;
     pid_t recvProcessId_;
     int receiveStdoutFd_;
     int receiveStdinFd_;