Upgrade media driver to 2021Q3 Release - 21.3.5

This change includes:
1. Rebase media driver to 2021Q3 Release - 21.3.5
2. Fixed some path issues in Android makefile generation tool
3. Minor fix to make media driver compile and run on Android

Tracked-On: OAM-100026
Signed-off-by: Chen, Tianmi <[email protected]>

Author: TianmiChen

Tools/MediaDriverTools/Android/GenerateAndroidMk.py

@@ -233,7 +233,31 @@ def getMakefile(self):
     def getFlagsfile(self):
         return "media_driver/CMakeFiles/iHD_drv_video.dir/flags.make"
 
+    def getIncludes(self):
+         text = self.getDefines("CXX_INCLUDES")
+         preself = path.abspath(path.join(self.src, "../"))
+         print("self="+self.src)
+         print("preself="+preself)
+         includes = []
+         lines = text.split("\n")
+         for l in lines:
+             #normpath will make sure we did not refer outside.
+             p = path.normpath(l)
+             print("Inc=" + p);
+             j = p.find(self.src)
+             i = p.find(preself)
+             if j != -1:
+                 includes.append(p[j:].replace(self.src, "$(LOCAL_PATH)"))
+             else:
+                 if i != -1:
+                     includes.append(p[i:].replace(preself, "$(LOCAL_PATH)/.."))
+         return INDENT + ("\n" + INDENT).join(includes) if includes else ""
+
     def adjustSources(self, lines):
+        for i, l in enumerate(lines):
+            j = l.find("__/")
+            if j != -1:
+                lines[i] = path.join("..", l[j+3:])
         lines[:] = [l for l in lines if "media_libva_putsurface_linux.cpp" not in l]
 
 class Main:

Tools/MediaDriverTools/Android/mk/cmrt.tpl

@@ -33,6 +33,10 @@ LOCAL_C_INCLUDES += \
 @LOCAL_C_INCLUDES
 
 LOCAL_CFLAGS += \
+    -Wno-error \
+    -Wno-unused-variable \
+    -Wno-unused-parameter \
+    -Wno-unused-private-field \
     -Wno-non-virtual-dtor \
     -DANDROID=1 \
 @LOCAL_CFLAGS

Tools/MediaDriverTools/Android/mk/gmm.tpl

@@ -26,10 +26,13 @@ LOCAL_PROPRIETARY_MODULE := true
 LOCAL_SRC_FILES = \
 @LOCAL_SRC_FILES
 
-LOCAL_CFLAGS = \
+LOCAL_CFLAGS := \
+    -Wno-error \
+    -Wno-unused-parameter \
 @LOCAL_CFLAGS
 
-LOCAL_CPPFLAGS = \
+LOCAL_CPPFLAGS := \
+    -fexceptions \
     -std=c++11
 
 LOCAL_C_INCLUDES = \

Tools/MediaDriverTools/Android/mk/media_driver.tpl

@@ -35,12 +35,16 @@ LOCAL_SHARED_LIBRARIES := \
     liblog \
 
 
-LOCAL_STATIC_LIBRARIES = \
+LOCAL_STATIC_LIBRARIES := \
     libgmm_umd \
 
-LOCAL_CPPFLAGS = \
+LOCAL_CPPFLAGS := \
+    -Wno-error \
+    -Wno-unused-parameter \
+    -Wno-c++11-narrowing \
     -DDRV_I915 \
     -DOTC_GRALLOC \
+    -DANDROID \
     -DANDROID_VERSION=800 \
     -fexceptions \
     -frtti \

cmrtlib/Android.mk

@@ -51,13 +51,11 @@ LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/linux/hardware
 
 LOCAL_CFLAGS += \
-    -Wno-non-virtual-dtor \
     -Wno-error \
+    -Wno-unused-variable \
     -Wno-unused-parameter \
-    -Wno-deprecated-declarations \
-    -Wno-implicit-fallthrough \
-    -Wno-missing-field-initializers \
-    -Wno-c++11-narrowing \
+    -Wno-unused-private-field \
+    -Wno-non-virtual-dtor \
     -DANDROID=1 \
     -DCM_RT_EXPORTS \
     -DISTDLIB_UMD \

media_driver/Android.mk

@@ -1883,7 +1883,7 @@ MOS_STATUS CodechalEncodeCscDs::RawSurfaceMediaCopy(MOS_FORMAT srcFormat)
     auto cscSurface = m_encoder->m_trackedBuf->GetCscSurface(CODEC_CURR_TRACKED_BUFFER);
 
     // Copy through VEBOX from Linear/TileY to TileY
-#ifdef LINUX
+#if (LINUX || ANDROID)
     CODECHAL_ENCODE_CHK_STATUS_RETURN(m_pMosMediaCopy->MediaCopy(
         &m_rawSurfaceToEnc->OsResource,
         &cscSurface->OsResource,

media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.cpp

@@ -37,6 +37,7 @@
 //user feature
 #if ANDROID_VERSION >= 800
 #define USER_FEATURE_FILE                   "/data/igfx_user_feature.txt"
+#define USER_FEATURE_FILE_NEXT              "/data/igfx_user_feature_next.txt"
 #else
 #define USER_FEATURE_FILE                   "/etc/igfx_user_feature.txt"
 #define USER_FEATURE_FILE_NEXT              "/etc/igfx_user_feature_next.txt"

media_driver/linux/common/os/mos_utilities_specific.h

@@ -116,6 +116,7 @@ MOS_STATUS VpPipelineAdapterBase::GetVpMhwInterface(
     return eStatus;
 }
 
+#ifndef ANDROID
 VpPipelineAdapterBase *VpPipelineAdapterBase::VphalStateFactory(
     PMOS_INTERFACE pOsInterface,
     PMOS_CONTEXT   pOsDriverContext,
@@ -124,6 +125,7 @@ VpPipelineAdapterBase *VpPipelineAdapterBase::VphalStateFactory(
     VP_FUNC_CALL();
     return VphalDevice::CreateFactoryNext(pOsInterface, pOsDriverContext, peStatus);
 }
+#endif
 
 VpPipelineAdapterBase::~VpPipelineAdapterBase()
 {