Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Adding Macro for Android U #52

Merged
merged 1 commit into from
Oct 20, 2023
Merged

Adding Macro for Android U #52

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion android/include/mfx_android_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#define MFX_Q 0x09
#define MFX_R 0x0a
#define MFX_S 0x0b
#define MFX_T 0x0d
#define MFX_T 0x0c
#define MFX_U 0x0d

#endif // #ifndef __MFX_CONFIG_H__
2 changes: 1 addition & 1 deletion android/include/mfx_android_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

#define MFX_ENABLE_USER_ENCODE

#if MFX_ANDROID_VERSION >= MFX_P
#if (MFX_ANDROID_VERSION >= MFX_P)
#define MFX_ENABLE_KERNELS
#endif

Expand Down
3 changes: 3 additions & 0 deletions android/mfx_defs.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ MEDIA_VERSION_ALL := $(MEDIA_VERSION).pre$(MEDIA_VERSION_EXTRA)
MFX_CFLAGS += -DMEDIA_VERSION_STR=\"\\\"${MEDIA_VERSION_ALL}\\\"\"

# Android version preference:
ifneq ($(filter 14 14.% U% ,$(PLATFORM_VERSION)),)
MFX_ANDROID_VERSION:= MFX_U
endif
ifneq ($(filter 13 13.% T% ,$(PLATFORM_VERSION)),)
MFX_ANDROID_VERSION:= MFX_T
endif
Expand Down
Loading