camera: vndk: migrate from NativeHandle to ANativeWindow
The client side implementation of Camera vNDK used
NativeHandle to parcel NDK ANativeWindow, because ANativeWindow
wasn't parcelable over stable interfaces until recently. However,
this introduced an implicit dependency on HIDL as encoding
ANativeWindow to NativeHandle required HIDL Token Manager.
HIDL Token Manager is deprecated and scheduled to be removed soon.
This CL updates the client side vNDK implementation to use
ANativeWindow instead of NativeHandle. This includes updating
the shared code, which had special handling for when built for
the vNDK.
Bug: 283283111
Test: atest ACameraNdkVendorTest passes
atest CameraCtsTestCases:Native* tests pass
FaceHAL works OK!
Change-Id: I64a6918f041032c216dfa074d74ad2ea5b6abfeb
diff --git a/camera/ndk/Android.bp b/camera/ndk/Android.bp
index d4dd546..165395a 100644
--- a/camera/ndk/Android.bp
+++ b/camera/ndk/Android.bp
@@ -154,8 +154,8 @@
"libcamera_metadata",
"libmediandk",
"android.frameworks.cameraservice.common-V1-ndk",
- "android.frameworks.cameraservice.device-V1-ndk",
- "android.frameworks.cameraservice.service-V1-ndk",
+ "android.frameworks.cameraservice.device-V2-ndk",
+ "android.frameworks.cameraservice.service-V2-ndk",
],
static_libs: [
"android.hardware.camera.common@1.0-helper",
@@ -188,7 +188,6 @@
],
static_libs: [
"android.hardware.camera.common@1.0-helper",
- "android.hidl.token@1.0",
],
cflags: [
"-D__ANDROID_VNDK__",
diff --git a/camera/ndk/NdkCameraCaptureSession.cpp b/camera/ndk/NdkCameraCaptureSession.cpp
index 4387cc6..92de1e4 100644
--- a/camera/ndk/NdkCameraCaptureSession.cpp
+++ b/camera/ndk/NdkCameraCaptureSession.cpp
@@ -213,7 +213,7 @@
EXPORT
camera_status_t ACameraCaptureSession_prepareWindow(
ACameraCaptureSession* session,
- ACameraWindowType *window) {
+ ANativeWindow *window) {
ATRACE_CALL();
if (session == nullptr || window == nullptr) {
ALOGE("%s: Error: session %p / window %p is null", __FUNCTION__, session, window);
diff --git a/camera/ndk/NdkCameraDevice.cpp b/camera/ndk/NdkCameraDevice.cpp
index 8211671..f2ec573 100644
--- a/camera/ndk/NdkCameraDevice.cpp
+++ b/camera/ndk/NdkCameraDevice.cpp
@@ -124,7 +124,7 @@
EXPORT
camera_status_t ACaptureSessionOutput_create(
- ACameraWindowType* window, /*out*/ACaptureSessionOutput** out) {
+ ANativeWindow* window, /*out*/ACaptureSessionOutput** out) {
ATRACE_CALL();
if (window == nullptr || out == nullptr) {
ALOGE("%s: Error: bad argument. window %p, out %p",
@@ -137,7 +137,7 @@
EXPORT
camera_status_t ACaptureSessionSharedOutput_create(
- ACameraWindowType* window, /*out*/ACaptureSessionOutput** out) {
+ ANativeWindow* window, /*out*/ACaptureSessionOutput** out) {
ATRACE_CALL();
if (window == nullptr || out == nullptr) {
ALOGE("%s: Error: bad argument. window %p, out %p",
@@ -150,7 +150,7 @@
EXPORT
camera_status_t ACaptureSessionPhysicalOutput_create(
- ACameraWindowType* window, const char* physicalId,
+ ANativeWindow* window, const char* physicalId,
/*out*/ACaptureSessionOutput** out) {
ATRACE_CALL();
if (window == nullptr || physicalId == nullptr || out == nullptr) {
@@ -164,7 +164,7 @@
EXPORT
camera_status_t ACaptureSessionSharedOutput_add(ACaptureSessionOutput *out,
- ACameraWindowType* window) {
+ ANativeWindow* window) {
ATRACE_CALL();
if ((window == nullptr) || (out == nullptr)) {
ALOGE("%s: Error: bad argument. window %p, out %p",
@@ -190,7 +190,7 @@
EXPORT
camera_status_t ACaptureSessionSharedOutput_remove(ACaptureSessionOutput *out,
- ACameraWindowType* window) {
+ ANativeWindow* window) {
ATRACE_CALL();
if ((window == nullptr) || (out == nullptr)) {
ALOGE("%s: Error: bad argument. window %p, out %p",
diff --git a/camera/ndk/NdkCaptureRequest.cpp b/camera/ndk/NdkCaptureRequest.cpp
index 87de4a9..b851a1d 100644
--- a/camera/ndk/NdkCaptureRequest.cpp
+++ b/camera/ndk/NdkCaptureRequest.cpp
@@ -27,7 +27,7 @@
EXPORT
camera_status_t ACameraOutputTarget_create(
- ACameraWindowType* window, ACameraOutputTarget** out) {
+ ANativeWindow* window, ACameraOutputTarget** out) {
ATRACE_CALL();
if (window == nullptr) {
ALOGE("%s: Error: input window is null", __FUNCTION__);
diff --git a/camera/ndk/impl/ACameraCaptureSession.cpp b/camera/ndk/impl/ACameraCaptureSession.cpp
index 73439c7..449c0b4 100644
--- a/camera/ndk/impl/ACameraCaptureSession.cpp
+++ b/camera/ndk/impl/ACameraCaptureSession.cpp
@@ -146,7 +146,7 @@
return ret;
}
-camera_status_t ACameraCaptureSession::prepare(ACameraWindowType* window) {
+camera_status_t ACameraCaptureSession::prepare(ANativeWindow* window) {
#ifdef __ANDROID_VNDK__
std::shared_ptr<acam::CameraDevice> dev = getDevicePtr();
#else
diff --git a/camera/ndk/impl/ACameraCaptureSession.h b/camera/ndk/impl/ACameraCaptureSession.h
index 88135ba..0d7a2c1 100644
--- a/camera/ndk/impl/ACameraCaptureSession.h
+++ b/camera/ndk/impl/ACameraCaptureSession.h
@@ -23,14 +23,14 @@
#ifdef __ANDROID_VNDK__
#include "ndk_vendor/impl/ACameraDevice.h"
-#include "ndk_vendor/impl/ACameraCaptureSessionVendor.h"
#else
#include "ACameraDevice.h"
+#endif
using namespace android;
struct ACaptureSessionOutput {
- explicit ACaptureSessionOutput(ACameraWindowType* window, bool isShared = false,
+ explicit ACaptureSessionOutput(ANativeWindow* window, bool isShared = false,
const char* physicalCameraId = "") :
mWindow(window), mIsShared(isShared), mPhysicalCameraId(physicalCameraId) {};
@@ -47,28 +47,27 @@
return mWindow > other.mWindow;
}
- inline bool isWindowEqual(ACameraWindowType* window) const {
+ inline bool isWindowEqual(ANativeWindow* window) const {
return mWindow == window;
}
// returns true if the window was successfully added, false otherwise.
- inline bool addSharedWindow(ACameraWindowType* window) {
+ inline bool addSharedWindow(ANativeWindow* window) {
auto ret = mSharedWindows.insert(window);
return ret.second;
}
// returns the number of elements removed.
- inline size_t removeSharedWindow(ACameraWindowType* window) {
+ inline size_t removeSharedWindow(ANativeWindow* window) {
return mSharedWindows.erase(window);
}
- ACameraWindowType* mWindow;
- std::set<ACameraWindowType *> mSharedWindows;
+ ANativeWindow* mWindow;
+ std::set<ANativeWindow*> mSharedWindows;
bool mIsShared;
int mRotation = CAMERA3_STREAM_ROTATION_0;
std::string mPhysicalCameraId;
};
-#endif
struct ACaptureSessionOutputContainer {
std::set<ACaptureSessionOutput> mOutputs;
@@ -147,7 +146,7 @@
mPreparedCb.context = context;
mPreparedCb.onWindowPrepared = cb;
}
- camera_status_t prepare(ACameraWindowType *window);
+ camera_status_t prepare(ANativeWindow *window);
ACameraDevice* getDevice();
diff --git a/camera/ndk/impl/ACameraDevice.cpp b/camera/ndk/impl/ACameraDevice.cpp
index 97d65b0..1fa71f4 100644
--- a/camera/ndk/impl/ACameraDevice.cpp
+++ b/camera/ndk/impl/ACameraDevice.cpp
@@ -341,7 +341,7 @@
return ACAMERA_OK;
}
-camera_status_t CameraDevice::prepareLocked(ACameraWindowType *window) {
+camera_status_t CameraDevice::prepareLocked(ANativeWindow *window) {
camera_status_t ret = checkCameraClosedOrErrorLocked();
if (ret != ACAMERA_OK) {
return ret;
@@ -1097,7 +1097,7 @@
if (onWindowPrepared == nullptr) {
return;
}
- ACameraWindowType* anw;
+ ANativeWindow* anw;
found = msg->findPointer(kAnwKey, (void**) &anw);
if (!found) {
ALOGE("%s: Cannot find ANativeWindow: %d!", __FUNCTION__, __LINE__);
@@ -1823,7 +1823,7 @@
return ret;
}
// We've found the window corresponding to the surface id.
- ACameraWindowType *window = it->second.first;
+ ANativeWindow *window = it->second.first;
sp<AMessage> msg = new AMessage(kWhatPreparedCb, dev->mHandler);
msg->setPointer(kContextKey, session->mPreparedCb.context);
msg->setPointer(kAnwKey, window);
diff --git a/camera/ndk/impl/ACameraDevice.h b/camera/ndk/impl/ACameraDevice.h
index 4658d18..2b9f327 100644
--- a/camera/ndk/impl/ACameraDevice.h
+++ b/camera/ndk/impl/ACameraDevice.h
@@ -151,7 +151,7 @@
camera_status_t updateOutputConfigurationLocked(ACaptureSessionOutput *output);
- camera_status_t prepareLocked(ACameraWindowType *window);
+ camera_status_t prepareLocked(ANativeWindow *window);
camera_status_t allocateCaptureRequest(
const ACaptureRequest* request, sp<CaptureRequest>& outReq);
diff --git a/camera/ndk/impl/ACaptureRequest.h b/camera/ndk/impl/ACaptureRequest.h
index 2ffcafe..118c2a5 100644
--- a/camera/ndk/impl/ACaptureRequest.h
+++ b/camera/ndk/impl/ACaptureRequest.h
@@ -22,11 +22,8 @@
using namespace android;
-#ifdef __ANDROID_VNDK__
-#include "ndk_vendor/impl/ACaptureRequestVendor.h"
-#else
struct ACameraOutputTarget {
- explicit ACameraOutputTarget(ACameraWindowType* window) : mWindow(window) {};
+ explicit ACameraOutputTarget(ANativeWindow* window) : mWindow(window) {};
bool operator == (const ACameraOutputTarget& other) const {
return mWindow == other.mWindow;
@@ -41,9 +38,8 @@
return mWindow > other.mWindow;
}
- ACameraWindowType* mWindow;
+ ANativeWindow* mWindow;
};
-#endif
struct ACameraOutputTargets {
std::set<ACameraOutputTarget> mOutputs;
diff --git a/camera/ndk/include/camera/NdkCameraCaptureSession.h b/camera/ndk/include/camera/NdkCameraCaptureSession.h
index 099c5c5..cf6b970 100644
--- a/camera/ndk/include/camera/NdkCameraCaptureSession.h
+++ b/camera/ndk/include/camera/NdkCameraCaptureSession.h
@@ -124,7 +124,7 @@
*/
typedef void (*ACameraCaptureSession_prepareCallback)(
void *context,
- ACameraWindowType *window,
+ ANativeWindow *window,
ACameraCaptureSession *session);
/// Enum for describing error reason in {@link ACameraCaptureFailure}
@@ -276,7 +276,7 @@
*/
typedef void (*ACameraCaptureSession_captureCallback_bufferLost)(
void* context, ACameraCaptureSession* session,
- ACaptureRequest* request, ACameraWindowType* window, int64_t frameNumber);
+ ACaptureRequest* request, ANativeWindow* window, int64_t frameNumber);
/**
* ACaptureCaptureSession_captureCallbacks structure used in
@@ -1088,7 +1088,7 @@
* and no pre-allocation is done.</p>
*
* @param session the {@link ACameraCaptureSession} that needs to prepare output buffers.
- * @param window the {@link ACameraWindowType} for which the output buffers need to be prepared.
+ * @param window the {@link ANativeWindow} for which the output buffers need to be prepared.
*
* @return <ul><li>
* {@link ACAMERA_OK} if the method succeeds</li>
@@ -1102,7 +1102,7 @@
*/
camera_status_t ACameraCaptureSession_prepareWindow(
ACameraCaptureSession* session,
- ACameraWindowType *window) __INTRODUCED_IN(34);
+ ANativeWindow *window) __INTRODUCED_IN(34);
__END_DECLS
#endif /* _NDK_CAMERA_CAPTURE_SESSION_H */
diff --git a/camera/ndk/include/camera/NdkCameraDevice.h b/camera/ndk/include/camera/NdkCameraDevice.h
index de10eb3..fbd0ee1 100644
--- a/camera/ndk/include/camera/NdkCameraDevice.h
+++ b/camera/ndk/include/camera/NdkCameraDevice.h
@@ -364,7 +364,7 @@
* @see ACaptureSessionOutputContainer_add
*/
camera_status_t ACaptureSessionOutput_create(
- ACameraWindowType* anw, /*out*/ACaptureSessionOutput** output) __INTRODUCED_IN(24);
+ ANativeWindow* anw, /*out*/ACaptureSessionOutput** output) __INTRODUCED_IN(24);
/**
* Free a ACaptureSessionOutput object.
@@ -705,7 +705,7 @@
* @see ACaptureSessionOutputContainer_add
*/
camera_status_t ACaptureSessionSharedOutput_create(
- ACameraWindowType* anw, /*out*/ACaptureSessionOutput** output) __INTRODUCED_IN(28);
+ ANativeWindow* anw, /*out*/ACaptureSessionOutput** output) __INTRODUCED_IN(28);
/**
* Add a native window to shared ACaptureSessionOutput.
@@ -723,7 +723,7 @@
* ACaptureSessionOutput.</li></ul>
*/
camera_status_t ACaptureSessionSharedOutput_add(ACaptureSessionOutput *output,
- ACameraWindowType *anw) __INTRODUCED_IN(28);
+ ANativeWindow *anw) __INTRODUCED_IN(28);
/**
* Remove a native window from shared ACaptureSessionOutput.
@@ -739,7 +739,7 @@
* ACaptureSessionOutput.</li></ul>
*/
camera_status_t ACaptureSessionSharedOutput_remove(ACaptureSessionOutput *output,
- ACameraWindowType* anw) __INTRODUCED_IN(28);
+ ANativeWindow* anw) __INTRODUCED_IN(28);
/**
* Create a new camera capture session similar to {@link ACameraDevice_createCaptureSession}. This
@@ -797,7 +797,7 @@
* @see ACaptureSessionOutputContainer_add
*/
camera_status_t ACaptureSessionPhysicalOutput_create(
- ACameraWindowType* anw, const char* physicalId,
+ ANativeWindow* anw, const char* physicalId,
/*out*/ACaptureSessionOutput** output) __INTRODUCED_IN(29);
/**
diff --git a/camera/ndk/include/camera/NdkCameraWindowType.h b/camera/ndk/include/camera/NdkCameraWindowType.h
index 0838fba..2217528 100644
--- a/camera/ndk/include/camera/NdkCameraWindowType.h
+++ b/camera/ndk/include/camera/NdkCameraWindowType.h
@@ -41,14 +41,11 @@
* camera2 NDK. This enables us to share the api definition headers and avoid
* code duplication (since the VNDK variant doesn't use ANativeWindow unlike the
* NDK variant).
+ * @deprecated No longer needed. Both NDK and VNDK use ANativeWindow now.
+ * Use ANativeWindow directly.
*/
-#ifdef __ANDROID_VNDK__
-#include <cutils/native_handle.h>
-typedef const native_handle_t ACameraWindowType;
-#else
#include <android/native_window.h>
typedef ANativeWindow ACameraWindowType;
-#endif
/** @} */
diff --git a/camera/ndk/include/camera/NdkCaptureRequest.h b/camera/ndk/include/camera/NdkCaptureRequest.h
index dc18544..5ccb510 100644
--- a/camera/ndk/include/camera/NdkCaptureRequest.h
+++ b/camera/ndk/include/camera/NdkCaptureRequest.h
@@ -99,7 +99,7 @@
*
* @see ACaptureRequest_addTarget
*/
-camera_status_t ACameraOutputTarget_create(ACameraWindowType* window,
+camera_status_t ACameraOutputTarget_create(ANativeWindow* window,
ACameraOutputTarget** output) __INTRODUCED_IN(24);
/**
diff --git a/camera/ndk/ndk_vendor/impl/ACameraCaptureSessionVendor.h b/camera/ndk/ndk_vendor/impl/ACameraCaptureSessionVendor.h
deleted file mode 100644
index 45098c3..0000000
--- a/camera/ndk/ndk_vendor/impl/ACameraCaptureSessionVendor.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "utils.h"
-
-#include <android/binder_auto_utils.h>
-#include <string>
-#include <set>
-
-using ::android::acam::utils::native_handle_ptr_wrapper;
-
-struct ACaptureSessionOutput {
- explicit ACaptureSessionOutput(const native_handle_t* window, bool isShared = false,
- const char* physicalCameraId = "") :
- mWindow(window), mIsShared(isShared), mPhysicalCameraId(physicalCameraId) {};
-
- bool operator == (const ACaptureSessionOutput& other) const {
- return (mWindow == other.mWindow);
- }
-
- bool operator != (const ACaptureSessionOutput& other) const {
- return mWindow != other.mWindow;
- }
-
- bool operator < (const ACaptureSessionOutput& other) const {
- return mWindow < other.mWindow;
- }
-
- bool operator > (const ACaptureSessionOutput& other) const {
- return mWindow > other.mWindow;
- }
-
- inline bool isWindowEqual(ACameraWindowType* window) const {
- return mWindow == native_handle_ptr_wrapper(window);
- }
-
- // returns true if the window was successfully added, false otherwise.
- inline bool addSharedWindow(ACameraWindowType* window) {
- auto ret = mSharedWindows.insert(window);
- return ret.second;
- }
-
- // returns the number of elements removed.
- inline size_t removeSharedWindow(ACameraWindowType* window) {
- return mSharedWindows.erase(window);
- }
-
- native_handle_ptr_wrapper mWindow;
- std::set<native_handle_ptr_wrapper> mSharedWindows;
- bool mIsShared;
- int mRotation = CAMERA3_STREAM_ROTATION_0;
- std::string mPhysicalCameraId;
-};
-
-
diff --git a/camera/ndk/ndk_vendor/impl/ACameraDevice.cpp b/camera/ndk/ndk_vendor/impl/ACameraDevice.cpp
index 87102e4..3325da6 100644
--- a/camera/ndk/ndk_vendor/impl/ACameraDevice.cpp
+++ b/camera/ndk/ndk_vendor/impl/ACameraDevice.cpp
@@ -26,7 +26,7 @@
#include <aidl/android/frameworks/cameraservice/device/CameraMetadata.h>
#include <aidl/android/frameworks/cameraservice/device/OutputConfiguration.h>
#include <aidl/android/frameworks/cameraservice/device/SessionConfiguration.h>
-#include <aidlcommonsupport/NativeHandle.h>
+#include <android/native_window_aidl.h>
#include <inttypes.h>
#include <map>
#include <utility>
@@ -59,6 +59,7 @@
using AidlCameraMetadata = ::aidl::android::frameworks::cameraservice::device::CameraMetadata;
using ::aidl::android::frameworks::cameraservice::device::OutputConfiguration;
using ::aidl::android::frameworks::cameraservice::device::SessionConfiguration;
+using ::aidl::android::view::Surface;
using ::ndk::ScopedAStatus;
// Static member definitions
@@ -231,8 +232,9 @@
OutputConfiguration& outputStream = sessionConfig.outputStreams[index];
outputStream.rotation = utils::convertToAidl(output.mRotation);
outputStream.windowGroupId = -1;
- outputStream.windowHandles.resize(output.mSharedWindows.size() + 1);
- outputStream.windowHandles[0] = std::move(dupToAidl(output.mWindow));
+ auto& surfaces = outputStream.surfaces;
+ surfaces.reserve(output.mSharedWindows.size() + 1);
+ surfaces.emplace_back(output.mWindow);
outputStream.physicalCameraId = output.mPhysicalCameraId;
index++;
}
@@ -298,12 +300,12 @@
OutputConfiguration outConfig;
outConfig.rotation = utils::convertToAidl(output->mRotation);
- outConfig.windowHandles.resize(output->mSharedWindows.size() + 1);
- outConfig.windowHandles[0] = std::move(dupToAidl(output->mWindow));
+ auto& surfaces = outConfig.surfaces;
+ surfaces.reserve(output->mSharedWindows.size() + 1);
+ surfaces.emplace_back(output->mWindow);
outConfig.physicalCameraId = output->mPhysicalCameraId;
- int i = 1;
for (auto& anw : output->mSharedWindows) {
- outConfig.windowHandles[i++] = std::move(dupToAidl(anw));
+ surfaces.emplace_back(anw);
}
auto remoteRet = mRemote->updateOutputConfiguration(streamId,
@@ -340,7 +342,7 @@
return ACAMERA_OK;
}
-camera_status_t CameraDevice::prepareLocked(ACameraWindowType *window) {
+camera_status_t CameraDevice::prepareLocked(ANativeWindow *window) {
camera_status_t ret = checkCameraClosedOrErrorLocked();
if (ret != ACAMERA_OK) {
return ret;
@@ -387,18 +389,19 @@
std::vector<int32_t> requestSurfaceIdxList;
for (auto& outputTarget : request->targets->mOutputs) {
- native_handle_ptr_wrapper anw = outputTarget.mWindow;
+ ANativeWindow *anw = outputTarget.mWindow;
bool found = false;
req->mSurfaceList.push_back(anw);
// lookup stream/surface ID
for (const auto& kvPair : mConfiguredOutputs) {
int streamId = kvPair.first;
const OutputConfiguration& outConfig = kvPair.second.second;
- const auto& windowHandles = outConfig.windowHandles;
- for (int surfaceId = 0; surfaceId < (int) windowHandles.size(); surfaceId++) {
+ const auto& surfaces = outConfig.surfaces;
+ for (int surfaceId = 0; surfaceId < (int) surfaces.size(); surfaceId++) {
// If two window handles point to the same native window,
// they have the same surfaces.
- if (utils::isWindowNativeHandleEqual(anw, windowHandles[surfaceId])) {
+ auto& surface = surfaces[surfaceId];
+ if (anw == surface.get()) {
found = true;
requestStreamIdxList.push_back(streamId);
requestSurfaceIdxList.push_back(surfaceId);
@@ -410,7 +413,7 @@
}
}
if (!found) {
- ALOGE("Unconfigured output target %p in capture request!", anw.mWindow);
+ ALOGE("Unconfigured output target %p in capture request!", anw);
return ACAMERA_ERROR_INVALID_PARAMETER;
}
}
@@ -470,7 +473,7 @@
}
pRequest->targets = new ACameraOutputTargets();
for (size_t i = 0; i < req->mSurfaceList.size(); i++) {
- native_handle_ptr_wrapper anw = req->mSurfaceList[i];
+ ANativeWindow *anw = req->mSurfaceList[i];
ACameraOutputTarget outputTarget(anw);
pRequest->targets->mOutputs.insert(std::move(outputTarget));
}
@@ -637,20 +640,21 @@
return ret;
}
- std::map<native_handle_ptr_wrapper, OutputConfiguration> handleToConfig;
+ std::map<ANativeWindow *, OutputConfiguration> windowToConfig;
for (const auto& outConfig : outputs->mOutputs) {
- native_handle_ptr_wrapper anw = outConfig.mWindow;
+ ANativeWindow *anw = outConfig.mWindow;
OutputConfiguration outConfigInsert;
outConfigInsert.rotation = utils::convertToAidl(outConfig.mRotation);
outConfigInsert.windowGroupId = -1;
- outConfigInsert.windowHandles.resize(outConfig.mSharedWindows.size() + 1);
- outConfigInsert.windowHandles[0] = std::move(dupToAidl(anw));
+ auto& surfaces = outConfigInsert.surfaces;
+ surfaces.reserve(outConfig.mSharedWindows.size() + 1);
+ surfaces.emplace_back(anw);
outConfigInsert.physicalCameraId = outConfig.mPhysicalCameraId;
- handleToConfig.insert({anw, std::move(outConfigInsert)});
+ windowToConfig.insert({anw, std::move(outConfigInsert)});
}
- std::set<native_handle_ptr_wrapper> addSet;
- for (auto& kvPair : handleToConfig) {
+ std::set<ANativeWindow *> addSet;
+ for (auto& kvPair : windowToConfig) {
addSet.insert(kvPair.first);
}
@@ -663,8 +667,8 @@
auto& anw = outputPair.first;
auto& configuredOutput = outputPair.second;
- auto itr = handleToConfig.find(anw);
- if (itr != handleToConfig.end() && (itr->second) == configuredOutput) {
+ auto itr = windowToConfig.find(anw);
+ if (itr != windowToConfig.end() && (itr->second) == configuredOutput) {
deleteList.push_back(streamId);
} else {
addSet.erase(anw);
@@ -714,13 +718,13 @@
// add new streams
for (const auto &anw : addSet) {
int32_t streamId;
- auto itr = handleToConfig.find(anw);
+ auto itr = windowToConfig.find(anw);
remoteRet = mRemote->createStream(itr->second, &streamId);
CHECK_TRANSACTION_AND_RET(remoteRet, "createStream()")
mConfiguredOutputs.insert(std::make_pair(streamId,
std::make_pair(anw,
std::move(itr->second))));
- handleToConfig.erase(itr);
+ windowToConfig.erase(itr);
}
AidlCameraMetadata aidlParams;
@@ -867,9 +871,9 @@
// Get the surfaces corresponding to the error stream id, go through
// them and try to match the surfaces in the corresponding
// CaptureRequest.
- const auto& errorWindowHandles =
- outputPairIt->second.second.windowHandles;
- for (const auto& errorWindowHandle : errorWindowHandles) {
+ const auto& errorSurfaces =
+ outputPairIt->second.second.surfaces;
+ for (const auto& errorSurface : errorSurfaces) {
for (const auto &requestStreamAndWindowId :
request->mCaptureRequest.streamAndWindowIds) {
// Go through the surfaces in the capture request and see which
@@ -884,12 +888,11 @@
return;
}
- const auto &requestWindowHandles =
- requestSurfacePairIt->second.second.windowHandles;
+ const auto &requestSurfaces = requestSurfacePairIt->second.second.surfaces;
+ auto& requestSurface = requestSurfaces[requestWindowId];
- if (requestWindowHandles[requestWindowId] == errorWindowHandle) {
- const native_handle_t* anw = makeFromAidl(
- requestWindowHandles[requestWindowId]);
+ if (requestSurface == errorSurface) {
+ const ANativeWindow *anw = requestSurface.get();
ALOGV("Camera %s Lost output buffer for ANW %p frame %" PRId64,
getId(), anw, frameNumber);
@@ -1085,7 +1088,7 @@
if (onWindowPrepared == nullptr) {
return;
}
- native_handle_t* anw;
+ ANativeWindow* anw;
found = msg->findPointer(kAnwKey, (void**) &anw);
if (!found) {
ALOGE("%s: Cannot find ANativeWindow: %d!", __FUNCTION__, __LINE__);
@@ -1342,10 +1345,10 @@
return;
}
- native_handle_t* anw;
+ ANativeWindow* anw;
found = msg->findPointer(kAnwKey, (void**) &anw);
if (!found) {
- ALOGE("%s: Cannot find native_handle_t!", __FUNCTION__);
+ ALOGE("%s: Cannot find ANativeWindow!", __FUNCTION__);
return;
}
@@ -1359,7 +1362,6 @@
ACaptureRequest* request = allocateACaptureRequest(requestSp, id_cstr);
(*onBufferLost)(context, session.get(), request, anw, frameNumber);
freeACaptureRequest(request);
- native_handle_delete(anw); // clean up anw as it was copied from AIDL
break;
}
}
@@ -1842,7 +1844,7 @@
return ScopedAStatus::ok();
}
// We've found the window corresponding to the surface id.
- const native_handle_t *anw = it->second.first.mWindow;
+ const ANativeWindow *anw = it->second.first;
sp<AMessage> msg = new AMessage(kWhatPreparedCb, dev->mHandler);
msg->setPointer(kContextKey, session->mPreparedCb.context);
msg->setPointer(kAnwKey, (void *)anw);
diff --git a/camera/ndk/ndk_vendor/impl/ACameraDevice.h b/camera/ndk/ndk_vendor/impl/ACameraDevice.h
index 6e0c772..b771d47 100644
--- a/camera/ndk/ndk_vendor/impl/ACameraDevice.h
+++ b/camera/ndk/ndk_vendor/impl/ACameraDevice.h
@@ -66,7 +66,6 @@
using ::aidl::android::frameworks::cameraservice::service::CameraStatusAndId;
using ::aidl::android::hardware::common::fmq::SynchronizedReadWrite;
using ::android::AidlMessageQueue;
-using ::android::acam::utils::native_handle_ptr_wrapper;
using ResultMetadataQueue = AidlMessageQueue<int8_t, SynchronizedReadWrite>;
@@ -197,7 +196,7 @@
camera_status_t updateOutputConfigurationLocked(ACaptureSessionOutput *output);
- camera_status_t prepareLocked(ACameraWindowType *window);
+ camera_status_t prepareLocked(ANativeWindow *window);
// Since this writes to ICameraDeviceUser's fmq, clients must take care that:
// a) This function is called serially.
@@ -236,7 +235,7 @@
// stream id -> pair of (ACameraWindowType* from application, OutputConfiguration used for
// camera service)
- std::map<int, std::pair<native_handle_ptr_wrapper, OutputConfiguration>> mConfiguredOutputs;
+ std::map<int, std::pair<ANativeWindow *, OutputConfiguration>> mConfiguredOutputs;
// TODO: maybe a bool will suffice for synchronous implementation?
std::atomic_bool mClosing;
diff --git a/camera/ndk/ndk_vendor/impl/ACaptureRequestVendor.h b/camera/ndk/ndk_vendor/impl/ACaptureRequestVendor.h
deleted file mode 100644
index fcb7e34..0000000
--- a/camera/ndk/ndk_vendor/impl/ACaptureRequestVendor.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "utils.h"
-
-using ::android::acam::utils::native_handle_ptr_wrapper;
-struct ACameraOutputTarget {
- explicit ACameraOutputTarget(const native_handle_t* window) : mWindow(window) {};
-
- bool operator == (const ACameraOutputTarget& other) const {
- return mWindow == other.mWindow;
- }
- bool operator != (const ACameraOutputTarget& other) const {
- return mWindow != other.mWindow;
- }
- bool operator < (const ACameraOutputTarget& other) const {
- return mWindow < other.mWindow;
- }
- bool operator > (const ACameraOutputTarget& other) const {
- return mWindow > other.mWindow;
- }
-
- native_handle_ptr_wrapper mWindow;
-};
diff --git a/camera/ndk/ndk_vendor/impl/utils.cpp b/camera/ndk/ndk_vendor/impl/utils.cpp
index 73a527b..3971c73 100644
--- a/camera/ndk/ndk_vendor/impl/utils.cpp
+++ b/camera/ndk/ndk_vendor/impl/utils.cpp
@@ -18,7 +18,6 @@
#include "utils.h"
-#include <aidlcommonsupport/NativeHandle.h>
#include <utils/Log.h>
namespace android {
@@ -138,51 +137,6 @@
return ret;
}
-bool isWindowNativeHandleEqual(const native_handle_t *nh1, const native_handle_t *nh2) {
- if (nh1->numFds !=0 || nh2->numFds !=0) {
- ALOGE("Invalid window native handles being compared");
- return false;
- }
- if (nh1->version != nh2->version || nh1->numFds != nh2->numFds ||
- nh1->numInts != nh2->numInts) {
- return false;
- }
- for (int i = 0; i < nh1->numInts; i++) {
- if(nh1->data[i] != nh2->data[i]) {
- return false;
- }
- }
- return true;
-}
-
-bool isWindowNativeHandleEqual(const native_handle_t *nh1,
- const aidl::android::hardware::common::NativeHandle& nh2) {
- native_handle_t* tempNh = makeFromAidl(nh2);
- bool equal = isWindowNativeHandleEqual(nh1, tempNh);
- native_handle_delete(tempNh);
- return equal;
-}
-
-bool isWindowNativeHandleLessThan(const native_handle_t *nh1, const native_handle_t *nh2) {
- if (isWindowNativeHandleEqual(nh1, nh2)) {
- return false;
- }
- if (nh1->numInts != nh2->numInts) {
- return nh1->numInts < nh2->numInts;
- }
-
- for (int i = 0; i < nh1->numInts; i++) {
- if (nh1->data[i] != nh2->data[i]) {
- return nh1->data[i] < nh2->data[i];
- }
- }
- return false;
-}
-
-bool isWindowNativeHandleGreaterThan(const native_handle_t *nh1, const native_handle_t *nh2) {
- return !isWindowNativeHandleLessThan(nh1, nh2) && !isWindowNativeHandleEqual(nh1, nh2);
-}
-
} // namespace utils
} // namespace acam
} // namespace android
diff --git a/camera/ndk/ndk_vendor/impl/utils.h b/camera/ndk/ndk_vendor/impl/utils.h
index 7ad74ad..d0dd2fc 100644
--- a/camera/ndk/ndk_vendor/impl/utils.h
+++ b/camera/ndk/ndk_vendor/impl/utils.h
@@ -38,53 +38,14 @@
using ::aidl::android::frameworks::cameraservice::device::OutputConfiguration;
using ::aidl::android::frameworks::cameraservice::device::PhysicalCameraSettings;
using ::aidl::android::frameworks::cameraservice::device::TemplateId;
-using ::aidl::android::hardware::common::NativeHandle;
using ::android::hardware::camera::common::V1_0::helper::CameraMetadata;
using AidlCameraMetadata = ::aidl::android::frameworks::cameraservice::device::CameraMetadata;
using AidlCaptureRequest = ::aidl::android::frameworks::cameraservice::device::CaptureRequest;
-bool isWindowNativeHandleEqual(const native_handle_t *nh1, const native_handle_t *nh2);
-
-bool isWindowNativeHandleEqual(const native_handle_t* nh1, const NativeHandle& nh2);
-
-bool isWindowNativeHandleLessThan(const native_handle_t *nh1, const native_handle_t *nh2);
-
-// Convenience wrapper over isWindowNativeHandleLessThan and isWindowNativeHandleEqual
-bool isWindowNativeHandleGreaterThan(const native_handle_t *nh1, const native_handle_t *nh2);
-
-// Utility class so the native_handle_t can be compared with its contents instead
-// of just raw pointer comparisons.
-struct native_handle_ptr_wrapper {
- const native_handle_t *mWindow = nullptr;
-
- native_handle_ptr_wrapper(const native_handle_t *nh) : mWindow(nh) { }
-
- native_handle_ptr_wrapper() = default;
-
- operator const native_handle_t *() const { return mWindow; }
-
- bool operator ==(const native_handle_ptr_wrapper other) const {
- return isWindowNativeHandleEqual(mWindow, other.mWindow);
- }
-
- bool operator != (const native_handle_ptr_wrapper& other) const {
- return !isWindowNativeHandleEqual(mWindow, other.mWindow);
- }
-
- bool operator < (const native_handle_ptr_wrapper& other) const {
- return isWindowNativeHandleLessThan(mWindow, other.mWindow);
- }
-
- bool operator > (const native_handle_ptr_wrapper& other) const {
- return !isWindowNativeHandleGreaterThan(mWindow, other.mWindow);
- }
-
-};
-
// Utility class so that CaptureRequest can be stored by sp<>
struct CaptureRequest: public RefBase {
AidlCaptureRequest mCaptureRequest;
- std::vector<native_handle_ptr_wrapper> mSurfaceList;
+ std::vector<ANativeWindow *> mSurfaceList;
// Physical camera settings metadata is stored here, as the capture request
// might not contain it. That's since, fmq might have consumed it.
std::vector<PhysicalCameraSettings> mPhysicalCameraSettings;
diff --git a/camera/ndk/ndk_vendor/tests/AImageReaderVendorTest.cpp b/camera/ndk/ndk_vendor/tests/AImageReaderVendorTest.cpp
index 74c6cad..0259359 100644
--- a/camera/ndk/ndk_vendor/tests/AImageReaderVendorTest.cpp
+++ b/camera/ndk/ndk_vendor/tests/AImageReaderVendorTest.cpp
@@ -31,8 +31,6 @@
#include <stdio.h>
#include <android/log.h>
-#include <android/hidl/manager/1.2/IServiceManager.h>
-#include <android/hidl/token/1.0/ITokenManager.h>
#include <camera/NdkCameraError.h>
#include <camera/NdkCameraManager.h>
#include <camera/NdkCameraDevice.h>
@@ -40,7 +38,6 @@
#include <hidl/ServiceManagement.h>
#include <media/NdkImage.h>
#include <media/NdkImageReader.h>
-#include <cutils/native_handle.h>
#include <VendorTagDescriptor.h>
namespace {
@@ -53,9 +50,7 @@
static constexpr int kTestImageFormat = AIMAGE_FORMAT_YUV_420_888;
using android::hardware::camera::common::V1_0::helper::VendorTagDescriptorCache;
-using android::hidl::manager::V1_0::IServiceManager;
-using android::hidl::token::V1_0::ITokenManager;
-using ConfiguredWindows = std::set<const native_handle_t *>;
+using ConfiguredWindows = std::set<ANativeWindow*>;
class CameraHelper {
public:
@@ -65,11 +60,11 @@
struct PhysicalImgReaderInfo {
const char* physicalCameraId;
- const native_handle_t* anw;
+ ANativeWindow* anw;
};
// Retaining the error code in case the caller needs to analyze it.
- std::variant<int, ConfiguredWindows> initCamera(const native_handle_t* imgReaderAnw,
+ std::variant<int, ConfiguredWindows> initCamera(ANativeWindow* imgReaderAnw,
const std::vector<PhysicalImgReaderInfo>& physicalImgReaders,
bool usePhysicalSettings, bool prepareWindows = false) {
ConfiguredWindows configuredWindows;
@@ -109,7 +104,7 @@
}
configuredWindows.insert(mImgReaderAnw);
std::vector<const char*> idPointerList;
- std::set<const native_handle_t*> physicalStreamMap;
+ std::set<ANativeWindow*> physicalStreamMap;
for (auto& physicalStream : physicalImgReaders) {
ACaptureSessionOutput* sessionOutput = nullptr;
ret = ACaptureSessionPhysicalOutput_create(physicalStream.anw,
@@ -301,7 +296,7 @@
private:
- static void onPreparedCb(void* obj, ACameraWindowType *anw, ACameraCaptureSession *session) {
+ static void onPreparedCb(void* obj, ANativeWindow *anw, ACameraCaptureSession *session) {
CameraHelper* thiz = reinterpret_cast<CameraHelper*>(obj);
thiz->handlePrepared(anw, session);
}
@@ -317,7 +312,7 @@
return ret;
}
- void handlePrepared(ACameraWindowType *anw, ACameraCaptureSession *session) {
+ void handlePrepared(ANativeWindow *anw, ACameraCaptureSession *session) {
// Reduce the pending prepared count of anw by 1. If count is 0, remove the key.
std::lock_guard<std::mutex> lock(mMutex);
if (session != mSession) {
@@ -334,7 +329,7 @@
mPendingPreparedCbs.erase(anw);
}
}
- void incPendingPrepared(ACameraWindowType *anw) {
+ void incPendingPrepared(ANativeWindow *anw) {
std::lock_guard<std::mutex> lock(mMutex);
if ((mPendingPreparedCbs.find(anw) == mPendingPreparedCbs.end())) {
mPendingPreparedCbs[anw] = 1;
@@ -344,13 +339,13 @@
}
// ANW -> pending prepared callbacks
- std::unordered_map<ACameraWindowType *, int> mPendingPreparedCbs;
+ std::unordered_map<ANativeWindow*, int> mPendingPreparedCbs;
ACameraDevice_StateCallbacks mDeviceCb{this, nullptr, nullptr};
ACameraCaptureSession_stateCallbacks mSessionCb{ this, nullptr, nullptr, nullptr};
ACameraCaptureSession_prepareCallback mPreparedCb = &onPreparedCb;
- const native_handle_t* mImgReaderAnw = nullptr; // not owned by us.
+ ANativeWindow* mImgReaderAnw = nullptr; // not owned by us.
// Camera device
ACameraDevice* mDevice = nullptr;
@@ -484,7 +479,7 @@
~ImageReaderTestCase() {
if (mImgReaderAnw) {
AImageReader_delete(mImgReader);
- // No need to call native_handle_t_release on imageReaderAnw
+ // No need to call AImageReader_release(mImgReaderAnw).
}
}
@@ -514,17 +509,18 @@
return ret;
}
- ret = AImageReader_getWindowNativeHandle(mImgReader, &mImgReaderAnw);
+
+ ret = AImageReader_getWindow(mImgReader, &mImgReaderAnw);
if (ret != AMEDIA_OK || mImgReaderAnw == nullptr) {
- ALOGE("Failed to get native_handle_t from AImageReader, ret=%d, mImgReaderAnw=%p.", ret,
- mImgReaderAnw);
+ ALOGE("Failed to get ANativeWindow* from AImageReader, ret=%d, mImgReader=%p.", ret,
+ mImgReader);
return -1;
}
return 0;
}
- const native_handle_t* getNativeWindow() { return mImgReaderAnw; }
+ ANativeWindow* getNativeWindow() { return mImgReaderAnw; }
int getAcquiredImageCount() {
std::lock_guard<std::mutex> lock(mMutex);
@@ -657,7 +653,7 @@
int mAcquiredImageCount{0};
AImageReader* mImgReader = nullptr;
- native_handle_t* mImgReaderAnw = nullptr;
+ ANativeWindow* mImgReaderAnw = nullptr;
AImageReader_ImageListener mReaderAvailableCb{this, onImageAvailable};
AImageReader_BufferRemovedListener mReaderDetachedCb{this, onBufferRemoved};
@@ -985,20 +981,12 @@
-TEST_F(AImageReaderVendorTest, CreateWindowNativeHandle) {
- auto transport = android::hardware::defaultServiceManager()->getTransport(ITokenManager::descriptor, "default");
- if (transport.isOk() && transport == IServiceManager::Transport::EMPTY) {
- GTEST_SKIP() << "This device no longer supports AImageReader_getWindowNativeHandle";
- }
+TEST_F(AImageReaderVendorTest, CreateANativeWindow) {
testBasicTakePictures(/*prepareSurfaces*/ false);
testBasicTakePictures(/*prepareSurfaces*/ true);
}
TEST_F(AImageReaderVendorTest, LogicalCameraPhysicalStream) {
- auto transport = android::hardware::defaultServiceManager()->getTransport(ITokenManager::descriptor, "default");
- if (transport.isOk() && transport == IServiceManager::Transport::EMPTY) {
- GTEST_SKIP() << "This device no longer supports AImageReader_getWindowNativeHandle";
- }
for (auto & v2 : {true, false}) {
testLogicalCameraPhysicalStream(false/*usePhysicalSettings*/, v2);
testLogicalCameraPhysicalStream(true/*usePhysicalSettings*/, v2);