From f7ae8497b3e58a0ef8ad4ac94256f04928c20456 Mon Sep 17 00:00:00 2001
From: LukeZhu <luke.zhezhu@gmail.com>
Date: Fri, 10 Jul 2020 17:53:21 +0800
Subject: [PATCH] Add Android build support for 2020 20.2 release

---
 _studio/mfx_lib/Android.mk                        | 7 ++++---
 _studio/shared/umc/io/umc_va/src/umc_va_linux.cpp | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/_studio/mfx_lib/Android.mk b/_studio/mfx_lib/Android.mk
index 3d298dac81..9fcc25092a 100644
--- a/_studio/mfx_lib/Android.mk
+++ b/_studio/mfx_lib/Android.mk
@@ -65,6 +65,7 @@ MFX_LOCAL_SRC_FILES_HW += \
     mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_weighted_prediction.cpp \
     mfx_lib/encode_hw/hevc/agnostic/g12/hevcehw_g12_caps.cpp \
     mfx_lib/encode_hw/hevc/agnostic/g12/hevcehw_g12_rext.cpp \
+    mfx_lib/encode_hw/hevc/agnostic/g12/hevcehw_g12_scc.cpp \
     mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_interlace_lin.cpp \
     mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_fei_lin.cpp \
     mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_lin.cpp \
@@ -245,7 +246,7 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_CFLAGS := \
     $(MFX_CFLAGS_INTERNAL_HW) \
-    -Wall -Werror
+    -Wall -Werror -Wno-unused-parameter
 LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
 LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)
 
@@ -270,7 +271,7 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_CFLAGS := \
     $(MFX_CFLAGS_INTERNAL_HW) \
-    -Wall -Werror
+    -Wall -Werror -Wno-unused-parameter
 LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
 
 LOCAL_LDFLAGS := $(MFX_LOCAL_LDFLAGS_HW)
@@ -304,7 +305,7 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_CFLAGS := \
     $(MFX_CFLAGS_INTERNAL_HW) \
-    -Wall -Werror
+    -Wall -Werror -Wno-unused-parameter
 LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)
 
 LOCAL_LDFLAGS := $(MFX_LOCAL_LDFLAGS_HW)
diff --git a/_studio/shared/umc/io/umc_va/src/umc_va_linux.cpp b/_studio/shared/umc/io/umc_va/src/umc_va_linux.cpp
index 40bea09771..a592f760d7 100644
--- a/_studio/shared/umc/io/umc_va/src/umc_va_linux.cpp
+++ b/_studio/shared/umc/io/umc_va/src/umc_va_linux.cpp
@@ -229,6 +229,7 @@ VAProfile get_next_va_profile(uint32_t umc_codec, uint32_t profile)
         break;
     case UMC::VA_H265 | UMC::VA_PROFILE_SCC | UMC::VA_PROFILE_444:
         if (profile < 1) va_profile = VAProfileHEVCSccMain444;
+        MFX_FALLTHROUGH;
     case UMC::VA_H265 | UMC::VA_PROFILE_SCC | UMC::VA_PROFILE_444 | UMC::VA_PROFILE_10:
         if (profile < 1) va_profile = VAProfileHEVCSccMain444_10;
         break;