Skip to content
This repository was archived by the owner on May 17, 2023. It is now read-only.

Commit f7ae849

Browse files
LukeZheZhuOleg Nabiullin
authored and
Oleg Nabiullin
committed
Add Android build support for 2020 20.2 release
1 parent 494d130 commit f7ae849

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

_studio/mfx_lib/Android.mk

+4-3
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ MFX_LOCAL_SRC_FILES_HW += \
6565
mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_weighted_prediction.cpp \
6666
mfx_lib/encode_hw/hevc/agnostic/g12/hevcehw_g12_caps.cpp \
6767
mfx_lib/encode_hw/hevc/agnostic/g12/hevcehw_g12_rext.cpp \
68+
mfx_lib/encode_hw/hevc/agnostic/g12/hevcehw_g12_scc.cpp \
6869
mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_interlace_lin.cpp \
6970
mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_fei_lin.cpp \
7071
mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_lin.cpp \
@@ -245,7 +246,7 @@ LOCAL_C_INCLUDES := \
245246

246247
LOCAL_CFLAGS := \
247248
$(MFX_CFLAGS_INTERNAL_HW) \
248-
-Wall -Werror
249+
-Wall -Werror -Wno-unused-parameter
249250
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
250251
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)
251252

@@ -270,7 +271,7 @@ LOCAL_C_INCLUDES := \
270271

271272
LOCAL_CFLAGS := \
272273
$(MFX_CFLAGS_INTERNAL_HW) \
273-
-Wall -Werror
274+
-Wall -Werror -Wno-unused-parameter
274275
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
275276

276277
LOCAL_LDFLAGS := $(MFX_LOCAL_LDFLAGS_HW)
@@ -304,7 +305,7 @@ LOCAL_C_INCLUDES := \
304305

305306
LOCAL_CFLAGS := \
306307
$(MFX_CFLAGS_INTERNAL_HW) \
307-
-Wall -Werror
308+
-Wall -Werror -Wno-unused-parameter
308309
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)
309310

310311
LOCAL_LDFLAGS := $(MFX_LOCAL_LDFLAGS_HW)

_studio/shared/umc/io/umc_va/src/umc_va_linux.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ VAProfile get_next_va_profile(uint32_t umc_codec, uint32_t profile)
229229
break;
230230
case UMC::VA_H265 | UMC::VA_PROFILE_SCC | UMC::VA_PROFILE_444:
231231
if (profile < 1) va_profile = VAProfileHEVCSccMain444;
232+
MFX_FALLTHROUGH;
232233
case UMC::VA_H265 | UMC::VA_PROFILE_SCC | UMC::VA_PROFILE_444 | UMC::VA_PROFILE_10:
233234
if (profile < 1) va_profile = VAProfileHEVCSccMain444_10;
234235
break;

0 commit comments

Comments
 (0)