Fix or suppress clang warnings before upstream fix.

* OMXVideoDecoderVP9HWR.cpp, explicitly assigning user_priv to itself.
  Comment out the unused parameter.

* OMXVideoDecoderVP9Hybrid.h hides overloaded virtual function FillRenderBuffer.
  (This needs more changes in all definitions and uses of FillRenderBuffer).

Change-Id: Ia973b37a6be4eb5847c393f13c206f9d1d4d4781

2 files changed, 5 insertions, 4 deletions

diff --git a/videocodec/Android.mk b/videocodec/Android.mk
index d63b83b..0676fcb 100644
--- a/videocodec/Android.mk
+++ b/videocodec/Android.mk
@@ -223,6 +223,9 @@ LOCAL_CFLAGS += -Werror
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libOMXVideoDecoderVP9Hybrid
 
+# OMXVideoDecoderVP9Hybrid.h hides overloaded virtual function FillRenderBuffer.
+LOCAL_CLANG_CFLAGS += -Wno-overloaded-virtual
+
 ifeq ($(TARGET_BOARD_PLATFORM),merrifield)
 LOCAL_CFLAGS += -DVED_TILING
 endif
diff --git a/videocodec/OMXVideoDecoderVP9HWR.cpp b/videocodec/OMXVideoDecoderVP9HWR.cpp
index df64314..61481bc 100644
--- a/videocodec/OMXVideoDecoderVP9HWR.cpp
+++ b/videocodec/OMXVideoDecoderVP9HWR.cpp
@@ -100,11 +100,10 @@ OMXVideoDecoderVP9HWR::~OMXVideoDecoderVP9HWR()
 // Callback func for vpx decoder to get decode buffer
 // Now we map from the vaSurface to deploy gralloc buffer
 // as decode buffer
-int getVP9FrameBuffer(void *user_priv,
+int getVP9FrameBuffer(void* /*user_priv*/,
                           unsigned int new_size,
                           vpx_codec_frame_buffer_t *fb)
 {
-    (void)user_priv;
     if (fb == NULL) {
         return -1;
     }
@@ -138,10 +137,9 @@ int getVP9FrameBuffer(void *user_priv,
 
 // call back function from libvpx to inform frame buffer
 // not used anymore.
-int releaseVP9FrameBuffer(void *user_priv, vpx_codec_frame_buffer_t *fb)
+int releaseVP9FrameBuffer(void* /*user_priv*/, vpx_codec_frame_buffer_t *fb)
 {
     int i;
-    user_priv = user_priv; // to remove warning
     if (fb == NULL) {
         return -1;
     }