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

Commit e59b00f2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Call new AudioTrack set/ctor"

parents fe7f463b c1bf42b1

media/libaudioclient/fuzzer/audioflinger_fuzzer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ void AudioFlingerFuzzer::invokeAudioTrack() { 
    attributionSource.pid = VALUE_OR_FATAL(legacy2aidl_pid_t_int32_t(getpid()));

    attributionSource.token = sp<BBinder>::make();

    track->set(AUDIO_STREAM_DEFAULT, sampleRate, format, channelMask, frameCount, flags, nullptr,

               nullptr, notificationFrames, sharedBuffer, false, sessionId,

               notificationFrames, sharedBuffer, false, sessionId,

               ((fast && sharedBuffer == 0) || offload) ? AudioTrack::TRANSFER_CALLBACK

                                                        : AudioTrack::TRANSFER_DEFAULT,

               offload ? &offloadInfo : nullptr, attributionSource, &attributes, false, 1.0f,

media/libmediaplayerservice/MediaPlayerService.cpp

+1 −2
Original line number Diff line number Diff line
@@ -2217,8 +2217,7 @@ status_t MediaPlayerService::AudioOutput::open( 
                    channelMask,

                    frameCount,

                    flags,

                    NULL, // callback

                    NULL, // user data

                    nullptr, // callback

                    0, // notification frames

                    mSessionId,

                    AudioTrack::TRANSFER_DEFAULT,