AAudio: Completely sync flowgraph with Oboe
AAudio and Oboe flowgraph is not completely in sync.
Any change targetting or another can lead to mistakes.
https://github.com/google/oboe/pull/1524 is the associated
PR over on github.
After these changes, the two repos will be exactly the same.
Bug: 227184807
Bug: 227183850
Test: atest test_various
Test: atest test_flowgraph
Test: atest AAudioTests
Test: play notes on Soundboard
Change-Id: Ifa586abc43c16f49f50d78df0c2a95048933fc0d
diff --git a/media/libaaudio/src/client/AAudioFlowGraph.h b/media/libaaudio/src/client/AAudioFlowGraph.h
index 00b6575..602c17f 100644
--- a/media/libaaudio/src/client/AAudioFlowGraph.h
+++ b/media/libaaudio/src/client/AAudioFlowGraph.h
@@ -72,17 +72,19 @@
void setRampLengthInFrames(int32_t numFrames);
private:
- std::unique_ptr<flowgraph::FlowGraphSourceBuffered> mSource;
- std::unique_ptr<flowgraph::MonoBlend> mMonoBlend;
- std::unique_ptr<flowgraph::ClipToRange> mClipper;
- std::unique_ptr<flowgraph::MonoToMultiConverter> mChannelConverter;
- std::unique_ptr<flowgraph::ManyToMultiConverter> mManyToMultiConverter;
- std::unique_ptr<flowgraph::MultiToManyConverter> mMultiToManyConverter;
- std::vector<std::unique_ptr<flowgraph::RampLinear>> mVolumeRamps;
- std::vector<float> mPanningVolumes;
- float mTargetVolume = 1.0f;
- android::audio_utils::Balance mBalance;
- std::unique_ptr<flowgraph::FlowGraphSink> mSink;
+ std::unique_ptr<FLOWGRAPH_OUTER_NAMESPACE::flowgraph::FlowGraphSourceBuffered> mSource;
+ std::unique_ptr<FLOWGRAPH_OUTER_NAMESPACE::flowgraph::MonoBlend> mMonoBlend;
+ std::unique_ptr<FLOWGRAPH_OUTER_NAMESPACE::flowgraph::ClipToRange> mClipper;
+ std::unique_ptr<FLOWGRAPH_OUTER_NAMESPACE::flowgraph::MonoToMultiConverter> mChannelConverter;
+ std::unique_ptr<FLOWGRAPH_OUTER_NAMESPACE::flowgraph::ManyToMultiConverter>
+ mManyToMultiConverter;
+ std::unique_ptr<FLOWGRAPH_OUTER_NAMESPACE::flowgraph::MultiToManyConverter>
+ mMultiToManyConverter;
+ std::vector<std::unique_ptr<FLOWGRAPH_OUTER_NAMESPACE::flowgraph::RampLinear>> mVolumeRamps;
+ std::vector<float> mPanningVolumes;
+ float mTargetVolume = 1.0f;
+ android::audio_utils::Balance mBalance;
+ std::unique_ptr<FLOWGRAPH_OUTER_NAMESPACE::flowgraph::FlowGraphSink> mSink;
};