summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-20Merge cherrypicks of [12416577, 12417143, 12417185, 12417186, 12417187, ↵android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid-build-team Robot
12417188, 12416815, 12417147, 12417003, 12417004, 12417005, 12417006, 12417007, 12417008, 12417009, 12417055, 12415658, 12416578, 12417056, 12417057, 12417103, 12417104, 12417189, 12417033, 12417034, 12417190, 12417191, 12417192, 12417193, 12417058, 12417059, 12417060, 12417061, 12417202, 12417072, 12417073] into rvc-d1-release Change-Id: I33fb968012319d49f697fc5b55cea352f3d56c90
2020-08-20camera: Add error handling prevent native crashJustin Hou
Bug: 165021679 Test: CTS, ITS, GCH unit tests Change-Id: I40f9cdd41f56631ee21603b288aae29147272135 (cherry picked from commit f79e434d664217e9273e71dc0bf5ca79dfb8f005)
2020-08-11Merge cherrypicks of [12350857, 12350967, 12350494, 12350813, 12350814, ↵android-build-team Robot
12350816, 12350695, 12350858, 12350984, 12350985, 12350908, 12350696, 12350697, 12350909, 12350859, 12350860, 12350861, 12350910, 12350564, 12351002, 12350817] into rvc-d1-release Change-Id: I4ae1dc41d5f54f77a729b0f7ebe9f1a5c0879bc5
2020-08-11camera: Add kSessionDataKeyEisFrameDelayIntPtr in session dataErik Cheng
Bug: 162715137 Test: GCA, CTS, ITS Change-Id: I5348f68f72e28bf7618eaf06f2f245f58877b27d (cherry picked from commit 417d4d148904dd3d865ea6ff439f2d0f43e45294)
2020-08-06Snap for 6740172 from 46657cd7708d8f1c6e75682c7e7863076a7dea17 to rvc-d1-releaseandroid-build-team Robot
Change-Id: I03ffb469df588719d804bb34a0a5b4b950356332
2020-08-04Camera: add trace for request bufferkocolin
Add trace tag to monitor time cost of request buffer Bug: 162802569 Test: GCA, devcam Change-Id: Iad01e8a70507c5260da17302c355d5017db4a7b6
2020-08-01Snap for 6727597 from 9e9a40e0cd82a47c124886e4f31436b0faad1e2d to rvc-d1-releaseandroid-build-team Robot
Change-Id: Id6b251d3235812b2fe03a713e0344a0542394be5
2020-07-31Merge "camera: Support stream configuration set to RT thread" into rvc-d1-devTreeHugger Robot
2020-07-31Snap for 6723917 from 6c7dba227b49c0c2bb10a31a5c9a58d59c916724 to rvc-d1-releaseandroid-build-team Robot
Change-Id: I8a94e46d713f4d2001abc6bc1c9708b46de7550f
2020-07-30camera: Support stream configuration set to RT threadvincechiu
Set thread to RT before configure stream and rollback after finish stream configuration. Test: GCA Bug: 162353145 Change-Id: Id40d9977179571423c9af60b4e82e9f72eca9c07
2020-07-30Camera: Preload capture session librarykocolin
Pre-load the library after the device boot up instead of load/release it every time open/close camera to avoid long loading time when memory pressure. Bug: 161650087 Test: camera_checklist Change-Id: Iace407e8486cfd485175a787b96c64b75e5c5f93
2020-07-22Snap for 6698401 from 37162fb4ff78efd4e0417d0c1ebae503e73878ba to rvc-d1-releaseandroid-build-team Robot
Change-Id: I4faacd5595f2c22251565912b6dab06eb1117242
2020-07-21use mallopt(M_DECAY_TIME, 1) for camera HALTim Murray
saves 5%+ of all cycles in camera HAL Test: simpleperf of camera HAL Bug: 160883639 Change-Id: I7d57c21fd7423453dba923b2b88f06b2dab4ad44
2020-07-16Snap for 6683785 from 35f27ff6f6d3b261eba78568c34f25138e4fe402 to rvc-d1-releaseandroid-build-team Robot
Change-Id: Id2052b913c8514d246b8ec1ee5d140bb99dda4d3
2020-07-15Merge "camera: Support realtime thread Add property to support RT thread for ↵TreeHugger Robot
BufferCacheManager and GCH ResultDispatcher." into rvc-d1-dev
2020-07-15camera: fallback realtime pipeline capture when AE_ON_AUTO_FLASH and am: ↵JimiChen
3af4327697 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/camera/+/12139563 Change-Id: I7991fc2ef816fd5e0416bb38022ed8371659c6a0
2020-07-15camera: fallback realtime pipeline capture when AE_ON_AUTO_FLASH andandroid11-devJimiChen
flash fired Bug: 147208294 Bug: 160556402 Test: cts, whatsapp, skype Change-Id: I10043ee2456b16e129be80ad3f40180aef2fa530 (cherry picked from commit 9df713161def7e81b69c29b0b02b067762c442b3)
2020-07-14camera: Support realtime threadvincechiu
Add property to support RT thread for BufferCacheManager and GCH ResultDispatcher. Test: GCA Bug: 160757325 Bug: 160468481 Change-Id: I825fd29db442963f83300253e86f5effdad025d3
2020-06-30Snap for 6639677 from b0f83a476327493d0837a2392f8c7f694746e20a to rvc-d1-releaseandroid-build-team Robot
Change-Id: Icb3aee96043301053702e16d915c0d27da256dde
2020-06-29Merge "hidl: Allow more error types to propagate from hal to fwk" into ↵Ellie Yang
rvc-d1-dev
2020-06-26Snap for 6630029 from 00b34b84295b116730baceded947509507f14228 to rvc-d1-releaseandroid-build-team Robot
Change-Id: Ic353085d1bf6ba9b1c55b9c94d30953e70dd5f22
2020-06-25Merge "Allow getConcurrentStreamingCameraIds to advertise depth only ↵TreeHugger Robot
cameras." into rvc-dev am: 12b57f330a Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/camera/+/11962792 Change-Id: Ie70b64c0cff1e874160eb09ce959c82597d50a83
2020-06-24Merge "Allow getConcurrentStreamingCameraIds to advertise depth only ↵TreeHugger Robot
cameras." into rvc-dev
2020-06-24Snap for 6621721 from 80d66134a22a78091235bd6e40e01fefdb18b8ab to rvc-d1-releaseandroid-build-team Robot
Change-Id: I52e160e7e19acdd12c2a1f9f2ee047d4202d7e45
2020-06-23Allow getConcurrentStreamingCameraIds to advertise depth only cameras.Jayant Chowdhary
Also fix SupportsMandatoryStreamCombination check Bug: 159247271 Test: atest ConcurrentCameraTest.java Change-Id: I5cb1ee3a7b9106c29ad9558ab8f4f2b68e946efb Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-06-23camera: Fix halConfiguration parameters back to frameworks am: ddbeab7bd5vincechiu
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/camera/+/11949284 Change-Id: Icffe363670c1248b1a579df0a256b624e8a3d8ef
2020-06-22camera: Fix halConfiguration parameters back to frameworksvincechiu
Purge the hal_configured_streams only framework streams are left as defined spec. https://android.googlesource.com/platform/hardware/interfaces/+/master/camera/device/3.5/ICameraDeviceSession.hal This is to fix CameraHidlTest#configureStreamsPreviewStillOutputs. Cherrypick from ag/10029434 Bug: 159413657 Test: GCA, CTS Change-Id: I096d4474d966e50293dde211aba4d7edcf33a3a4
2020-06-19hidl: Allow more error types to propagate from hal to fwkEllie Yang
Previously in the map converting hal status to hidl status, BAD_VALUE and ILLEGAL_ARGUMENT were the only two errors translated through. Others were all treated as INTERNAL_ERROR, which doesn't has specific implication. This makes framework unable to recognize the real error cause. Complete the status map, making it a reverse version of the status map in framework (CameraProviderManager::mapToStatusT). Bug: 152354541 Bug: 157540980 Test: CTS, GCA Change-Id: Ice93bbf7380f93b4dd9e4eb20e201c303626b896
2020-06-16Snap for 6592726 from ee0f536c8a276950fea36de6fb0780b6b321764b to rvc-d1-releaseandroid-build-team Robot
Change-Id: I3e6d30bc2df46a2f034a023ce446883b4bd77229
2020-06-15Merge "Camera: correct face point." into rvc-d1-devTreeHugger Robot
2020-06-13Snap for 6586311 from 78179c10946e6f25e45a163416ebb96449a97def to rvc-d1-releaseandroid-build-team Robot
Change-Id: I8ed054e28576c2b29b46d69444ec36a5e353993f
2020-06-12Camera: correct face point.MingChe Chiang
WHen zoom ratio is less than 1.0, the reported logical face coordinator is negative. We need to cast unsigned integer to signed integer for calculation. Bug: 156076524 Test: GCA, FD test app Change-Id: I713b5c15bc15c5ac7d1846c4dac9ccb23a73adad
2020-06-12Merge "Camera: defer the timing to free unused buffers" into rvc-d1-devTreeHugger Robot
2020-06-12Snap for 6582601 from 2424bcb187199da0d335a6987b9dd3f1692dacfc to rvc-d1-releaseandroid-build-team Robot
Change-Id: I64470412704539738b7a4ac1c2ec9c0521cff8dd
2020-06-11Camera: defer the timing to free unused buffersMingChe Chiang
To avoid frequent buffer allocation/deallocation, the unused buffers will be freed if they are no longer used after a threshold counter. Bug: 158637309 Test: GCA Change-Id: I6b0d4ceb02eec859bbff6e9fe7b02fb7fb3f9280
2020-06-11Merge "camera: add fixed-focus camera identification" into rvc-d1-devTreeHugger Robot
2020-06-09camera: add fixed-focus camera identificationchened
Test: GCA Bug: 157138779 Change-Id: I3a021777fb4d4f49c23c60b201d298b3e498b012
2020-06-06Snap for 6565930 from 9a6f0dff28d1a1f478aa7f72e957e0102a0248e6 to rvc-d1-releaseandroid-build-team Robot
Change-Id: I97c7260db7aa6087d5b3341185a5f15c72b0734d
2020-06-06Merge "camera: Add timestamp to profiler dumped fileanme." into rvc-d1-devLun-Cheng Chu
2020-06-04Snap for 6557098 from 92084c6ed634c784e58190822ad19eb5024359a3 to rvc-d1-releaseandroid-build-team Robot
Change-Id: I9d2e5de972a4e224586c5cc3915699d9b4be499a
2020-06-03Merge "camera: Add superstab mode in SmoothyMode" into rvc-d1-devTreeHugger Robot
2020-06-03camera: Add superstab mode in SmoothyModeErik Cheng
Bug: 157520630 Test: GCA Change-Id: Ia45e6e672bb32ee9ba83c09f86bd00b39e443c61
2020-06-02camera: Add timestamp to profiler dumped fileanme.Lun-Cheng Chu
Test: GCA, CTS Bug: 157265994 Change-Id: Ia9d1cb4969bcd651c3bc76525db4d08d214884c7
2020-06-03camera: Erase pending result only when publish result to FWK am: 9e688c0d8avincechiu
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/camera/+/11699059 Change-Id: Icea86fe76697764fa57bbbd5d9912a4cac3b7168
2020-06-03Merge "camera: Add capability to limit zoom ratio in HWL" into rvc-d1-devEllie Yang
2020-06-03camera: Erase pending result only when publish result to FWKvincechiu
For dummy buffer case, it will lost metadata publish if output and metadata callback at the same time. Moving the pending result erase to make sure metadata publish successfully. Bug: 155597206 Bug: 157879027 Test: GCA, CTS Change-Id: I7f81ed62f8434590e3be3e1f49f3192ed3c42813
2020-06-02camera: Add capability to limit zoom ratio in HWLEllie Yang
Framework mandate the zoom ratio range in concurrent mode to be at least [1, maxDigitalZoom]. Each project may have different capabilities and decide to extend the supported concurrent zoom ratio range up to the complete zoom range. Therefore the decision of adjusting zoom ratio regarding concurrent mode should be done in HWL. Bug: 152354541 Test: GCA, CTS Change-Id: Ieb3fa31420c9972df5afb6476374dc5965ec9567 Merged-In: Ieb3fa31420c9972df5afb6476374dc5965ec9567
2020-05-29Snap for 6538275 from b0f3e599525adf6d648e571413650dce1d42af64 to rvc-d1-releaseandroid-build-team Robot
Change-Id: Ia2d92e2761bd9ea6ff0dda897969292b9749bc70
2020-05-28Merge "camera: Publish error message properly" into rvc-dev am: 9aff439811TreeHugger Robot
Change-Id: I37c6528e664093cd947a5bca2e9efa3de698bb7d
2020-05-28Merge "camera: Reduce kBufferWaitingTimeOutSec" into rvc-dev am: 7072f6849bTreeHugger Robot
Change-Id: I0e5c9b59c5b14fd29acea25d0f49ae1e894f3598