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

Commit f6014a1c authored by Colin Cross's avatar Colin Cross
Browse files

Fix non-trivial warnings hidden by -isystem 

These warnings were hidden by -isystem.

Bug: 31751828
Test: m -j checkbuild
Change-Id: Ibb1aa07a6827fcbd29fc15291fcd90280c0f608d
Merged-In: Ibb1aa07a6827fcbd29fc15291fcd90280c0f608d
(cherry picked from commit 6f51c153)
parent 04427cbc

include/media/stagefright/DataSource.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -165,7 +165,7 @@ bool DataSource::getVector(off64_t offset, Vector<T>* x, size_t count, 
        if (numBytesRead == -1) { // If readAt() returns -1, there is an error.

        if (numBytesRead == -1) { // If readAt() returns -1, there is an error.

            return false;

            return false;

        }

        }

        if (numBytesRead < numBytesPerChunk) {

        if (static_cast<size_t>(numBytesRead) < numBytesPerChunk) {

            // This case is triggered when the stream ends before the whole

            // This case is triggered when the stream ends before the whole

            // chunk is read.

            // chunk is read.

            x->appendArray(tmp, (size_t)numBytesRead / sizeof(T));

            x->appendArray(tmp, (size_t)numBytesRead / sizeof(T));

include/radio/Radio.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -79,7 +79,6 @@ private: 




            Mutex                   mLock;

            Mutex                   mLock;

            sp<IRadio>              mIRadio;

            sp<IRadio>              mIRadio;

            const radio_handle_t    mHandle;

            sp<RadioCallback>       mCallback;

            sp<RadioCallback>       mCallback;

};

};

include/soundtrigger/SoundTrigger.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,6 @@ private: 




            Mutex                               mLock;

            Mutex                               mLock;

            sp<ISoundTrigger>                   mISoundTrigger;

            sp<ISoundTrigger>                   mISoundTrigger;

            const sound_trigger_module_handle_t mModule;

            sp<SoundTriggerCallback>            mCallback;

            sp<SoundTriggerCallback>            mCallback;

};

};

media/libstagefright/MPEG2TSWriter.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -739,7 +739,7 @@ void MPEG2TSWriter::writeProgramAssociationTable() { 
    uint32_t crc = htonl(crc32(&buffer->data()[5], 12));

    uint32_t crc = htonl(crc32(&buffer->data()[5], 12));

    memcpy(&buffer->data()[17], &crc, sizeof(crc));

    memcpy(&buffer->data()[17], &crc, sizeof(crc));





    CHECK_EQ(internalWrite(buffer->data(), buffer->size()), buffer->size());

    CHECK_EQ(internalWrite(buffer->data(), buffer->size()), (ssize_t)buffer->size());

}

}





void MPEG2TSWriter::writeProgramMap() {

void MPEG2TSWriter::writeProgramMap() {
@@ -815,7 +815,7 @@ void MPEG2TSWriter::writeProgramMap() { 
    uint32_t crc = htonl(crc32(&buffer->data()[5], 12+mSources.size()*5));

    uint32_t crc = htonl(crc32(&buffer->data()[5], 12+mSources.size()*5));

    memcpy(&buffer->data()[17+mSources.size()*5], &crc, sizeof(crc));

    memcpy(&buffer->data()[17+mSources.size()*5], &crc, sizeof(crc));





    CHECK_EQ(internalWrite(buffer->data(), buffer->size()), buffer->size());

    CHECK_EQ(internalWrite(buffer->data(), buffer->size()), (ssize_t)buffer->size());

}

}





void MPEG2TSWriter::writeAccessUnit(

void MPEG2TSWriter::writeAccessUnit(
@@ -920,7 +920,7 @@ void MPEG2TSWriter::writeAccessUnit( 




    memcpy(ptr, accessUnit->data(), copy);

    memcpy(ptr, accessUnit->data(), copy);





    CHECK_EQ(internalWrite(buffer->data(), buffer->size()), buffer->size());

    CHECK_EQ(internalWrite(buffer->data(), buffer->size()), (ssize_t)buffer->size());





    size_t offset = copy;

    size_t offset = copy;

    while (offset < accessUnit->size()) {

    while (offset < accessUnit->size()) {
@@ -966,7 +966,7 @@ void MPEG2TSWriter::writeAccessUnit( 




        memcpy(ptr, accessUnit->data() + offset, copy);

        memcpy(ptr, accessUnit->data() + offset, copy);

        CHECK_EQ(internalWrite(buffer->data(), buffer->size()),

        CHECK_EQ(internalWrite(buffer->data(), buffer->size()),

                 buffer->size());

                 (ssize_t)buffer->size());





        offset += copy;

        offset += copy;

    }

    }

media/libstagefright/codecs/flac/enc/SoftFlacEncoder.h

+4 −7
Original line number Original line Diff line number Diff line
@@ -48,13 +48,10 @@ protected: 
    virtual void onQueueFilled(OMX_U32 portIndex);

    virtual void onQueueFilled(OMX_U32 portIndex);





private:

private:



    const unsigned int kNumBuffers = 2;

    enum {

    const unsigned int kMaxNumSamplesPerFrame = 1152;

        kNumBuffers = 2,

    const unsigned int kMaxInputBufferSize = kMaxNumSamplesPerFrame * sizeof(int16_t) * 2;

        kMaxNumSamplesPerFrame = 1152,

    const unsigned int kMaxOutputBufferSize = 65536;    //TODO check if this can be reduced

        kMaxInputBufferSize = kMaxNumSamplesPerFrame * sizeof(int16_t) * 2,

        kMaxOutputBufferSize = 65536,    //TODO check if this can be reduced

    };





    bool mSignalledError;

    bool mSignalledError;