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

Commit da631f58 authored by Glenn Kasten's avatar Glenn Kasten Committed by android-build-merger
Browse files

Merge "Fix build warnings" into nyc-dev 

am: 7be6866a

* commit '7be6866a':
  Fix build warnings
parents 066ba128 7be6866a

media/libnbaio/PipeReader.cpp

+6 −1
Original line number Diff line number Diff line
@@ -36,7 +36,12 @@ PipeReader::PipeReader(Pipe& pipe) : 


PipeReader::~PipeReader()

{

    int32_t readers = android_atomic_dec(&mPipe.mReaders);

#if !LOG_NDEBUG

    int32_t readers =

#else

    (void)

#endif

            android_atomic_dec(&mPipe.mReaders);

    ALOG_ASSERT(readers > 0);

}

services/audioflinger/AudioFlinger.cpp

+0 −10
Original line number Diff line number Diff line
@@ -219,8 +219,6 @@ AudioFlinger::AudioFlinger() 


void AudioFlinger::onFirstRef()

{

    int rc = 0;



    Mutex::Autolock _l(mLock);



    /* TODO: move all this work into an Init() function */
@@ -1246,8 +1244,6 @@ status_t AudioFlinger::setVoiceVolume(float value) 
status_t AudioFlinger::getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames,

        audio_io_handle_t output) const

{

    status_t status;



    Mutex::Autolock _l(mLock);



    PlaybackThread *playbackThread = checkPlaybackThread_l(output);
@@ -1414,10 +1410,6 @@ void AudioFlinger::NotificationClient::binderDied(const wp<IBinder>& who __unuse 


// ----------------------------------------------------------------------------



static bool deviceRequiresCaptureAudioOutputPermission(audio_devices_t inDevice) {

    return audio_is_remote_submix_device(inDevice);

}



sp<IAudioRecord> AudioFlinger::openRecord(

        audio_io_handle_t input,

        uint32_t sampleRate,
@@ -1775,8 +1767,6 @@ sp<AudioFlinger::PlaybackThread> AudioFlinger::openOutput_l(audio_module_handle_ 
        return 0;

    }



    audio_hw_device_t *hwDevHal = outHwDev->hwDevice();



    if (*output == AUDIO_IO_HANDLE_NONE) {

        *output = nextUniqueId(AUDIO_UNIQUE_ID_USE_OUTPUT);

    } else {

services/audioflinger/AudioResamplerCubic.cpp

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ size_t AudioResamplerCubic::resampleStereo16(int32_t* out, size_t outFrameCount, 
    int16_t *in = mBuffer.i16;



    while (outputIndex < outputSampleCount) {

        int32_t sample;

        int32_t x;



        // calculate output sample

services/audioflinger/AudioResamplerDyn.cpp

+0 −1
Original line number Diff line number Diff line
@@ -282,7 +282,6 @@ void AudioResamplerDyn<TC, TI, TO>::setSampleRate(int32_t inSampleRate) 
        return;

    }

    int32_t oldSampleRate = mInSampleRate;

    int32_t oldHalfNumCoefs = mConstants.mHalfNumCoefs;

    uint32_t oldPhaseWrapLimit = mConstants.mL << mConstants.mShift;

    bool useS32 = false;

services/audioflinger/AudioResamplerSinc.cpp

+4 −0
Original line number Diff line number Diff line
@@ -141,6 +141,8 @@ void AudioResamplerSinc::init_routine() 


// ----------------------------------------------------------------------------



#if !USE_NEON



static inline

int32_t mulRL(int left, int32_t in, uint32_t vRL)

{
@@ -202,6 +204,8 @@ int32_t mulAddRL(int left, uint32_t inRL, int32_t v, int32_t a) 
#endif

}



#endif // !USE_NEON



// ----------------------------------------------------------------------------



AudioResamplerSinc::AudioResamplerSinc(