Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 05:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from topic "bufferpool2-V2" into main am: 04b5d6679b am: 1b909f4807

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2906625

Change-Id: I9561c3d4e26c94762002690e7c2cdc10b4147cdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sungtak Lee
2024-01-16 19:23:59 +00:00
committed by Automerger Merge Worker
parent 849b273360 1b909f4807
commit 7828b091eb
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/bufferpool/aidl/default/Android.bp
View File

@@ -33,15 +33,16 @@ cc_library {
"libcutils", "libcutils",
"libfmq", "libfmq",
"liblog", "liblog",
"libnativewindow",
"libutils", "libutils",
"android.hardware.media.bufferpool2-V1-ndk", "android.hardware.media.bufferpool2-V2-ndk",
], ],
static_libs: [ static_libs: [
"libaidlcommonsupport", "libaidlcommonsupport",
], ],
export_shared_lib_headers: [ export_shared_lib_headers: [
"libfmq", "libfmq",
"android.hardware.media.bufferpool2-V1-ndk", "android.hardware.media.bufferpool2-V2-ndk",
], ],
double_loadable: true, double_loadable: true,
cflags: [ cflags: [

8
media/bufferpool/aidl/default/BufferPoolClient.cpp
View File

@@ -757,7 +757,13 @@ BufferPoolStatus BufferPoolClient::Impl::fetchBufferHandle(
return svcSpecific ? svcSpecific : ResultStatus::CRITICAL_ERROR; return svcSpecific ? svcSpecific : ResultStatus::CRITICAL_ERROR;
} }
if (results[0].getTag() == FetchResult::buffer) { if (results[0].getTag() == FetchResult::buffer) {
*handle = ::android::dupFromAidl(results[0].get<FetchResult::buffer>().buffer); if (results[0].get<FetchResult::buffer>().buffer.has_value()) {
*handle = ::android::dupFromAidl(results[0].get<FetchResult::buffer>().buffer.value());
} else {
// TODO: Support HardwareBuffer
ALOGW("handle nullptr");
*handle = nullptr;
}
return ResultStatus::OK; return ResultStatus::OK;
} }
return results[0].get<FetchResult::failure>(); return results[0].get<FetchResult::failure>();

9
media/bufferpool/aidl/default/tests/Android.bp
View File

@@ -36,8 +36,9 @@ cc_test {
"libcutils", "libcutils",
"libfmq", "libfmq",
"liblog", "liblog",
"libnativewindow",
"libutils", "libutils",
"android.hardware.media.bufferpool2-V1-ndk", "android.hardware.media.bufferpool2-V2-ndk",
], ],
static_libs: [ static_libs: [
"libaidlcommonsupport", "libaidlcommonsupport",
@@ -59,8 +60,9 @@ cc_test {
"libcutils", "libcutils",
"libfmq", "libfmq",
"liblog", "liblog",
"libnativewindow",
"libutils", "libutils",
"android.hardware.media.bufferpool2-V1-ndk", "android.hardware.media.bufferpool2-V2-ndk",
], ],
static_libs: [ static_libs: [
"libaidlcommonsupport", "libaidlcommonsupport",
@@ -82,8 +84,9 @@ cc_test {
"libcutils", "libcutils",
"libfmq", "libfmq",
"liblog", "liblog",
"libnativewindow",
"libutils", "libutils",
"android.hardware.media.bufferpool2-V1-ndk", "android.hardware.media.bufferpool2-V2-ndk",
], ],
static_libs: [ static_libs: [
"libaidlcommonsupport", "libaidlcommonsupport",

2
media/c2/aidl/Android.bp
View File

@@ -20,7 +20,7 @@ aidl_interface {
], ],
imports: [ imports: [
"android.hardware.common-V2", "android.hardware.common-V2",
"android.hardware.media.bufferpool2-V1", "android.hardware.media.bufferpool2-V2",
], ],
include_dirs: [ include_dirs: [
"frameworks/native/aidl/gui", "frameworks/native/aidl/gui",