summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-12Snap for 11206181 from e0be63de6bde41af23c060ceca400c02a1782a40 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: I27346119c8f2daf5f509f35e8848dfa94896efdd
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-08Snap for 11192287 from 1f080403506f586e32b6d0fc0dcd6bd43d1c532c to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I4afde4382485fece9fb4834370b2542523da4415
2023-12-07Snap for 11186783 from 1f89b09a78e6b8b24895decb9db2ba2eb78d1761 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I357b44c946ee9291a8e74ac19b24c344e342c565
2023-12-06Snap for 11180250 from 3bdae66eeb8b4aae3f8658dbccb6df2a79c17416 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I8763a6ab4c8c2e98234e1f643bcf7f468f8d175e
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-05Snap for 11175020 from ce7f9bf6de530c21a534eb4f338ad58f085c2e4a to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I85e5ecf51321f05a1c5d2243031a0aacdae1d652
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-28Snap for 11146061 from aa41c35a88415cf0ade50debd76fa8631c72e5b7 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I395e87245cd2bcc0f0e52175fc6d8e655f8fa5e2
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-24Snap for 11139387 from aa8ebe114f6ce1182e557dd04a9cad831103b4cc to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I5b291a6757d62156c6c6002df4ce42684e763635
2023-11-23Snap for 11135477 from ac72a107de0f7523a4716eaaab13ff27b46c42ad to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ie58d0a70f71da1555baec4366c899bd36d8a955d
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-21Snap for 11124398 from eca471c866086f5aeb4880a73bca0fc493ef4b0e to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ice8f1d28277fc7807806422a051d7d831c8bb094
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-18Snap for 11117647 from 18ce69c046b6f27f78d1bf0c4c9d3d59622462a4 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I9c9a3a78757a190456353c88ae4a3a5c6012de5d
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-17Snap for 11111096 from 44a431b4807b2a2e253a60a921edb416bda4010b to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ic2b92f636cc569038b533ce5e120def9ef65a6c4
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-15Snap for 11097608 from 207e26a358917495fcddbfa57d005e0030a6140c to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Icf8bddad9a50b9d6bbc2c5ae887ecd28ee074036
2023-11-14Merge "Camera: Emulator changes to support flash control." into mainRucha Katakwar
2023-11-14Snap for 11089623 from e953a8be564ad10343d9a32eb5fbd3cdb1a9e8f3 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I2670d20cbb95862b5775f21277ae2e0fe2bb0a7f
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-10Snap for 11078623 from ed4904f5689d7490e7364613e21c69a46998cf1e to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I3ae9fc24ccdc8bcb30362ddb40efd900f5c5e4fe
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