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

Commit 0bdcf66b authored by Colin Cross's avatar Colin Cross
Browse files

Fix trivial warnings hidden by -isystem 

Fix the trivial warnings that are hidden by the use of -isystem to
include frameworks/av and caught by -Werror.

Test: m -j checkbuild
Bug: 31751828
Change-Id: I155f9f772ce0a84b364313814cb7cf528b9de4eb
Merged-In: I155f9f772ce0a84b364313814cb7cf528b9de4eb
(cherry picked from commit b8c35f94)
parent f6014a1c

cmds/stagefright/stagefright.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -159,7 +159,7 @@ static void dumpSource(const sp<IMediaSource> &source, const String8 &filename) 
                       1,

                       1,

                       mbuf->range_length(),

                       mbuf->range_length(),

                       out),

                       out),

                (ssize_t)mbuf->range_length());

                mbuf->range_length());





        mbuf->release();

        mbuf->release();

        mbuf = NULL;

        mbuf = NULL;

include/media/stagefright/MediaBuffer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -223,7 +223,7 @@ private: 
        // Caution: atomic_int_fast32_t is 64 bits on LP64.

        // Caution: atomic_int_fast32_t is 64 bits on LP64.

        std::atomic_int_least32_t mFlags;

        std::atomic_int_least32_t mFlags;

        std::atomic_int_least32_t mRemoteRefcount;

        std::atomic_int_least32_t mRemoteRefcount;

        int32_t unused[6]; // additional buffer space

        int32_t unused[6] __attribute__((__unused__)); // additional buffer space

    };

    };





    inline SharedControl *getSharedControl() const {

    inline SharedControl *getSharedControl() const {

include/private/media/AudioTrackShared.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -172,7 +172,7 @@ private: 
                // client write-only, server read-only

                // client write-only, server read-only

                uint16_t    mSendLevel;      // Fixed point U4.12 so 0x1000 means 1.0

                uint16_t    mSendLevel;      // Fixed point U4.12 so 0x1000 means 1.0





                uint16_t    mPad2;           // unused

                uint16_t    mPad2 __attribute__((__unused__)); // unused





                // server write-only, client read

                // server write-only, client read

                ExtendedTimestampQueue::Shared mExtendedTimestampQueue;

                ExtendedTimestampQueue::Shared mExtendedTimestampQueue;

include/private/media/VideoFrame.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -30,8 +30,8 @@ namespace android { 
class VideoFrame

class VideoFrame

{

{

public:

public:

    VideoFrame(): mWidth(0), mHeight(0), mDisplayWidth(0), mDisplayHeight(0), mSize(0), mData(0),

    VideoFrame(): mWidth(0), mHeight(0), mDisplayWidth(0), mDisplayHeight(0), mSize(0),

            mRotationAngle(0) {}

            mRotationAngle(0), mData(0) {}





    VideoFrame(const VideoFrame& copy) {

    VideoFrame(const VideoFrame& copy) {

        mWidth = copy.mWidth;

        mWidth = copy.mWidth;

media/libmedia/MediaCodecInfo.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -85,13 +85,13 @@ sp<MediaCodecInfo::Capabilities> MediaCodecInfo::Capabilities::FromParcel( 
}

}





status_t MediaCodecInfo::Capabilities::writeToParcel(Parcel *parcel) const {

status_t MediaCodecInfo::Capabilities::writeToParcel(Parcel *parcel) const {

    CHECK_LE(mProfileLevels.size(), INT32_MAX);

    CHECK_LE(mProfileLevels.size(), static_cast<size_t>(INT32_MAX));

    parcel->writeInt32(mProfileLevels.size());

    parcel->writeInt32(mProfileLevels.size());

    for (size_t i = 0; i < mProfileLevels.size(); i++) {

    for (size_t i = 0; i < mProfileLevels.size(); i++) {

        parcel->writeInt32(mProfileLevels.itemAt(i).mProfile);

        parcel->writeInt32(mProfileLevels.itemAt(i).mProfile);

        parcel->writeInt32(mProfileLevels.itemAt(i).mLevel);

        parcel->writeInt32(mProfileLevels.itemAt(i).mLevel);

    }

    }

    CHECK_LE(mColorFormats.size(), INT32_MAX);

    CHECK_LE(mColorFormats.size(), static_cast<size_t>(INT32_MAX));

    parcel->writeInt32(mColorFormats.size());

    parcel->writeInt32(mColorFormats.size());

    for (size_t i = 0; i < mColorFormats.size(); i++) {

    for (size_t i = 0; i < mColorFormats.size(); i++) {

        parcel->writeInt32(mColorFormats.itemAt(i));

        parcel->writeInt32(mColorFormats.itemAt(i));