Add Full Duplex Stream to Oboe library (#1920)

Author: robertwu1

apps/OboeTester/app/CMakeLists.txt

@@ -6,7 +6,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
 
 link_directories(${CMAKE_CURRENT_LIST_DIR}/..)
 
-# Increment this number when adding files to OboeTester => 103
+# Increment this number when adding files to OboeTester => 104
 # The change in this file will help Android Studio resync
 # and generate new build files that reference the new code.
 file(GLOB_RECURSE app_native_sources src/main/cpp/*)

apps/OboeTester/app/src/main/cpp/FullDuplexAnalyzer.cpp

@@ -21,18 +21,18 @@ oboe::Result  FullDuplexAnalyzer::start() {
     getLoopbackProcessor()->setSampleRate(getOutputStream()->getSampleRate());
     getLoopbackProcessor()->prepareToTest();
     mWriteReadDeltaValid = false;
-    return FullDuplexStream::start();
+    return FullDuplexStreamWithConversion::start();
 }
 
-oboe::DataCallbackResult FullDuplexAnalyzer::onBothStreamsReady(
+oboe::DataCallbackResult FullDuplexAnalyzer::onBothStreamsReadyFloat(
         const float *inputData,
         int   numInputFrames,
         float *outputData,
         int   numOutputFrames) {
 
     int32_t inputStride = getInputStream()->getChannelCount();
     int32_t outputStride = getOutputStream()->getChannelCount();
-    const float *inputFloat = inputData;
+    auto *inputFloat = static_cast<const float *>(inputData);
     float *outputFloat = outputData;
 
     // Get atomic snapshot of the relative frame positions so they

apps/OboeTester/app/src/main/cpp/FullDuplexAnalyzer.h

@@ -21,22 +21,22 @@
 #include <sys/types.h>
 
 #include "oboe/Oboe.h"
-#include "FullDuplexStream.h"
 #include "analyzer/LatencyAnalyzer.h"
+#include "FullDuplexStreamWithConversion.h"
 #include "MultiChannelRecording.h"
 
-class FullDuplexAnalyzer : public FullDuplexStream {
+class FullDuplexAnalyzer : public FullDuplexStreamWithConversion {
 public:
     FullDuplexAnalyzer(LoopbackProcessor *processor)
             : mLoopbackProcessor(processor) {
-        setMNumInputBurstsCushion(1);
+        setNumInputBurstsCushion(1);
     }
 
     /**
      * Called when data is available on both streams.
      * Caller should override this method.
      */
-    oboe::DataCallbackResult onBothStreamsReady(
+    oboe::DataCallbackResult onBothStreamsReadyFloat(
             const float *inputData,
             int   numInputFrames,
             float *outputData,

apps/OboeTester/app/src/main/cpp/FullDuplexEcho.cpp

@@ -23,7 +23,7 @@ oboe::Result  FullDuplexEcho::start() {
     // Use peak detector for input streams
     mNumChannels = getInputStream()->getChannelCount();
     mPeakDetectors = std::make_unique<PeakDetector[]>(mNumChannels);
-    return FullDuplexStream::start();
+    return FullDuplexStreamWithConversion::start();
 }
 
 double FullDuplexEcho::getPeakLevel(int index) {
@@ -37,14 +37,14 @@ double FullDuplexEcho::getPeakLevel(int index) {
     return mPeakDetectors[index].getLevel();
 }
 
-oboe::DataCallbackResult FullDuplexEcho::onBothStreamsReady(
+oboe::DataCallbackResult FullDuplexEcho::onBothStreamsReadyFloat(
         const float *inputData,
         int   numInputFrames,
         float *outputData,
         int   numOutputFrames) {
     int32_t framesToEcho = std::min(numInputFrames, numOutputFrames);
-    float *inputFloat = (float *)inputData;
-    float *outputFloat = (float *)outputData;
+    auto *inputFloat = const_cast<float *>(inputData);
+    float *outputFloat = outputData;
     // zero out entire output array
     memset(outputFloat, 0, static_cast<size_t>(numOutputFrames)
             * static_cast<size_t>(getOutputStream()->getBytesPerFrame()));

apps/OboeTester/app/src/main/cpp/FullDuplexEcho.h

@@ -21,21 +21,21 @@
 #include <sys/types.h>
 
 #include "oboe/Oboe.h"
-#include "FullDuplexStream.h"
 #include "analyzer/LatencyAnalyzer.h"
+#include "FullDuplexStreamWithConversion.h"
 #include "InterpolatingDelayLine.h"
 
-class FullDuplexEcho : public FullDuplexStream {
+class FullDuplexEcho : public FullDuplexStreamWithConversion {
 public:
     FullDuplexEcho() {
-        setMNumInputBurstsCushion(0);
+        setNumInputBurstsCushion(0);
     }
 
     /**
      * Called when data is available on both streams.
      * Caller should override this method.
      */
-    oboe::DataCallbackResult onBothStreamsReady(
+    oboe::DataCallbackResult onBothStreamsReadyFloat(
             const float *inputData,
             int   numInputFrames,
             float *outputData,