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 6f51c153ea5e4187a313e47ac8bad9a1a999d4e1)
diff --git a/include/media/Interpolator.h b/include/media/Interpolator.h
index 120a074..dd510de 100644
--- a/include/media/Interpolator.h
+++ b/include/media/Interpolator.h
@@ -278,7 +278,7 @@
if (res != NO_ERROR) {
return res;
}
- if (i > 0 && !(x > lastx) /* handle nan */
+ if ((i > 0 && !(x > lastx)) /* handle nan */
|| y != y /* handle nan */) {
// This is a std::map object which imposes sorted order
// automatically on emplace.
diff --git a/include/radio/Radio.h b/include/radio/Radio.h
index a4dfdd1..fb4dd2f 100644
--- a/include/radio/Radio.h
+++ b/include/radio/Radio.h
@@ -79,7 +79,6 @@
Mutex mLock;
sp<IRadio> mIRadio;
- const radio_handle_t mHandle;
sp<RadioCallback> mCallback;
};
diff --git a/include/soundtrigger/SoundTrigger.h b/include/soundtrigger/SoundTrigger.h
index 9a05cac..7a29e31 100644
--- a/include/soundtrigger/SoundTrigger.h
+++ b/include/soundtrigger/SoundTrigger.h
@@ -72,7 +72,6 @@
Mutex mLock;
sp<ISoundTrigger> mISoundTrigger;
- const sound_trigger_module_handle_t mModule;
sp<SoundTriggerCallback> mCallback;
};
diff --git a/media/libnbaio/NBLog.cpp b/media/libnbaio/NBLog.cpp
index de38e7f..9cccfc4 100644
--- a/media/libnbaio/NBLog.cpp
+++ b/media/libnbaio/NBLog.cpp
@@ -957,7 +957,6 @@
// ---------------------------------------------------------------------------
NBLog::Merger::Merger(const void *shared, size_t size):
- mBuffer(NULL),
mShared((Shared *) shared),
mFifo(mShared != NULL ?
new audio_utils_fifo(size, sizeof(uint8_t),
diff --git a/media/libnbaio/include/NBLog.h b/media/libnbaio/include/NBLog.h
index 59b77bd..4e86d7c 100644
--- a/media/libnbaio/include/NBLog.h
+++ b/media/libnbaio/include/NBLog.h
@@ -72,6 +72,7 @@
class iterator;
explicit FormatEntry(const uint8_t *entry);
explicit FormatEntry(const iterator &it);
+ virtual ~FormatEntry() {}
// entry representation in memory
struct entry {
@@ -422,7 +423,6 @@
// vector of the readers the merger is supposed to merge from.
// every reader reads from a writer's buffer
std::vector<NamedReader> mNamedReaders;
- uint8_t *mBuffer;
Shared * const mShared;
std::unique_ptr<audio_utils_fifo> mFifo;
std::unique_ptr<audio_utils_fifo_writer> mFifoWriter;
diff --git a/media/libstagefright/MPEG2TSWriter.cpp b/media/libstagefright/MPEG2TSWriter.cpp
index b83b0a0..03ea959 100644
--- a/media/libstagefright/MPEG2TSWriter.cpp
+++ b/media/libstagefright/MPEG2TSWriter.cpp
@@ -710,7 +710,7 @@
uint32_t crc = htonl(crc32(&buffer->data()[5], 12));
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() {
@@ -786,7 +786,7 @@
uint32_t crc = htonl(crc32(&buffer->data()[5], 12+mSources.size()*5));
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(
@@ -891,7 +891,7 @@
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;
while (offset < accessUnit->size()) {
@@ -937,7 +937,7 @@
memcpy(ptr, accessUnit->data() + offset, copy);
CHECK_EQ(internalWrite(buffer->data(), buffer->size()),
- buffer->size());
+ (ssize_t)buffer->size());
offset += copy;
}
diff --git a/media/libstagefright/codecs/flac/enc/SoftFlacEncoder.h b/media/libstagefright/codecs/flac/enc/SoftFlacEncoder.h
index 97361fa..6027f76 100644
--- a/media/libstagefright/codecs/flac/enc/SoftFlacEncoder.h
+++ b/media/libstagefright/codecs/flac/enc/SoftFlacEncoder.h
@@ -48,13 +48,10 @@
virtual void onQueueFilled(OMX_U32 portIndex);
private:
-
- enum {
- kNumBuffers = 2,
- kMaxNumSamplesPerFrame = 1152,
- kMaxInputBufferSize = kMaxNumSamplesPerFrame * sizeof(int16_t) * 2,
- kMaxOutputBufferSize = 65536, //TODO check if this can be reduced
- };
+ const unsigned int kNumBuffers = 2;
+ const unsigned int kMaxNumSamplesPerFrame = 1152;
+ const unsigned int kMaxInputBufferSize = kMaxNumSamplesPerFrame * sizeof(int16_t) * 2;
+ const unsigned int kMaxOutputBufferSize = 65536; //TODO check if this can be reduced
bool mSignalledError;
diff --git a/media/libstagefright/codecs/mp3dec/SoftMP3.cpp b/media/libstagefright/codecs/mp3dec/SoftMP3.cpp
index 0822c34..3def1f0 100644
--- a/media/libstagefright/codecs/mp3dec/SoftMP3.cpp
+++ b/media/libstagefright/codecs/mp3dec/SoftMP3.cpp
@@ -274,7 +274,7 @@
mConfig->inputBufferUsedLength = 0;
mConfig->outputFrameSize = kOutputBufferSize / sizeof(int16_t);
- if ((int32)outHeader->nAllocLen < mConfig->outputFrameSize) {
+ if ((int32_t)outHeader->nAllocLen < mConfig->outputFrameSize) {
ALOGE("input buffer too small: got %u, expected %u",
outHeader->nAllocLen, mConfig->outputFrameSize);
android_errorWriteLog(0x534e4554, "27793371");
@@ -363,7 +363,7 @@
mAnchorTimeUs + (mNumFramesOutput * 1000000ll) / mSamplingRate;
if (inHeader) {
- CHECK_GE(inHeader->nFilledLen, mConfig->inputBufferUsedLength);
+ CHECK_GE((int32_t)inHeader->nFilledLen, mConfig->inputBufferUsedLength);
inHeader->nOffset += mConfig->inputBufferUsedLength;
inHeader->nFilledLen -= mConfig->inputBufferUsedLength;
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp
index e144942..bb22460 100644
--- a/media/libstagefright/httplive/LiveSession.cpp
+++ b/media/libstagefright/httplive/LiveSession.cpp
@@ -1550,7 +1550,7 @@
mOrigBandwidthIndex, mCurBandwidthIndex);
}
}
- CHECK_LT(mCurBandwidthIndex, mBandwidthItems.size());
+ CHECK_LT((size_t)mCurBandwidthIndex, mBandwidthItems.size());
const BandwidthItem &item = mBandwidthItems.itemAt(mCurBandwidthIndex);
uint32_t streamMask = 0; // streams that should be fetched by the new fetcher
diff --git a/media/libstagefright/include/DataSource.h b/media/libstagefright/include/DataSource.h
index 8f2c7eb..63eccea 100644
--- a/media/libstagefright/include/DataSource.h
+++ b/media/libstagefright/include/DataSource.h
@@ -156,7 +156,7 @@
if (numBytesRead == -1) { // If readAt() returns -1, there is an error.
return false;
}
- if (numBytesRead < numBytesPerChunk) {
+ if (static_cast<size_t>(numBytesRead) < numBytesPerChunk) {
// This case is triggered when the stream ends before the whole
// chunk is read.
x->appendArray(tmp, (size_t)numBytesRead / sizeof(T));
diff --git a/media/libstagefright/wifi-display/MediaSender.cpp b/media/libstagefright/wifi-display/MediaSender.cpp
index ae507fc..cc412f5 100644
--- a/media/libstagefright/wifi-display/MediaSender.cpp
+++ b/media/libstagefright/wifi-display/MediaSender.cpp
@@ -420,7 +420,7 @@
CHECK(accessUnit->meta()->findInt32("rangeLength", &rangeLength));
CHECK(accessUnit->meta()->findMessage("notify", ¬ify)
&& notify != NULL);
- CHECK_GE(accessUnit->size(), rangeLength);
+ CHECK_GE((int32_t)accessUnit->size(), rangeLength);
sp<GraphicBuffer> grbuf(new GraphicBuffer(
rangeOffset + rangeLength /* width */, 1 /* height */,
diff --git a/media/libstagefright/wifi-display/rtp/RTPBase.h b/media/libstagefright/wifi-display/rtp/RTPBase.h
index 6178f00..194f1ee 100644
--- a/media/libstagefright/wifi-display/rtp/RTPBase.h
+++ b/media/libstagefright/wifi-display/rtp/RTPBase.h
@@ -36,10 +36,8 @@
TRANSPORT_TCP_INTERLEAVED,
};
- enum {
- // Really UDP _payload_ size
- kMaxUDPPacketSize = 1472, // 1472 good, 1473 bad on Android@Home
- };
+ // Really UDP _payload_ size
+ const unsigned int kMaxUDPPacketSize = 1472; // 1472 good, 1473 bad on Android@Home
static int32_t PickRandomRTPPort();
};
diff --git a/media/libstagefright/wifi-display/rtp/RTPSender.h b/media/libstagefright/wifi-display/rtp/RTPSender.h
index fefcab7..bedfd01 100644
--- a/media/libstagefright/wifi-display/rtp/RTPSender.h
+++ b/media/libstagefright/wifi-display/rtp/RTPSender.h
@@ -66,11 +66,9 @@
kWhatRTCPNotify,
};
- enum {
- kMaxNumTSPacketsPerRTPPacket = (kMaxUDPPacketSize - 12) / 188,
- kMaxHistorySize = 1024,
- kSourceID = 0xdeadbeef,
- };
+ const unsigned int kMaxNumTSPacketsPerRTPPacket = (kMaxUDPPacketSize - 12) / 188;
+ const unsigned int kMaxHistorySize = 1024;
+ const unsigned int kSourceID = 0xdeadbeef;
sp<ANetworkSession> mNetSession;
sp<AMessage> mNotify;
diff --git a/radio/Radio.cpp b/radio/Radio.cpp
index fa39589..9ddd221 100644
--- a/radio/Radio.cpp
+++ b/radio/Radio.cpp
@@ -117,8 +117,8 @@
// Radio
-Radio::Radio(radio_handle_t handle, const sp<RadioCallback>& callback)
- : mHandle(handle), mCallback(callback)
+Radio::Radio(radio_handle_t /*handle*/, const sp<RadioCallback>& callback)
+ : mCallback(callback)
{
}
diff --git a/soundtrigger/SoundTrigger.cpp b/soundtrigger/SoundTrigger.cpp
index e959b83..289b7b1 100644
--- a/soundtrigger/SoundTrigger.cpp
+++ b/soundtrigger/SoundTrigger.cpp
@@ -124,9 +124,9 @@
}
// SoundTrigger
-SoundTrigger::SoundTrigger(sound_trigger_module_handle_t module,
+SoundTrigger::SoundTrigger(sound_trigger_module_handle_t /*module*/,
const sp<SoundTriggerCallback>& callback)
- : mModule(module), mCallback(callback)
+ : mCallback(callback)
{
}