Adding Macro for Android U

Tracked-On: OAM-112683 Signed-off-by: Tanuj Tekriwal <[email protected]>
projectceladon · Oct 20, 2023 · 8981faa · 8981faa
1 parent ae0d20b
commit 8981faa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/android/include/mfx_android_config.h b/android/include/mfx_android_config.h
@@ -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__
diff --git a/android/include/mfx_android_defs.h b/android/include/mfx_android_defs.h
@@ -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
 

diff --git a/android/mfx_defs.mk b/android/mfx_defs.mk
@@ -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