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

Commit adad3d7d authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Use LOG_ALWAYS_FATAL instead of LOG_FATAL 

LOG_FATAL is compiled out in most builds, so the
assertion checks were not being performed.

Change-Id: I774f0985ab9c5ccecd8989a0f1c940386b73fc35
parent 1392eb3d

media/libmedia/AudioTrackShared.cpp

+3 −3
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ status_t ClientProxy::obtainBuffer(Buffer* buffer, const struct timespec *reques 
            ts = &remaining;

            break;

        default:

            LOG_FATAL("obtainBuffer() timeout=%d", timeout);

            LOG_ALWAYS_FATAL("obtainBuffer() timeout=%d", timeout);

            ts = NULL;

            break;

        }
@@ -429,7 +429,7 @@ status_t AudioTrackClientProxy::waitStreamEndDone(const struct timespec *request 
            ts = &remaining;

            break;

        default:

            LOG_FATAL("waitStreamEndDone() timeout=%d", timeout);

            LOG_ALWAYS_FATAL("waitStreamEndDone() timeout=%d", timeout);

            ts = NULL;

            break;

        }
@@ -470,7 +470,7 @@ StaticAudioTrackClientProxy::StaticAudioTrackClientProxy(audio_track_cblk_t* cbl 


void StaticAudioTrackClientProxy::flush()

{

    LOG_FATAL("static flush");

    LOG_ALWAYS_FATAL("static flush");

}



void StaticAudioTrackClientProxy::setLoop(size_t loopStart, size_t loopEnd, int loopCount)

media/libmediaplayerservice/MediaPlayerService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1679,7 +1679,7 @@ void MediaPlayerService::AudioOutput::switchToNextOutput() { 


ssize_t MediaPlayerService::AudioOutput::write(const void* buffer, size_t size)

{

    LOG_FATAL_IF(mCallback != NULL, "Don't call write if supplying a callback.");

    LOG_ALWAYS_FATAL_IF(mCallback != NULL, "Don't call write if supplying a callback.");



    //ALOGV("write(%p, %u)", buffer, size);

    if (mTrack != 0) {

services/audioflinger/AudioMixer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ void AudioMixer::setParameter(int name, int target, int param, void *value) 
            }

            } break;

        default:

            LOG_FATAL("bad param");

            LOG_ALWAYS_FATAL("setParameter track: bad param %d", param);

        }

        break;
@@ -474,7 +474,7 @@ void AudioMixer::setParameter(int name, int target, int param, void *value) 
            invalidateState(1 << name);

            break;

        default:

            LOG_FATAL("bad param");

            LOG_ALWAYS_FATAL("setParameter resample: bad param %d", param);

        }

        break;
@@ -522,12 +522,12 @@ void AudioMixer::setParameter(int name, int target, int param, void *value) 
            }

            break;

        default:

            LOG_FATAL("bad param");

            LOG_ALWAYS_FATAL("setParameter volume: bad param %d", param);

        }

        break;



    default:

        LOG_FATAL("bad target");

        LOG_ALWAYS_FATAL("setParameter: bad target %d", target);

    }

}

services/audioflinger/FastMixer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ bool FastMixer::threadLoop() 
        case FastMixerState::MIX_WRITE:

            break;

        default:

            LOG_FATAL("bad command %d", command);

            LOG_ALWAYS_FATAL("bad command %d", command);

        }



        // there is a non-idle state available to us; did the state change?

services/audioflinger/Threads.cpp

+9 −9
Original line number Diff line number Diff line
@@ -1711,24 +1711,24 @@ int AudioFlinger::PlaybackThread::asyncCallback(stream_callback_event_t event, 


void AudioFlinger::PlaybackThread::readOutputParameters_l()

{

    // unfortunately we have no way of recovering from errors here, hence the LOG_FATAL

    // unfortunately we have no way of recovering from errors here, hence the LOG_ALWAYS_FATAL

    mSampleRate = mOutput->stream->common.get_sample_rate(&mOutput->stream->common);

    mChannelMask = mOutput->stream->common.get_channels(&mOutput->stream->common);

    if (!audio_is_output_channel(mChannelMask)) {

        LOG_FATAL("HAL channel mask %#x not valid for output", mChannelMask);

        LOG_ALWAYS_FATAL("HAL channel mask %#x not valid for output", mChannelMask);

    }

    if ((mType == MIXER || mType == DUPLICATING) && mChannelMask != AUDIO_CHANNEL_OUT_STEREO) {

        LOG_FATAL("HAL channel mask %#x not supported for mixed output; "

        LOG_ALWAYS_FATAL("HAL channel mask %#x not supported for mixed output; "

                "must be AUDIO_CHANNEL_OUT_STEREO", mChannelMask);

    }

    mChannelCount = popcount(mChannelMask);

    mFormat = mOutput->stream->common.get_format(&mOutput->stream->common);

    if (!audio_is_valid_format(mFormat)) {

        LOG_FATAL("HAL format %#x not valid for output", mFormat);

        LOG_ALWAYS_FATAL("HAL format %#x not valid for output", mFormat);

    }

    if ((mType == MIXER || mType == DUPLICATING) && mFormat != AUDIO_FORMAT_PCM_16_BIT) {

        LOG_FATAL("HAL format %#x not supported for mixed output; must be AUDIO_FORMAT_PCM_16_BIT",

                mFormat);

        LOG_ALWAYS_FATAL("HAL format %#x not supported for mixed output; "

                "must be AUDIO_FORMAT_PCM_16_BIT", mFormat);

    }

    mFrameSize = audio_stream_frame_size(&mOutput->stream->common);

    mBufferSize = mOutput->stream->common.get_buffer_size(&mOutput->stream->common);
@@ -3118,7 +3118,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac 
                break;

            case TrackBase::IDLE:

            default:

                LOG_FATAL("unexpected track state %d", track->mState);

                LOG_ALWAYS_FATAL("unexpected track state %d", track->mState);

            }



            if (isActive) {
@@ -3149,7 +3149,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac 
                    // because we're about to decrement the last sp<> on those tracks.

                    block = FastMixerStateQueue::BLOCK_UNTIL_ACKED;

                } else {

                    LOG_FATAL("fast track %d should have been active", j);

                    LOG_ALWAYS_FATAL("fast track %d should have been active", j);

                }

                tracksToRemove->add(track);

                // Avoids a misleading display in dumpsys
@@ -4765,7 +4765,7 @@ reacquire_wakelock: 
                    continue;



                default:

                    LOG_FATAL("Unexpected activeTrackState %d", activeTrackState);

                    LOG_ALWAYS_FATAL("Unexpected activeTrackState %d", activeTrackState);

                }



                activeTracks.add(activeTrack);