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

Commit 317bac96 authored by Zach Riggle's avatar Zach Riggle
Browse files

AAudio: Fix setChannelCount and setSamplesPerFrame 

The C API interface to these was swapped internally, meaning that
setChannelCount would actually invoke setSamplesPerFrame.

Bug: 117985878
Change-Id: I2e7f4b5ec01323c1df1aa6c34b849a63ec9ba936
parent 49fb89d3

media/libaaudio/src/core/AAudioAudio.cpp

+4 −4
Original line number Diff line number Diff line
@@ -146,14 +146,14 @@ AAUDIO_API void AAudioStreamBuilder_setSampleRate(AAudioStreamBuilder* builder, 
AAUDIO_API void AAudioStreamBuilder_setChannelCount(AAudioStreamBuilder* builder,

                                                    int32_t channelCount)

{

    AudioStreamBuilder *streamBuilder = convertAAudioBuilderToStreamBuilder(builder);

    streamBuilder->setSamplesPerFrame(channelCount);

    AAudioStreamBuilder_setSamplesPerFrame(builder, channelCount);

}



AAUDIO_API void AAudioStreamBuilder_setSamplesPerFrame(AAudioStreamBuilder* builder,

                                                       int32_t channelCount)

                                                       int32_t samplesPerFrame)

{

    AAudioStreamBuilder_setChannelCount(builder, channelCount);

    AudioStreamBuilder *streamBuilder = convertAAudioBuilderToStreamBuilder(builder);

    streamBuilder->setSamplesPerFrame(samplesPerFrame);

}



AAUDIO_API void AAudioStreamBuilder_setDirection(AAudioStreamBuilder* builder,