Skip to content

Conversation

@rosetta-jpn
Copy link
Contributor

This patches deletes

  • vaGetDisplay() in va_android.h
  • VA_DISPLAY_ANDROID in va_backend.h
  • libva-android in Android.bp

This patches deletes
- vaGetDisplay() in va_android.h
- VA_DISPLAY_ANDROID in va_backend.h
- libva-android in Android.bp
@rosetta-jpn
Copy link
Contributor Author

@XinfengZhang PTAL!

libva-intel-media-driver should be updated too like below.

diff --git a/Tools/MediaDriverTools/Android/mk/cmrt.tpl b/Tools/MediaDriverTools/Android/mk/cmrt.tpl
index 470cc64b3..84814cf01 100644
--- a/Tools/MediaDriverTools/Android/mk/cmrt.tpl
+++ b/Tools/MediaDriverTools/Android/mk/cmrt.tpl
@@ -53,6 +53,6 @@ LOCAL_MODULE := libigfxcmrt
 LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_LDLIBS := -lc -lva -lva-android
-LOCAL_SHARED_LIBRARIES := libc libdl libcutils liblog libutils libm libva libva-android
+LOCAL_SHARED_LIBRARIES := libc libdl libcutils liblog libutils libm libva
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/cmrtlib/Android.bp b/cmrtlib/Android.bp
index cb74de394..347d8e8de 100644
--- a/cmrtlib/Android.bp
+++ b/cmrtlib/Android.bp
@@ -71,7 +71,6 @@ cc_library_shared {
         "libutils",
         "libm",
         "libva",
-        "libva-android",
     ],
     vendor: true,
     enabled: false,

Copy link
Contributor

@XinfengZhang XinfengZhang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but we need keep the PR here for some time, to ensure no one will be impacted by this PR, because it will force android user switch to drm path.

@rosetta-jpn
Copy link
Contributor Author

Sure.

Although I am not hurry at all on this patch, how long shall we wait?

@XinfengZhang
Copy link
Contributor

because it is non-backward compatible change(only for android), we are assuming that there are no one are using old interface, if this assumption is incorrect, we have to abandon this PR. so, we need to be careful, lets wait 2 weeks to check whether there is any objections.

@rosetta-jpn
Copy link
Contributor Author

Hi @XinfengZhang shall we merge this? I am ok to hold this for more while if you want.

@rosetta-jpn
Copy link
Contributor Author

@XinfengZhang Gentle ping.

@XinfengZhang XinfengZhang merged commit 3da1ba7 into intel:master Feb 11, 2025
14 checks passed
@rosetta-jpn
Copy link
Contributor Author

Thanks Carl!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants