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

Commit 52b271ed authored by Robert Wu's avatar Robert Wu
Browse files

AAudio: Ignore builder hardware sr, fmt, ch 

A builder shouldn't set the hardware sample rate, format, and channels.
These parameters should come from the HAL.

Bug: 287081635
Test: atest AAudioTests
Change-Id: I7876aa9989ffd6365fc15fd5fb2566be6efe2871
parent a7cbc361

media/libaaudio/src/client/AudioStreamInternal.cpp

+0 −4
Original line number Diff line number Diff line
@@ -132,10 +132,6 @@ aaudio_result_t AudioStreamInternal::open(const AudioStreamBuilder &builder) { 


    request.getConfiguration().setBufferCapacity(builder.getBufferCapacity());



    request.getConfiguration().setHardwareSamplesPerFrame(builder.getHardwareSamplesPerFrame());

    request.getConfiguration().setHardwareSampleRate(builder.getHardwareSampleRate());

    request.getConfiguration().setHardwareFormat(builder.getHardwareFormat());



    mDeviceChannelCount = getSamplesPerFrame(); // Assume it will be the same. Update if not.



    mServiceStreamHandleInfo = mServiceInterface.openStream(request, configurationOutput);

services/oboeservice/fuzzer/oboeservice_fuzzer.cpp

+0 −7
Original line number Diff line number Diff line
@@ -403,13 +403,6 @@ void OboeserviceFuzzer::process(const uint8_t *data, size_t size) { 


    request.getConfiguration().setBufferCapacity(fdp.ConsumeIntegral<int32_t>());



    request.getConfiguration().setHardwareSampleRate(fdp.ConsumeIntegral<int32_t>());

    request.getConfiguration().setHardwareSamplesPerFrame(fdp.ConsumeIntegral<int32_t>());

    request.getConfiguration().setHardwareFormat((audio_format_t)(

        fdp.ConsumeBool()

            ? fdp.ConsumeIntegral<int32_t>()

            : kAAudioFormats[fdp.ConsumeIntegralInRange<int32_t>(0, kNumAAudioFormats - 1)]));



    auto streamHandleInfo = mClient->openStream(request, configurationOutput);

    if (streamHandleInfo.getHandle() < 0) {

        // invalid request, stream not opened.