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

Commit 2eeca1f8 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Move local variable declarations to point of first use"

parents b59c1ad7 34542acf

services/audioflinger/AudioFlinger.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1410,7 +1410,6 @@ audio_io_handle_t AudioFlinger::openOutput(audio_module_handle_t module, 
                                           audio_output_flags_t flags,

                                           const audio_offload_info_t *offloadInfo)

{

    status_t status;

    PlaybackThread *thread = NULL;

    struct audio_config config;

    config.sample_rate = (pSamplingRate != NULL) ? *pSamplingRate : 0;
@@ -1448,7 +1447,7 @@ audio_io_handle_t AudioFlinger::openOutput(audio_module_handle_t module, 


    mHardwareStatus = AUDIO_HW_OUTPUT_OPEN;



    status = hwDevHal->open_output_stream(hwDevHal,

    status_t status = hwDevHal->open_output_stream(hwDevHal,

                                          id,

                                          *pDevices,

                                          (audio_output_flags_t)flags,

services/audioflinger/Threads.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3547,11 +3547,11 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep 


void AudioFlinger::DirectOutputThread::threadLoop_mix()

{

    AudioBufferProvider::Buffer buffer;

    size_t frameCount = mFrameCount;

    int8_t *curBuf = (int8_t *)mMixBuffer;

    // output audio to hardware

    while (frameCount) {

        AudioBufferProvider::Buffer buffer;

        buffer.frameCount = frameCount;

        mActiveTrack->getNextBuffer(&buffer);

        if (CC_UNLIKELY(buffer.raw == NULL)) {