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

Commit 63ea3704 authored by Jiabin Huang's avatar Jiabin Huang Committed by Android (Google) Code Review
Browse files

Merge "Return aaudio_result_t for validating channel mask." into udc-dev

parents ae556c53 a4d1796d

media/libaaudio/src/core/AAudioStreamParameters.cpp

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ aaudio_result_t AAudioStreamParameters::validate() const { 
    return validateChannelMask();

}



bool AAudioStreamParameters::validateChannelMask() const {

aaudio_result_t AAudioStreamParameters::validateChannelMask() const {

    if (mChannelMask == AAUDIO_UNSPECIFIED) {

        return AAUDIO_OK;

    }

media/libaaudio/src/core/AAudioStreamParameters.h

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ public: 
    void dump() const;



private:

    bool validateChannelMask() const;

    aaudio_result_t validateChannelMask() const;



    int32_t                         mSamplesPerFrame      = AAUDIO_UNSPECIFIED;

    int32_t                         mSampleRate           = AAUDIO_UNSPECIFIED;