Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add Android T related definitions #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Android T related definitions #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions mfx_omx_defs.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
MFX_OMX_CFLAGS := -DANDROID

# Android version preference:
ifneq ($(filter 13 13.% T% ,$(PLATFORM_VERSION)),)
MFX_ANDROID_VERSION:= MFX_T
endif
ifneq ($(filter 12 12.% S ,$(PLATFORM_VERSION)),)
MFX_ANDROID_VERSION:= MFX_S
endif
Expand Down Expand Up @@ -61,7 +64,7 @@ MFX_OMX_CFLAGS += \

ifeq ($(BOARD_USES_GRALLOC1),true)
MFX_OMX_CFLAGS += -DMFX_OMX_USE_GRALLOC_1
ifneq ($(filter MFX_P MFX_Q MFX_R MFX_S,$(MFX_ANDROID_VERSION)),)
ifneq ($(filter MFX_P MFX_Q MFX_R MFX_S MFX_T,$(MFX_ANDROID_VERSION)),)
# plugins should use PRIME buffer descriptor since Android P
MFX_OMX_CFLAGS += -DMFX_OMX_USE_PRIME
endif
Expand Down Expand Up @@ -94,7 +97,7 @@ ifneq ($(filter $(MFX_ANDROID_VERSION), MFX_O),)
MFX_OMX_CFLAGS_LIBVA += -DANDROID_O
endif

ifneq ($(filter $(MFX_ANDROID_VERSION), MFX_Q MFX_R MFX_S),)
ifneq ($(filter $(MFX_ANDROID_VERSION), MFX_Q MFX_R MFX_S MFX_T),)
# HDR10 support on Android Q
MFX_OMX_CFLAGS += -DHEVC10HDR_SUPPORT
MFX_OMX_CFLAGS += -DENABLE_READ_SEI
Expand All @@ -113,15 +116,15 @@ MFX_OMX_INCLUDES_LIBVA := $(TARGET_OUT_HEADERS)/libva
MFX_OMX_HEADER_LIBRARIES := libmfx_headers

# Setting usual imported headers
ifneq ($(filter MFX_O_MR1 MFX_P MFX_Q MFX_R MFX_S,$(MFX_ANDROID_VERSION)),)
ifneq ($(filter MFX_O_MR1 MFX_P MFX_Q MFX_R MFX_S MFX_T,$(MFX_ANDROID_VERSION)),)
MFX_OMX_HEADER_LIBRARIES += \
media_plugin_headers \
libnativebase_headers \
libui_headers \
libhardware_headers
endif

ifneq ($(filter MFX_P MFX_Q MFX_R MFX_S,$(MFX_ANDROID_VERSION)),)
ifneq ($(filter MFX_P MFX_Q MFX_R MFX_S MFX_T,$(MFX_ANDROID_VERSION)),)
MFX_OMX_HEADER_LIBRARIES += \
libbase_headers
endif
Expand Down