Camera: implement buffer managment API
Test: compile
Bug: 109829698
Change-Id: I3d95792282da52db9db6fd6a086bbd7b3ff9dca9
diff --git a/services/camera/libcameraservice/device3/Camera3Device.h b/services/camera/libcameraservice/device3/Camera3Device.h
index 5e749b6..7656ef3 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.h
+++ b/services/camera/libcameraservice/device3/Camera3Device.h
@@ -33,10 +33,11 @@
#include <android/hardware/camera/device/3.2/ICameraDeviceSession.h>
#include <android/hardware/camera/device/3.3/ICameraDeviceSession.h>
#include <android/hardware/camera/device/3.4/ICameraDeviceSession.h>
+#include <android/hardware/camera/device/3.5/ICameraDeviceSession.h>
#include <android/hardware/camera/device/3.2/ICameraDeviceCallback.h>
#include <android/hardware/camera/device/3.4/ICameraDeviceCallback.h>
+#include <android/hardware/camera/device/3.5/ICameraDeviceCallback.h>
#include <fmq/MessageQueue.h>
-#include <hardware/camera3.h>
#include <camera/CaptureResult.h>
@@ -50,20 +51,6 @@
using android::camera3::OutputStreamInfo;
-/**
- * Function pointer types with C calling convention to
- * use for HAL callback functions.
- */
-extern "C" {
- typedef void (callbacks_process_capture_result_t)(
- const struct camera3_callback_ops *,
- const camera3_capture_result_t *);
-
- typedef void (callbacks_notify_t)(
- const struct camera3_callback_ops *,
- const camera3_notify_msg_t *);
-}
-
namespace android {
namespace camera3 {
@@ -80,8 +67,7 @@
*/
class Camera3Device :
public CameraDeviceBase,
- virtual public hardware::camera::device::V3_4::ICameraDeviceCallback,
- private camera3_callback_ops {
+ virtual public hardware::camera::device::V3_5::ICameraDeviceCallback {
public:
explicit Camera3Device(const String8& id);
@@ -299,14 +285,25 @@
status_t dump(int fd);
status_t close();
+ // method to extract buffer's unique ID
+ // return pair of (newlySeenBuffer?, bufferId)
+ std::pair<bool, uint64_t> getBufferId(const buffer_handle_t& buf, int streamId);
+
// Find a buffer_handle_t based on frame number and stream ID
status_t popInflightBuffer(int32_t frameNumber, int32_t streamId,
/*out*/ buffer_handle_t **buffer);
+ // Register a bufId/buffer_handle_t to inflight request buffer
+ status_t pushInflightRequestBuffer(uint64_t bufferId, buffer_handle_t* buf);
+
+ // Find a buffer_handle_t based on bufferId
+ status_t popInflightRequestBuffer(uint64_t bufferId, /*out*/ buffer_handle_t **buffer);
+
// Get a vector of (frameNumber, streamId) pair of currently inflight
// buffers
void getInflightBufferKeys(std::vector<std::pair<int32_t, int32_t>>* out);
+ static const uint64_t BUFFER_ID_NO_BUFFER = 0;
private:
// Always valid
sp<hardware::camera::device::V3_2::ICameraDeviceSession> mHidlSession;
@@ -314,6 +311,8 @@
sp<hardware::camera::device::V3_3::ICameraDeviceSession> mHidlSession_3_3;
// Valid if ICameraDeviceSession is @3.4 or newer
sp<hardware::camera::device::V3_4::ICameraDeviceSession> mHidlSession_3_4;
+ // Valid if ICameraDeviceSession is @3.5 or newer
+ sp<hardware::camera::device::V3_5::ICameraDeviceSession> mHidlSession_3_5;
std::shared_ptr<RequestMetadataQueue> mRequestMetadataQueue;
@@ -365,19 +364,14 @@
// stream ID -> per stream buffer ID map
std::unordered_map<int, BufferIdMap> mBufferIdMaps;
uint64_t mNextBufferId = 1; // 0 means no buffer
- static const uint64_t BUFFER_ID_NO_BUFFER = 0;
-
- // method to extract buffer's unique ID
- // TODO: we should switch to use gralloc mapper's getBackingStore API
- // once we ran in binderized gralloc mode, but before that is ready,
- // we need to rely on the conventional buffer queue behavior where
- // buffer_handle_t's FD won't change.
- // return pair of (newlySeenBuffer?, bufferId)
- std::pair<bool, uint64_t> getBufferId(const buffer_handle_t& buf, int streamId);
virtual void onBufferFreed(int streamId, const native_handle_t* handle) override;
std::vector<std::pair<int, uint64_t>> mFreedBuffers;
+
+ // Buffers given to HAL through requestStreamBuffer API
+ std::mutex mRequestedBuffersLock;
+ std::unordered_map<uint64_t, buffer_handle_t*> mRequestedBuffers;
};
sp<HalInterface> mInterface;
@@ -483,8 +477,9 @@
/**
- * Implementation of android::hardware::camera::device::V3_4::ICameraDeviceCallback
+ * Implementation of android::hardware::camera::device::V3_5::ICameraDeviceCallback
*/
+
hardware::Return<void> processCaptureResult_3_4(
const hardware::hidl_vec<
hardware::camera::device::V3_4::CaptureResult>& results) override;
@@ -495,6 +490,15 @@
const hardware::hidl_vec<
hardware::camera::device::V3_2::NotifyMsg>& msgs) override;
+ hardware::Return<void> requestStreamBuffers(
+ const hardware::hidl_vec<
+ hardware::camera::device::V3_5::BufferRequest>& bufReqs,
+ requestStreamBuffers_cb _hidl_cb) override;
+
+ hardware::Return<void> returnStreamBuffers(
+ const hardware::hidl_vec<
+ hardware::camera::device::V3_2::StreamBuffer>& buffers) override;
+
// Handle one capture result. Assume that mProcessCaptureResultLock is held.
void processOneCaptureResultLocked(
const hardware::camera::device::V3_2::CaptureResult& result,
@@ -702,7 +706,9 @@
RequestThread(wp<Camera3Device> parent,
sp<camera3::StatusTracker> statusTracker,
- sp<HalInterface> interface, const Vector<int32_t>& sessionParamKeys);
+ sp<HalInterface> interface,
+ const Vector<int32_t>& sessionParamKeys,
+ bool useHalBufManager);
~RequestThread();
void setNotificationListener(wp<NotificationListener> listener);
@@ -937,6 +943,8 @@
Vector<int32_t> mSessionParamKeys;
CameraMetadata mLatestSessionParams;
+
+ const bool mUseHalBufManager;
};
sp<RequestThread> mRequestThread;
@@ -1020,7 +1028,7 @@
InFlightRequest(int numBuffers, CaptureResultExtras extras, bool hasInput,
bool hasAppCallback, nsecs_t maxDuration,
- const std::set<String8>& physicalCameraIdSet, bool isStillCapture,
+ const std::set<String8>& physicalCameraIdSet, bool isStillCapture,
bool isZslCapture) :
shutterTimestamp(0),
sensorTimestamp(0),
@@ -1217,16 +1225,16 @@
// Cached last requested template id
int mLastTemplateId;
- /**
- * Static callback forwarding methods from HAL to instance
- */
- static callbacks_process_capture_result_t sProcessCaptureResult;
-
- static callbacks_notify_t sNotify;
-
// Synchronizes access to status tracker between inflight updates and disconnect.
// b/79972865
Mutex mTrackerLock;
+
+ // Whether HAL request buffers through requestStreamBuffer API
+ bool mUseHalBufManager = false;
+
+ // Lock to ensure requestStreamBuffers() callbacks are serialized
+ std::mutex mRequestBufferInterfaceLock;
+
}; // class Camera3Device
}; // namespace android