Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12c71eef authored by Robert Wu's avatar Robert Wu Committed by Android (Google) Code Review
Browse files

Merge "AAudio: Completely sync flowgraph with Oboe" into tm-dev

parents 595156f1 edc850a9

media/libaaudio/src/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ cc_library { 
        "-Wno-unused-parameter",

        "-Wall",

        "-Werror",



        // By default, all symbols are hidden.

        // "-fvisibility=hidden",

        // AAUDIO_API is used to explicitly export a function or a variable as a visible symbol.

media/libaaudio/src/client/AAudioFlowGraph.cpp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include <flowgraph/SourceI24.h>

#include <flowgraph/SourceI32.h>



using namespace flowgraph;

using namespace FLOWGRAPH_OUTER_NAMESPACE::flowgraph;



aaudio_result_t AAudioFlowGraph::configure(audio_format_t sourceFormat,

                          int32_t sourceChannelCount,

media/libaaudio/src/client/AAudioFlowGraph.h

+13 −11
Original line number Diff line number Diff line
@@ -72,17 +72,19 @@ public: 
    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::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::FlowGraphSink>               mSink;

    std::unique_ptr<FLOWGRAPH_OUTER_NAMESPACE::flowgraph::FlowGraphSink> mSink;

};

media/libaaudio/src/flowgraph/ChannelCountConverter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include "FlowGraphNode.h"

#include "ChannelCountConverter.h"



using namespace flowgraph;

using namespace FLOWGRAPH_OUTER_NAMESPACE::flowgraph;



ChannelCountConverter::ChannelCountConverter(

        int32_t inputChannelCount,

media/libaaudio/src/flowgraph/ChannelCountConverter.h

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#include "FlowGraphNode.h"



namespace flowgraph {

namespace FLOWGRAPH_OUTER_NAMESPACE::flowgraph {



/**

 * Change the number of number of channels without mixing.
@@ -47,6 +47,6 @@ namespace flowgraph { 
        FlowGraphPortFloatOutput output;

    };



} /* namespace flowgraph */

} /* namespace FLOWGRAPH_OUTER_NAMESPACE::flowgraph */



#endif //FLOWGRAPH_CHANNEL_COUNT_CONVERTER_H