A series patches for Android #37

cwhuang · 2017-04-07T06:45:28Z

These patches fix building issues of Android on the master branch.

Tested OK on Android-x86 7.1 cm branch.

xuguangxin · 2017-04-07T07:31:43Z

@LindaYu17 please help review this

LindaYu17

could you please put libva*.so and to /vendor/lib folder, all vendor provided driver/hal should come to this folder.

cwhuang · 2017-04-10T09:21:50Z

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.

xhaihao · 2017-04-10T13:31:18Z

Agree with @cwhuang, besides intel-vaapi-driver, libva supports other vaapi backend drivers, such as r600, nouveau and radeonsi.

kalyankondapally · 2017-04-11T06:22:47Z

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.

LindaYu17 · 2017-04-11T06:41:18Z

relative path should be set to /vendor/lib but not /vendor/lib/hw to avoid linking error.

+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_RELATIVE_PATH := .

chivakker · 2017-04-11T17:20:38Z

va/android/va_android.cpp

@@ -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,


are you using vaPutSurface on Android?

no, we don't use it in Android.

chivakker · 2017-04-11T17:21:52Z

va/Android.mk

-endif
+LOCAL_CFLAGS := \
+	$(if $(filter user,$(TARGET_BUILD_VARIANT)),,-DENABLE_VA_MESSAGING) \
+	-DLOG_TAG=\"libva\"


is the build variant actually needing a full trace from libva?

Hi @LindaYu17 , any comments for this?

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?

xuguangxin · 2017-04-19T07:37:37Z

@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/?

xuguangxin · 2017-04-21T02:24:37Z

Hi @cwhuang
@kalyankondapally convinced @xhaihao and me, Could you help to change directory as we did in https://github.com/android-ia/libva/commits/master?

Also please address Daniel's second comments

is the build variant actually needing a full trace from libva?

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>

cwhuang · 2017-04-26T05:45:13Z

Sorry for reply late. I just rebase my patches and change libs path to /vendor as request.
(though I still didn't see any real benefit from it)

xuguangxin · 2017-04-27T10:44:46Z

@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

xuguangxin · 2017-04-27T10:45:17Z

@LindaYu17 , please help to review.thanks

LindaYu17 · 2017-04-28T01:03:37Z

+1

This was referenced Apr 7, 2017

Convince me you are using Android.mk, va_android.cpp #30

Closed

A series of patches for Android intel/intel-vaapi-driver#126

Merged

xhaihao requested a review from LindaYu17 April 7, 2017 08:30

LindaYu17 reviewed Apr 10, 2017

View reviewed changes

chivakker reviewed Apr 11, 2017

View reviewed changes

LindaYu17 and others added 10 commits April 26, 2017 13:25

libva: change to use ANativeWindow

db92885

Jira: https://01.org/jira/browser/AIA-65 Test: vainfo Signed-off-by: Linda Yu <linda.yu@intel.com>

android: remove redundant -DANDROID

9d345be

It has already been defined by the Android build system. Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>

android: simplify Android logging

340d99b

To support older versions, just check if ALOGx are defined. Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>

android: enable logging except the user build

cffbd24

Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>

android: change libva drivers path

a42e503

Use the path similar to linux desktop. Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>

Remove the unnecessary exec bit

8352ab9

These files are not executables. Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>

android: move the libraries to /vendor

bed97ef

Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>

android: change VA_DRIVERS_PATH to /vendor

63e14fc

Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>

cwhuang force-pushed the master branch from 8556f99 to 63e14fc Compare April 26, 2017 05:34

LindaYu17 approved these changes May 2, 2017

View reviewed changes

xhaihao merged commit 22bbdaa into intel:master May 2, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

A series patches for Android #37

A series patches for Android #37

cwhuang commented Apr 7, 2017

xuguangxin commented Apr 7, 2017

LindaYu17 left a comment

cwhuang commented Apr 10, 2017

xhaihao commented Apr 10, 2017

kalyankondapally commented Apr 11, 2017

LindaYu17 commented Apr 11, 2017

chivakker Apr 11, 2017

LindaYu17 Apr 19, 2017

chivakker Apr 11, 2017

xuguangxin Apr 21, 2017

cwhuang Apr 26, 2017

xuguangxin commented Apr 19, 2017 •

edited

xuguangxin commented Apr 21, 2017

cwhuang commented Apr 26, 2017

xuguangxin commented Apr 27, 2017

xuguangxin commented Apr 27, 2017

LindaYu17 commented Apr 28, 2017

A series patches for Android #37

A series patches for Android #37

Conversation

cwhuang commented Apr 7, 2017

xuguangxin commented Apr 7, 2017

LindaYu17 left a comment

Choose a reason for hiding this comment

cwhuang commented Apr 10, 2017

xhaihao commented Apr 10, 2017

kalyankondapally commented Apr 11, 2017

LindaYu17 commented Apr 11, 2017

chivakker Apr 11, 2017

Choose a reason for hiding this comment

LindaYu17 Apr 19, 2017

Choose a reason for hiding this comment

chivakker Apr 11, 2017

Choose a reason for hiding this comment

xuguangxin Apr 21, 2017

Choose a reason for hiding this comment

cwhuang Apr 26, 2017

Choose a reason for hiding this comment

xuguangxin commented Apr 19, 2017 • edited

xuguangxin commented Apr 21, 2017

cwhuang commented Apr 26, 2017

xuguangxin commented Apr 27, 2017

xuguangxin commented Apr 27, 2017

LindaYu17 commented Apr 28, 2017

xuguangxin commented Apr 19, 2017 •

edited