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

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

Merge "Consistent whitespace"

parents fbb70ce4 7c027248

media/libmedia/AudioTrack.cpp

+3 −1
Original line number Diff line number Diff line
@@ -861,7 +861,9 @@ status_t AudioTrack::createTrack_l( 


        // Ensure that buffer depth covers at least audio hardware latency

        uint32_t minBufCount = afLatency / ((1000 * afFrameCount)/afSampleRate);

        if (minBufCount < 2) minBufCount = 2;

        if (minBufCount < 2) {

            minBufCount = 2;

        }



        size_t minFrameCount = (afFrameCount*sampleRate*minBufCount)/afSampleRate;

        ALOGV("minFrameCount: %u, afFrameCount=%d, minBufCount=%d, sampleRate=%u, afSampleRate=%u"

services/audioflinger/AudioFlinger.cpp

+21 −7
Original line number Diff line number Diff line
@@ -1453,10 +1453,18 @@ audio_io_handle_t AudioFlinger::openOutput(audio_module_handle_t module, 
        }

        mPlaybackThreads.add(id, thread);



        if (pSamplingRate != NULL) *pSamplingRate = config.sample_rate;

        if (pFormat != NULL) *pFormat = config.format;

        if (pChannelMask != NULL) *pChannelMask = config.channel_mask;

        if (pLatencyMs != NULL) *pLatencyMs = thread->latency();

        if (pSamplingRate != NULL) {

            *pSamplingRate = config.sample_rate;

        }

        if (pFormat != NULL) {

            *pFormat = config.format;

        }

        if (pChannelMask != NULL) {

            *pChannelMask = config.channel_mask;

        }

        if (pLatencyMs != NULL) {

            *pLatencyMs = thread->latency();

        }



        // notify client processes of the new output creation

        thread->audioConfigChanged_l(AudioSystem::OUTPUT_OPENED);
@@ -1698,9 +1706,15 @@ audio_io_handle_t AudioFlinger::openInput(audio_module_handle_t module, 
                                  );

        mRecordThreads.add(id, thread);

        ALOGV("openInput() created record thread: ID %d thread %p", id, thread);

        if (pSamplingRate != NULL) *pSamplingRate = reqSamplingRate;

        if (pFormat != NULL) *pFormat = config.format;

        if (pChannelMask != NULL) *pChannelMask = reqChannels;

        if (pSamplingRate != NULL) {

            *pSamplingRate = reqSamplingRate;

        }

        if (pFormat != NULL) {

            *pFormat = config.format;

        }

        if (pChannelMask != NULL) {

            *pChannelMask = reqChannels;

        }



        // notify client processes of the new input creation

        thread->audioConfigChanged_l(AudioSystem::INPUT_OPENED);

services/audioflinger/Threads.cpp

+2 −1
Original line number Diff line number Diff line
@@ -3970,6 +3970,7 @@ status_t AudioFlinger::RecordThread::start(RecordThread::RecordTrack* recordTrac 
        ALOGV("Record started OK");

        return status;

    }



startError:

    AudioSystem::stopInput(mId);

    clearSyncStartEvent();

media/libmedia/AudioRecord.cpp

+1 −1

File changed.

Contains only whitespace changes.

media/libmedia/IMediaDeathNotifier.cpp

+4 −4

File changed.

Contains only whitespace changes.

services/audioflinger/Tracks.cpp

+2 −2

File changed.

Contains only whitespace changes.