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

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

Merge "Use audio_is_linear_pcm()"

parents f2776a56 993fa060

services/audioflinger/Threads.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1343,7 +1343,7 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac 
    switch (mType) {



    case DIRECT:

        if ((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_PCM) {

        if (audio_is_linear_pcm(format)) {

            if (sampleRate != mSampleRate || format != mFormat || channelMask != mChannelMask) {

                ALOGE("createTrack_l() Bad parameter: sampleRate %u format %#x, channelMask 0x%08x "

                        "for output %p with format %#x",
@@ -1365,7 +1365,7 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac 
        break;



    default:

        if ((format & AUDIO_FORMAT_MAIN_MASK) != AUDIO_FORMAT_PCM) {

        if (!audio_is_linear_pcm(format)) {

                ALOGE("createTrack_l() Bad parameter: format %#x \""

                        "for output %p with format %#x",

                        format, mOutput, mFormat);