A series patches for Android #37
Conversation
|
@LindaYu17 please help review this |
|
Personally I don't think libva*.so should go to /vendor/lib folder. That folder is usually for vendor's proprietary libraries. But libva and vaapi are open source libs. I understand they are mainly developed by Intel. But I believe you have developers or contributors from others. Right? In particular, libva is not limited to be used by one vendor. So we should not considered them as vendor provided libraries. We should just treat them as system libs, just like the normal linux desktop. But if you insist, I can add additional patches to do that. |
|
Agree with @cwhuang, besides intel-vaapi-driver, libva supports other vaapi backend drivers, such as r600, nouveau and radeonsi. |
|
HALS/Drivers going into vendor/ can be updated independent of system changes i.e. driver bug fixng etc. We already have patches floating here: https://github.com/android-ia/libva/commits/master. |
|
relative path should be set to /vendor/lib but not /vendor/lib/hw to avoid linking error. +LOCAL_PROPRIETARY_MODULE := true |
| @@ -194,7 +194,7 @@ extern "C" { | |||
| VAStatus vaPutSurface ( | |||
| VADisplay dpy, | |||
| VASurfaceID surface, | |||
| sp<ISurface> draw, /* Android Surface/Window */ | |||
| sp<ANativeWindow> draw, /* Android Native Window */ | |||
| short srcx, | |||
| short srcy, | |||
| unsigned short srcw, | |||
There was a problem hiding this comment.
are you using vaPutSurface on Android?
There was a problem hiding this comment.
no, we don't use it in Android.
| endif | ||
| LOCAL_CFLAGS := \ | ||
| $(if $(filter user,$(TARGET_BUILD_VARIANT)),,-DENABLE_VA_MESSAGING) \ | ||
| -DLOG_TAG=\"libva\" |
There was a problem hiding this comment.
is the build variant actually needing a full trace from libva?
There was a problem hiding this comment.
Hi @LindaYu17 , any comments for this?
There was a problem hiding this comment.
Why not? It's just for debug build.
Besides, what trace should I see? Except these I didn't see other log from libva:
04-23 22:04:40.498 1453 3028 I libva : VA-API version 0.40.0
04-23 22:04:40.498 1453 3028 I libva : Open DRM devices /dev/dri/card0 for (null)
04-23 22:04:40.498 1453 3028 I libva : va_getDriverName() returns 0
04-23 22:04:40.498 1453 3028 I libva : Trying to open /system/lib/dri/i965_drv_video.so
04-23 22:04:40.498 1453 3028 I libva : Found init function __vaDriverInit_0_33
04-23 22:04:40.499 1453 3028 I libva : va_openDriver() returns 0
How could I enable more verbose log?
|
@kalyankondapally seems it's hard to align on directory thing. Do you think it's ok if we maintain a local patch on Android IA to change directory to vendor/? |
|
Hi @cwhuang Also please address Daniel's second comments
thanks |
Jira: https://01.org/jira/browser/AIA-65 Test: vainfo Signed-off-by: Linda Yu <linda.yu@intel.com>
Android source tree has to be read-only. The generated files should be put to the $(OUT)/gen/ dir. Besides, LOCAL_GENERATED_SOURCES must be set before include $(BUILD_SHARED_LIBRARY). Otherwise it has no effect. Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
The documents of Android build system explicitly said LOCAL_COPY_HEADERS and LOCAL_COPY_HEADERS_TO are deprecated. Replace them by the LOCAL_EXPORT_C_INCLUDE_DIRS variable. The modules that use libva will get the include path automatically. Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
It has already been defined by the Android build system. Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
To support older versions, just check if ALOGx are defined. Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Use the path similar to linux desktop. Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
These files are not executables. Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
|
Sorry for reply late. I just rebase my patches and change libs path to /vendor as request. |
|
@cwhuang, thanks, According to @kalyankondapally , /system will control by google, vendor/ will control by the vendor. If will in a different partition. It's easy to update when google have new android version |
|
@LindaYu17 , please help to review.thanks |
|
+1 |
These patches fix building issues of Android on the master branch.
Tested OK on Android-x86 7.1 cm branch.