| commit | dd0d1c0d0bc14e88438d1856c66195f921cda7b8 | [log] [tgz] |
|---|---|---|
| author | Vadim Caen <caen@google.com> | Thu Nov 28 11:24:48 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 28 11:24:48 2024 +0000 |
| tree | 6f356ad0d075fada7ccb101a2e2eecb61d9a5e8e | |
| parent | 0077bf0b72c71046bbb1b7f60b8be58c55417bb5 [diff] | |
| parent | 46aff2601eec6ff55d45599e510656cbb2e1d5b7 [diff] |
Merge "Fix producer usage in virtual camera" into main am: 46aff2601e Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3380568 Change-Id: I4f6c849911b67b81a3684540c4650a837096273f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/camera/virtualcamera/VirtualCameraSession.cc b/services/camera/virtualcamera/VirtualCameraSession.cc index 88929cc..a5921af 100644 --- a/services/camera/virtualcamera/VirtualCameraSession.cc +++ b/services/camera/virtualcamera/VirtualCameraSession.cc
@@ -189,7 +189,11 @@ } halStream.overrideDataSpace = stream.dataSpace; - halStream.producerUsage = BufferUsage::GPU_RENDER_TARGET; + halStream.producerUsage = static_cast<BufferUsage>( + static_cast<int64_t>(stream.usage) | + static_cast<int64_t>(BufferUsage::CAMERA_OUTPUT) | + static_cast<int64_t>(BufferUsage::GPU_RENDER_TARGET)); + halStream.supportOffline = false; return halStream; }