Reduce build warnings

Change-Id: I27e41dc5c6cecc4933271a12862bdc297b245ee3

7 files changed, 18 insertions, 16 deletions

diff --git a/src/Android.mk b/src/Android.mk
index 3acd0a2..0b242a4 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -172,6 +172,8 @@ LOCAL_C_INCLUDES:=                                                  \
 
 LOCAL_CFLAGS += -x c++ -std=gnu++11 -Wno-multichar -Wno-invalid-offsetof
 
+LOCAL_CFLAGS += -Wno-unused-parameter
+
 LOCAL_STATIC_LIBRARIES += \
         libopensles_helper        \
         libOpenSLESUT
diff --git a/src/android/AacBqToPcmCbRenderer.cpp b/src/android/AacBqToPcmCbRenderer.cpp
index b55a4e4..3438c91 100644
--- a/src/android/AacBqToPcmCbRenderer.cpp
+++ b/src/android/AacBqToPcmCbRenderer.cpp
@@ -39,7 +39,7 @@ namespace android {
 static size_t getAdtsFrameSize(const uint8_t *data, off64_t offset, size_t size) {
     size_t frameSize = 0;
 
-    if (!(offset + ADTS_HEADER_SIZE_UP_TO_FRAMESIZE < size)) {
+    if (!(offset + ADTS_HEADER_SIZE_UP_TO_FRAMESIZE < (off64_t) size)) {
         SL_LOGE("AacBqToPcmCbRenderer::getAdtsFrameSize() returns 0 (can't read syncword or header)"
                 );
         return 0;
@@ -91,20 +91,22 @@ SLresult AacBqToPcmCbRenderer::validateBufferStartEndOnFrameBoundaries(void* dat
         return SL_RESULT_PARAMETER_INVALID;
     }
 
-    while (offset < size) {
+    while (offset < (off64_t) size) {
         if ((frameSize = getAdtsFrameSize((uint8_t *)data, offset, size)) == 0) {
-            SL_LOGE("found ADTS frame of size 0 at offset %llu", offset);
+            SL_LOGE("found ADTS frame of size 0 at offset %lld", (long long) offset);
             return SL_RESULT_CONTENT_CORRUPTED;
         }
         //SL_LOGV("last good offset %llu", offset);
         offset += frameSize;
-        if (offset > size) {
+        if (offset > (off64_t) size) {
             SL_LOGE("found incomplete ADTS frame at end of data");
             return SL_RESULT_CONTENT_CORRUPTED;
         }
     }
-    if (offset != size) { SL_LOGE("ADTS parsing error: reached end of incomplete frame"); }
-    assert(offset == size);
+    if (offset != (off64_t) size) {
+        SL_LOGE("ADTS parsing error: reached end of incomplete frame");
+    }
+    assert(offset == (off64_t) size);
     return SL_RESULT_SUCCESS;
 }
 
diff --git a/src/android/android_GenericPlayer.h b/src/android/android_GenericPlayer.h
index 3aee9e4..a56d7c1 100644
--- a/src/android/android_GenericPlayer.h
+++ b/src/android/android_GenericPlayer.h
@@ -78,7 +78,8 @@ public:
     void getDurationMsec(int* msec); //msec != NULL, ANDROID_UNKNOWN_TIME if unknown
     virtual void getPositionMsec(int* msec) = 0; //msec != NULL, ANDROID_UNKNOWN_TIME if unknown
 
-    virtual void setVideoSurfaceTexture(const sp<IGraphicBufferProducer> &bufferProducer) {}
+    virtual void setVideoSurfaceTexture(const sp<IGraphicBufferProducer> &bufferProducer __unused)
+            { }
 
     void setVolume(float leftVol, float rightVol);
     void attachAuxEffect(int32_t effectId);
diff --git a/src/android/util/AacAdtsExtractor.cpp b/src/android/util/AacAdtsExtractor.cpp
index e615f79..476b5d6 100644
--- a/src/android/util/AacAdtsExtractor.cpp
+++ b/src/android/util/AacAdtsExtractor.cpp
@@ -137,14 +137,14 @@ AacAdtsExtractor::AacAdtsExtractor(const sp<DataSource> &source)
                 // Usually frameSize == 0 due to EOS is benign (and getFrameSize() doesn't SL_LOGE),
                 // but in this case we were told the total size of the data source and so an EOS
                 // should not happen.
-                SL_LOGE("AacAdtsExtractor() failed querying framesize at offset=%lld", offset);
+                SL_LOGE("AacAdtsExtractor() failed querying framesize at offset=%lld", (long long) offset);
                 return;
             }
 
             offset += frameSize;
             if (offset > streamSize) {
                 SL_LOGE("AacAdtsExtractor() frame of size %zu at offset=%lld is beyond EOF %lld",
-                        frameSize, offset, streamSize);
+                        frameSize, (long long) offset, (long long) streamSize);
                 return;
             }
             numFrames ++;
diff --git a/src/itf/IEqualizer.c b/src/itf/IEqualizer.c
index 14ff965..23bf072 100644
--- a/src/itf/IEqualizer.c
+++ b/src/itf/IEqualizer.c
@@ -361,11 +361,7 @@ static SLresult IEqualizer_GetCurrentPreset(SLEqualizerItf self, SLuint16 *pPres
         }
         interface_unlock_shared(thiz);
 
-        if (preset < 0) {
-            *pPreset = SL_EQUALIZER_UNDEFINED;
-        } else {
-            *pPreset = (SLuint16) preset;
-        }
+        *pPreset = (SLuint16) preset;
 #endif
 
     }
diff --git a/src/itf/IStreamInformation.c b/src/itf/IStreamInformation.c
index d8da5a9..582bc2a 100644
--- a/src/itf/IStreamInformation.c
+++ b/src/itf/IStreamInformation.c
@@ -247,7 +247,7 @@ static XAresult IStreamInformation_QueryActiveStreams( XAStreamInformationItf se
 
     result = XA_RESULT_SUCCESS;
     *numStreams = thiz->mStreamInfoTable.itemAt(0).containerInfo.numStreams;
-    activeStreams = thiz->mActiveStreams;
+    // FIXME not setting activeStreams
 
     interface_unlock_shared(thiz);
 #else
diff --git a/src/itf/IVolume.c b/src/itf/IVolume.c
index aaef4a9..32c9b0a 100644
--- a/src/itf/IVolume.c
+++ b/src/itf/IVolume.c
@@ -19,10 +19,11 @@
 #include "sles_allinclusive.h"
 
 
-static SLresult IVolume_SetVolumeLevel(SLVolumeItf self, SLmillibel level)
+static SLresult IVolume_SetVolumeLevel(SLVolumeItf self, SLmillibel level_)
 {
     SL_ENTER_INTERFACE
 
+    int level = level_;
     if (!((SL_MILLIBEL_MIN <= level) && (level <= PLATFORM_MILLIBEL_MAX_VOLUME))) {
         result = SL_RESULT_PARAMETER_INVALID;
     } else {