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

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

Merge "Whitespace"

parents 85b51b8a f743e1f6

include/media/AudioTrack.h

+3 −2
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ protected: 


            // body of AudioTrackThread::threadLoop()

            bool processAudioBuffer(const sp<AudioTrackThread>& thread);



            status_t createTrack_l(audio_stream_type_t streamType,

                                 uint32_t sampleRate,

                                 audio_format_t format,

media/libmedia/AudioTrack.cpp

+3 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ status_t AudioTrack::set( 
    if (AudioSystem::getOutputSamplingRate(&afSampleRate, streamType) != NO_ERROR) {

        return NO_INIT;

    }



    uint32_t afLatency;

    if (AudioSystem::getOutputLatency(&afLatency, streamType) != NO_ERROR) {

        return NO_INIT;
@@ -203,9 +204,11 @@ status_t AudioTrack::set( 
    if (streamType == AUDIO_STREAM_DEFAULT) {

        streamType = AUDIO_STREAM_MUSIC;

    }



    if (sampleRate == 0) {

        sampleRate = afSampleRate;

    }



    // these below should probably come from the audioFlinger too...

    if (format == AUDIO_FORMAT_DEFAULT) {

        format = AUDIO_FORMAT_PCM_16_BIT;

services/audioflinger/AudioFlinger.cpp

+17 −16
Original line number Diff line number Diff line
@@ -2515,6 +2515,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac 


            // reset retry count

            track->mRetryCount = kMaxTrackRetries;



            // If one track is ready, set the mixer ready if:

            //  - the mixer was not ready during previous round OR

            //  - no other track is not ready

voip/jni/rtp/AudioGroup.cpp

+3 −3
Original line number Diff line number Diff line
@@ -809,8 +809,8 @@ bool AudioGroup::DeviceThread::threadLoop() 
    AudioTrack track;

    AudioRecord record;

    if (track.set(AUDIO_STREAM_VOICE_CALL, sampleRate, AUDIO_FORMAT_PCM_16_BIT,

        AUDIO_CHANNEL_OUT_MONO, output) != NO_ERROR || record.set(

        AUDIO_SOURCE_VOICE_COMMUNICATION, sampleRate, AUDIO_FORMAT_PCM_16_BIT,

                AUDIO_CHANNEL_OUT_MONO, output) != NO_ERROR ||

            record.set(AUDIO_SOURCE_VOICE_COMMUNICATION, sampleRate, AUDIO_FORMAT_PCM_16_BIT,

                AUDIO_CHANNEL_IN_MONO, input) != NO_ERROR) {

        ALOGE("cannot initialize audio device");

        return false;

services/audioflinger/AudioMixer.cpp

+1 −1

File changed.

Contains only whitespace changes.

include/common_time/local_clock.h

+1 −1

File changed.

Contains only whitespace changes.