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

Commit d09ea54b authored by Glenn Kasten's avatar Glenn Kasten Committed by android-build-merger
Browse files

Merge "Fix copy/paste errors in use of AAUDIO_FORMAT_UNSPECIFIED" into oc-dev 

am: 160078a0

Change-Id: I2bca3e8d3c1045663603bfb620bb059de5d6d62d
parents 6cc4fa18 160078a0

media/libaaudio/src/client/AudioStreamInternal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ aaudio_result_t AudioStreamInternal::open(const AudioStreamBuilder &builder) { 
    }



    // We have to do volume scaling. So we prefer FLOAT format.

    if (getFormat() == AAUDIO_UNSPECIFIED) {

    if (getFormat() == AAUDIO_FORMAT_UNSPECIFIED) {

        setFormat(AAUDIO_FORMAT_PCM_FLOAT);

    }

    // Request FLOAT for the shared mixer.

media/libaaudio/src/legacy/AudioStreamRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ aaudio_result_t AudioStreamRecord::open(const AudioStreamBuilder& builder) 
                        : builder.getBufferCapacity();



    // TODO implement an unspecified Android format then use that.

    audio_format_t format = (getFormat() == AAUDIO_UNSPECIFIED)

    audio_format_t format = (getFormat() == AAUDIO_FORMAT_UNSPECIFIED)

            ? AUDIO_FORMAT_PCM_FLOAT

            : AAudioConvert_aaudioToAndroidDataFormat(getFormat());

services/oboeservice/AAudioServiceStreamShared.cpp

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ aaudio_result_t AAudioServiceStreamShared::open(const aaudio::AAudioStreamReques 
    }



    mSampleRate = configurationInput.getSampleRate();

    if (mSampleRate == AAUDIO_FORMAT_UNSPECIFIED) {

    if (mSampleRate == AAUDIO_UNSPECIFIED) {

        mSampleRate = mServiceEndpoint->getSampleRate();

    } else if (mSampleRate != mServiceEndpoint->getSampleRate()) {

        ALOGE("AAudioServiceStreamShared::open(), mAudioFormat = %d, need %d",
@@ -85,7 +85,7 @@ aaudio_result_t AAudioServiceStreamShared::open(const aaudio::AAudioStreamReques 
    }



    mSamplesPerFrame = configurationInput.getSamplesPerFrame();

    if (mSamplesPerFrame == AAUDIO_FORMAT_UNSPECIFIED) {

    if (mSamplesPerFrame == AAUDIO_UNSPECIFIED) {

        mSamplesPerFrame = mServiceEndpoint->getSamplesPerFrame();

    } else if (mSamplesPerFrame != mServiceEndpoint->getSamplesPerFrame()) {

        ALOGE("AAudioServiceStreamShared::open(), mSamplesPerFrame = %d, need %d",