summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
3 daysFix build with ToT libc++HEADmastermainYi Kong
hardware/google/camera/common/profiler/profiler.cc:429:21: error: no matching constructor for initialization of 'std::ofstream' (aka 'basic_ofstream<char>') 429 | if (std::ofstream fout(filepath, std::ios::out); fout.is_open()) { | ^ ~~~~~~~~~~~~~~~~~~~~~~~ Test: Build with ToT libc++ Change-Id: I31a94a467d552dfe252b571547ddebb543b7fa5b
2024-05-09Move license metadata declarations to meta-lic.mk and remove the Android.mk ↵Wei Li
file. Bug: 339706722 Test: CIs Change-Id: Id9e1ad5e49856e3eea0c95f6028a71ca109193c7
2024-04-22Merge "Migrate Test Targets to New Android Ownership Model" into mainTreehugger Robot
2024-03-08Merge "Update VmaCallbacks to return bool" into mainKevin Jeon
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: I99d371c65b5f69270b65aa52e1ec1d112cdb6b7c Change-Id: I95efad3a38fc2d9ae16c3cec072b5d7ab89f0492
2024-03-05Update VmaCallbacks to return boolKevin Jeon
A change to libmeminfo now requires that VmaCallbacks return a bool value. This updates the existing usage in camera_device.cc with a no-op 'return true'. Test: n/a Bug: 320480542 Change-Id: I1f3756a3729c90a8cef2f6159109c649e7c19b52
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: I100ca7a86f6d7b020174a57d41999bb29426f55e
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I75fddd651315b7074a5d32f13a827f8ba854e26b Change-Id: I99d371c65b5f69270b65aa52e1ec1d112cdb6b7c
2023-12-11Merge Android 14 QPR1 am: 9a0a4df0a7 am: ce9c94d94b am: 40003900edXin Li
Original change: https://android-review.googlesource.com/c/platform/hardware/google/camera/+/2865761 Change-Id: I090d2a68f10285b0e821f10f831eaef7f5ce93f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge Android 14 QPR1 am: 9a0a4df0a7 am: ce9c94d94bXin Li
Original change: https://android-review.googlesource.com/c/platform/hardware/google/camera/+/2865761 Change-Id: I07a164c24e1b794bb8894716291a90dd0e88eed9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge Android 14 QPR1 am: 9a0a4df0a7Xin Li
Original change: https://android-review.googlesource.com/c/platform/hardware/google/camera/+/2865761 Change-Id: I8dc2a1c72c7bfa9a891332c21ebc9007a8db4567 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: Bug: 315507370 Change-Id: I1ec8795d3aef1257923630c87234ef0c1ae344d5
2023-12-05EmulatedCamera: Add getSessionCharacteristics APIBharatt Kukreja
For now, return the same static metadata in SessionCharacteristics as in CameraCharacteristics. Test: Build Bug: 303645857 Change-Id: I75fddd651315b7074a5d32f13a827f8ba854e26b
2023-12-05EmulatedCamera: Bump up camera device versionShuzhen Wang
Bring EmulatedCamera HAL to latest camera device version. Test: Run FeatureCombinationTest CTS test Bug: 298033056 Change-Id: I81ef6cf8e788b71b146e1576fd7b58c9d2b0324e
2023-12-04Merge changes from topic "session-hal-buf-manager" into mainJayant Chowdhary
* changes: EmulatedCamera: Add support for session hal buffer manager GCH: Add support for ICameraDeviceSession.configureStreamsV2
2023-12-04Merge "EmulatedCamera: Populate the active physical scaler crop" into mainEmilian Peev
2023-12-04EmulatedCamera: Add support for session hal buffer managerJayant Chowdhary
The EmulatedCameraDeviceSessionHWLImpl::ShouldUseHalBufferManager() method lets GCH know if HAL buffer manager should be used for a session configured. Bug: 311263114 Test: Camera CTS with session_hal_buf_manager flag Change-Id: I1f05d15a644d9998cb7351817cc57804611b138d Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2023-12-04GCH: Add support for ICameraDeviceSession.configureStreamsV2Jayant Chowdhary
ICameraDeviceSession.configureStreamsV2 allows the HAL to inform the framework about its decision to use the HAL buffer manager per session. This is in contrast to the previous mechanism where the HAL buffer manager was either used or not used per CameraDevice. Bug: 311263114 Test: Basic validity - check that GCA works on devices not supporting session specific HAL buffer manager. Test: CTS on cuttlefish with ANDROID_INFO_SUPPORTED_BUFFER_MANAGEMENT_VERSION_SESSION_CONFIGURABLE Change-Id: I627dc5c5f071a19013b1f32b75e096783ac4694f Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2023-11-27Merge "Add log to include video_fps_throttle flag" into mainTimmy Li
2023-11-27Add log to include video_fps_throttle flagtimmyli
We should add this log to record whether video fps throttle flag is set for debugging purposes. Bug: 311324323 Test: mm Change-Id: I3aacb1887e20e309ca07ba85aae7b8f54417f8a5
2023-11-22EmulatedCamera: Populate the active physical scaler cropEmilian Peev
Add trivial support for the active physical scaler crop and the lens intrinsic samples capture results. Bug: 297083874 Test: atest VtsAidlHalCameraProvider_TargetTest Change-Id: Iee9de2529fc2a245f78913da6f238f3c55a2a741
2023-11-22Move virtual camera service to frameworks/av/servicesJan Sebechlebsky
Bug: 311647154 Bug: 301023410 Test: atest virtual_camera_tests Test: build & flash & adb shell cmd virtual_camera help Change-Id: I9a7d62430df8c56a68c7d3deafa9ae567c1b30f4
2023-11-22Merge "Revert^3 "Uncomment rc entry for virtual camera"" into mainJán Sebechlebský
2023-11-22Revert^3 "Uncomment rc entry for virtual camera"Ján Sebechlebský
This reverts commit 5c07f87fe44805d2ca510e4e3f3958e1dae838d6. Reason for revert: b/311679099 Change-Id: Ic3689bf6635960e625b115448a7a626995f6ef75
2023-11-22Merge "Revert^2 "Uncomment rc entry for virtual camera"" into mainJán Sebechlebský
2023-11-21Add onProcessCaptureRequest to IVirtualCameraCallback.Jan Sebechlebsky
Bug: 301023410 Test: atest virtual_camera_tests Change-Id: I750d3bf78b10663931141a1922ddd26fc006e10f
2023-11-20Merge "Add YCbCr_420_888 entry to camera metadata." into mainTreehugger Robot
2023-11-20Add YCbCr_420_888 entry to camera metadata.Jan Sebechlebsky
This was causing configuration attempt failure in the draft of CTS test when explicitly requiresting YCbCr_420_888 format. Bug: 301023410 Test: atest VirtualCameraTest (patched draft) Change-Id: I5dfc485e18602f585d5cf076e80d9bade6309adc
2023-11-20Revert^2 "Uncomment rc entry for virtual camera"Ján Sebechlebský
This reverts commit 31b1b1481591097758fa9830a1baa4913b2e5ca6. Reason for revert: relanding after SELinux fix. Change-Id: Id28297252985b5514267e5c0e18315430347e0e3
2023-11-17Merge "Revert "Uncomment rc entry for virtual camera"" into mainGreg Kaiser
2023-11-17Revert "Uncomment rc entry for virtual camera"Greg Kaiser
This reverts commit 13ece809d4d94abb33ce91678d025e74a44e3b07. Reason for revert: b/311647154 Bug: 311647154 Change-Id: I97c68c7158ee2e39cf99ed479113024a3a0d8821
2023-11-17Merge "Remove android.hardware.graphics.common-V5 from virtual camera aidl" ↵Biswarup Pal
into main
2023-11-17Remove android.hardware.graphics.common-V5 from virtual camera aidlBiswarup Pal
We cannot use android.hardware.graphics.common-V5 in virtual_camera service aidl as this adds duplicate classes in both services.jar and framework.jar. So, we introduce Format.aidl in virtual camera service to avoid the usage of PixelFormat.aidl (note that the native binary can still use PixelFormat). This also fixes the erroneous conversion of format from java to aidl when VDM service calls into the HAL service. Test: atest VirtualCameraControllerTest Fixes: 311349980 Change-Id: I07684b641f79c7642a499b7527b96521bb0be9c9
2023-11-17Uncomment rc entry for virtual cameraJan Sebechlebsky
... so the service can start. Bug: 301023410 Test: atest CtsVirtualDevicesTestCases CtsVirtualDevicesSensorTestCases CtsVirtualDevicesAudioTestCases CtsVirtualDevicesAppLaunchTestCases Change-Id: I9c39d6ce9bc35ee3a5ee54ec80762416b9e93198
2023-11-16Remove VINTF manifest for virtual camera.Jan Sebechlebsky
This is no longer needed, since ag/24905916 was submitted. Bug: 301023410 Test: N/A Change-Id: Ib8917f00a9e4391ac6c96ba92c4d7774ba3d223c
2023-11-16Merge "Implement flush operation for camera session." into mainJán Sebechlebský
2023-11-16Implement flush operation for camera session.Jan Sebechlebsky
Bug: 301023410 Test: atest virtual_camera_tests Change-Id: Ic10d6dfe15c2fefdf3dd980dab57c521f967e4f0
2023-11-14Merge "Camera: Emulator changes to support flash control." into mainRucha Katakwar
2023-11-13Rename virtualcamera to virtual_cameraJan Sebechlebsky
... when registering the service with service manager. Bug: 301023410 Test: atest virtual_camera_tests Test: adb shell cmd virtual_camera enable_test_camera Change-Id: If1f7c6c416b67e306ccea61cdbd562e5f624de37
2023-11-09Fix missing return in unregisterCameraJan Sebechlebsky
... and add corresponding unit test. This fixes fuzzer finding in b/309853218. Bug: 309853218 Test: atest virtual_camera_tests Change-Id: Idf36707c4bea36f9d3088d0890484d6a7edc93a2
2023-11-09Gracefully handle nullptr in shell cmd ags.Jan Sebechlebsky
This fixes fuzzer finding in b/309892789. The cl also adds missing unit test for enable_test_camera / disable_test_camera shell command. Bug: 309892789 Test: atest virtual_camera_tests Change-Id: I51a69679476ffb4932bc64f4248e9d32d399f08d
2023-11-09Merge "Revert^2 "Move rendering to dedicated thread."" into mainJán Sebechlebský
2023-11-09Revert^2 "Move rendering to dedicated thread."Ján Sebechlebský
This reverts commit cfc4361ac90b4cf08216d2726f7f8f52c4e44528. Reason for revert: Test failure fixed by ag/25312696. Change-Id: Ib9a7ca2e064bf4d2af5fb6e91e9439cfa815fe48
2023-11-09Do not try to compile texture shader when theJan Sebechlebsky
required extension is missing. This is also what cause failures on AOSP build without extesion in b/309754311. Bug: 301023410 Test: atest virtual_camera_tests Change-Id: Ia25a3cbdc7d5d3392076a860354185a65af4db1b
2023-11-08Merge "Revert "Move rendering to dedicated thread."" into mainBrett Landau
2023-11-08Revert "Move rendering to dedicated thread."Priyanka Advani
This reverts commit 439a4b8aff8072e58f7cefd382a7171b834d78f5. Reason for revert: b/309754311 Change-Id: I94422023c0c99212aa58a29440385cab10ef4dc4
2023-11-08Merge changes I608d5309,I6b26fd8b into mainJán Sebechlebský
* changes: Add fuzzer for Virtual Camera service. Remove redundant libandroid dependency.
2023-11-08Add fuzzer for Virtual Camera service.Vadim Caen
Patched & fixed from ag/25274919. Test: (Pixel6) SANITIZE_HOST=address mm virtual_camera_fuzzer && Test: adb sync data && Test: adb shell /data/fuzz/arm64/virtual_camera_fuzzer/virtual_camera_fuzzer Bug: 301023410 Change-Id: I608d5309272ee9ca4087f83d5547915ebee30a5c
2023-11-08Remove redundant libandroid dependency.Jan Sebechlebsky
This was also causing fuzzer linking issues. Bug: 301023410 Test: atest virtual_camera_tests Change-Id: I6b26fd8bfbf1a89b90ff05fce0d92171126aa3fb
2023-11-07Move rendering to dedicated thread.Jan Sebechlebsky
The cl also refactors stream management to VirtualCameraSessionContext shared between the session instance and rendering thread. Bug: 301023410 Test: atest virtual_camera_test Test: OpenCamera Change-Id: Ie8b49cef7280a06aebed372e1230bc1153d4ef2c