cameraservice: handle Surfaces coming from vendor clients
Vendor client interface has been updated to use Surface instead
of NativeHandle for parceling ImageReader surface.
This CL updates the cameraservice to handle both windowHandles
and surfaces coming from the vendor client.
Bug: 283283111
Test: 'atest ACameraNdkVendorTest' passes
FaceHAL works OK!
Change-Id: I2e5515cfedd5d37c5addcf40aa56b0ecfa42b53f
diff --git a/camera/cameraserver/manifest_android.frameworks.cameraservice.service.xml b/camera/cameraserver/manifest_android.frameworks.cameraservice.service.xml
index f7e455f..5d85909 100644
--- a/camera/cameraserver/manifest_android.frameworks.cameraservice.service.xml
+++ b/camera/cameraserver/manifest_android.frameworks.cameraservice.service.xml
@@ -11,7 +11,7 @@
<hal format="aidl">
<name>android.frameworks.cameraservice.service</name>
- <version>1</version>
+ <version>2</version>
<interface>
<name>ICameraService</name>
<instance>default</instance>
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index af4c70c..f75195b 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -66,6 +66,7 @@
"libmedia_codeclist",
"libmedia_omx",
"libmemunreachable",
+ "libnativewindow",
"libprocessgroup",
"libprocinfo",
"libsensorprivacy",
@@ -95,8 +96,8 @@
"android.frameworks.cameraservice.device@2.0",
"android.frameworks.cameraservice.device@2.1",
"android.frameworks.cameraservice.common-V1-ndk",
- "android.frameworks.cameraservice.service-V1-ndk",
- "android.frameworks.cameraservice.device-V1-ndk",
+ "android.frameworks.cameraservice.service-V2-ndk",
+ "android.frameworks.cameraservice.device-V2-ndk",
"android.hardware.camera.common-V1-ndk",
"android.hardware.camera.device-V2-ndk",
"android.hardware.camera.metadata-V2-ndk",
diff --git a/services/camera/libcameraservice/aidl/AidlUtils.cpp b/services/camera/libcameraservice/aidl/AidlUtils.cpp
index 2225cfe..f5d68eb 100644
--- a/services/camera/libcameraservice/aidl/AidlUtils.cpp
+++ b/services/camera/libcameraservice/aidl/AidlUtils.cpp
@@ -73,24 +73,49 @@
UOutputConfiguration convertFromAidl(const SOutputConfiguration &src) {
std::vector<sp<IGraphicBufferProducer>> iGBPs;
- auto &windowHandles = src.windowHandles;
- iGBPs.reserve(windowHandles.size());
+ if (!src.surfaces.empty()) {
+ auto& surfaces = src.surfaces;
+ iGBPs.reserve(surfaces.size());
- for (auto &handle : windowHandles) {
- native_handle_t* nh = makeFromAidl(handle);
- auto igbp = AImageReader_getHGBPFromHandle(nh);
- if (igbp == nullptr) {
- ALOGE("%s: Could not get HGBP from NativeHandle: %s. Skipping.",
- __FUNCTION__, handle.toString().c_str());
- continue;
+ for (auto& sSurface : surfaces) {
+ sp<IGraphicBufferProducer> igbp =
+ Surface::getIGraphicBufferProducer(sSurface.get());
+ if (igbp == nullptr) {
+ ALOGE("%s: ANativeWindow (%p) not backed by a Surface.",
+ __FUNCTION__, sSurface.get());
+ continue;
+ }
+ iGBPs.push_back(igbp);
}
- iGBPs.push_back(new H2BGraphicBufferProducer(igbp));
- native_handle_delete(nh);
+ } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ // HIDL token manager (and consequently 'windowHandles') is deprecated and will be removed
+ // in the future. However, cameraservice must still support old NativeHandle pathway until
+ // all vendors have moved away from using NativeHandles
+ auto &windowHandles = src.windowHandles;
+#pragma clang diagnostic pop
+
+ iGBPs.reserve(windowHandles.size());
+
+ for (auto &handle : windowHandles) {
+ native_handle_t* nh = makeFromAidl(handle);
+ auto igbp = AImageReader_getHGBPFromHandle(nh);
+ if (igbp == nullptr) {
+ ALOGE("%s: Could not get HGBP from NativeHandle: %s. Skipping.",
+ __FUNCTION__, handle.toString().c_str());
+ continue;
+ }
+
+ iGBPs.push_back(new H2BGraphicBufferProducer(igbp));
+ native_handle_delete(nh);
+ }
}
+
UOutputConfiguration outputConfiguration(
iGBPs, convertFromAidl(src.rotation), src.physicalCameraId,
src.windowGroupId, OutputConfiguration::SURFACE_TYPE_UNKNOWN, 0, 0,
- (windowHandles.size() > 1));
+ (iGBPs.size() > 1));
return outputConfiguration;
}