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

Commit f1063e26 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

libmedia: fix all warning, make warnings errors, use clang 

Change-Id: Ic00d2c5d0bbb1605e96666e25c9ccc22bea6d3ff
parent ee4e1b1a

media/libmedia/Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ LOCAL_SRC_FILES:= \ 
LOCAL_MODULE:= libmedia_helper

LOCAL_MODULE_TAGS := optional



LOCAL_C_FLAGS += -Werror -Wall

LOCAL_CLANG := true



include $(BUILD_STATIC_LIBRARY)



include $(CLEAR_VARS)
@@ -84,5 +87,8 @@ LOCAL_C_INCLUDES := \ 
    $(call include-path-for, audio-effects) \

    $(call include-path-for, audio-utils)



LOCAL_CFLAGS += -Werror -Wall

LOCAL_CLANG := true



include $(BUILD_SHARED_LIBRARY)

media/libmedia/AudioSystem.cpp

+0 −1
Original line number Diff line number Diff line
@@ -477,7 +477,6 @@ void AudioSystem::AudioFlingerClient::ioConfigChanged(int event, audio_io_handle 
        const void *param2) {

    ALOGV("ioConfigChanged() event %d", event);

    const OutputDescriptor *desc;

    audio_stream_type_t stream;



    if (ioHandle == AUDIO_IO_HANDLE_NONE) return;

media/libmedia/AudioTrack.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1663,7 +1663,8 @@ nsecs_t AudioTrack::processAudioBuffer() 
        // AudioSystem cache. We should not exit here but after calling the callback so

        // that the upper layers can recreate the track

        if (!isOffloadedOrDirect_l() || (mSequence == mObservedSequence)) {

            status_t status = restoreTrack_l("processAudioBuffer");

            status_t status __unused = restoreTrack_l("processAudioBuffer");

            // FIXME unused status

            // after restoration, continue below to make sure that the loop and buffer events

            // are notified because they have been cleared from mCblk->mFlags above.

        }

media/libmedia/AudioTrackShared.cpp

+3 −2
Original line number Diff line number Diff line
@@ -619,8 +619,9 @@ status_t ServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush) 
            // Rather than shutting down on a corrupt flush, just treat it as a full flush

            if (!(0 <= filled && (size_t) filled <= mFrameCount)) {

                ALOGE("mFlush %#x -> %#x, front %#x, rear %#x, mask %#x, newFront %#x, "

                        "filled %d=%#x",

                        mFlush, flush, front, rear, mask, newFront, filled, filled);

                        "filled %zd=%#x",

                        mFlush, flush, front, rear,

                        (unsigned)mask, newFront, filled, (unsigned)filled);

                newFront = rear;

            }

            mFlush = flush;

media/libmedia/CharacterEncodingDetector.cpp

+0 −2
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ void CharacterEncodingDetector::detectAndConvert() { 
        // try combined detection of artist/album/title etc.

        char buf[1024];

        buf[0] = 0;

        int idx;

        bool allprintable = true;

        for (int i = 0; i < size; i++) {

            const char *name = mNames.getEntry(i);
@@ -169,7 +168,6 @@ void CharacterEncodingDetector::detectAndConvert() { 
            const char *name = mNames.getEntry(i);

            uint8_t* src = (uint8_t *)mValues.getEntry(i);

            int len = strlen((char *)src);

            uint8_t* dest = src;



            ALOGV("@@@ checking %s", name);

            const char *s = mValues.getEntry(i);