summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-11-10Snap for 7901677 from 0eda84b494946ed821aab3c6488ed022c47576f3 to ↵android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r3android-platform-12.0.0_r2aosp-new/android12-platform-releaseAndroid Build Coastguard Worker4-68/+68
sc-platform-release Change-Id: I162dda2a076d2b83c4c552bb1c8a75d4712528a8
2021-11-08Merge commit '16d11eb73f3ecb5de6634a4c2c95d187ac6a2ab7' into sc-platform-mergeYimin Li4-68/+68
Change-Id: Iec1311868483a7d82bfe7d52c292e4cc303ef1e7
2021-09-25Snap for 7766788 from ee096d646350fa13f9fcf9f205a0f7d3f9dd0861 to ↵android-12.0.0_r28android-12.0.0_r26android-12.0.0_r16aosp-new/android12-qpr1-releaseAndroid Build Coastguard Worker4-68/+68
sc-qpr1-release Change-Id: Ic5f239eeb416e2fdfb18e5e4e8296036ecd1a136
2021-09-24Correct enum values for framework-only keys.android-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18aosp-new/android12-qpr1-d-s3-releaseaosp-new/android12-qpr1-d-s2-releaseaosp-new/android12-qpr1-d-s1-releaseaosp-new/android12-qpr1-d-releaseJayant Chowdhary4-68/+68
Interchange enum value TRUE and false for SCALER_CROP_REGION / AF / AE / AWB set keys (framework-only) in order to match the java values of these keys. Bug: 199300149 Test: Check dumpsys media.camera after some captures changing metering regions -> *_SET keys are set to TRUE. Test: gts CameraTest.java#testDigitalZoom Test: camera CTS Merged-In: Iba223e2c9e5528202a1115ec92f290334d00fe03 Change-Id: Iba223e2c9e5528202a1115ec92f290334d00fe03 Signed-off-by: Jayant Chowdhary <jchowdhary@google.com> (cherry picked from commit 28ada9c8b35563de9b19f6d8291b118840ba04f8)
2021-08-17Merge cherrypicks of [15589380, 15589521, 15589522, 15589273, 15589503, ↵android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r1android-platform-12.0.0_r1android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1LA.UM.10.9.1.r1-00300-QCS610.0LA.AU.1.4.2.r1-00500-gen3meta.0LA.AU.0.3.1.r5-00300-sa8155.0LA.AU.0.3.1.r4-03700-sa8155_gvmq.0LA.AU.0.3.1.r4-03000-sa8155_gvmq.0LA.AU.0.3.1.r3-00400-sa8155_gvmq.0LA.AU.0.3.1.r2-04700-gen3meta.0automotive-aosp.lnx.4.1.r7-relautomotive-aosp.lnx.4.1.r6-relautomotive-aosp.lnx.4.1.r4-relaosp-new/android12-tests-releaseaosp-new/android12-s5-releaseaosp-new/android12-s4-releaseaosp-new/android12-s3-releaseaosp-new/android12-s2-releaseaosp-new/android12-s1-releaseaosp-new/android12-releaseLA.UM.10.9.1.r1Android Build Coastguard Worker2-1/+7
15589504, 15589505, 15589506, 15589507, 15589508, 15589509, 15589510, 15589511, 15589274, 15589562, 15589523, 15589405, 15589406, 15589581, 15589524, 15589525, 15589526, 15589276, 15589277, 15589565, 15589566, 15589528, 15589407, 15589255, 15589516, 15589530, 15589531, 15589569, 15589258] into sc-release Change-Id: I38ce8f75a5fef3b1d2a91052affccb285e986b9a
2021-08-17camera2: Update docs to specify minimum pixel array size for ultra high ↵Jayant Chowdhary2-1/+7
resolution sensors Bug: 195987968 Test: atest ExtendCameraCharacteristicsTest.java Change-Id: I8797bce02838c51f5443fe628b25c17ac961956d Signed-off-by: Jayant Chowdhary <jchowdhary@google.com> (cherry picked from commit e66a1c26f49543400436de4c34d426264b8d7bc3)
2021-08-14Snap for 7641961 from eb3f9308710793f9568b2a3b96c467ce8c46034f to ↵Android Build Coastguard Worker2-1/+7
sc-qpr1-release Change-Id: Ifc210e8cec8d074f4a6ee4f302da2b671714cfb2
2021-08-13camera2: Update docs to specify minimum pixel array size for ultra high ↵Jayant Chowdhary2-1/+7
resolution sensors am: e66a1c26f4 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/15507533 Change-Id: Ib7a8866ae94cc0e6c8beaf567b8bb74c8513895e
2021-08-11camera2: Update docs to specify minimum pixel array size for ultra high ↵Jayant Chowdhary2-1/+7
resolution sensors Bug: 195987968 Test: atest ExtendCameraCharacteristicsTest.java Change-Id: I8797bce02838c51f5443fe628b25c17ac961956d Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2021-07-30Snap for 7595830 from 88fc2b7fdd2ea2df051dc8562ec32dcfd80fb2a8 to sc-releaseLA.AU.0.3.1.r3-00300-sa8155_gvmq.0aosp.lnx.4.0.r1-relAndroid Build Coastguard Worker12-16/+557
Change-Id: I0b97afcc5b43b0a1443bd1985714bf37268e8618
2021-07-28Merge "camera2: Add fwk-only tags set when crop / metering regions are set ↵aosp-new/android12-devJayant Chowdhary12-16/+557
by client." into sc-dev
2021-07-26camera2: Add fwk-only tags set when crop / metering regions are set by client.Jayant Chowdhary12-16/+557
Default sensor mode capture requests would have their scaler crop regions set to the default active / pre-correction array coordinate system. Cameraserver needs to correct this for max res sensor pixel mode CaptureRequests. In order to facilitate the correction, we add fwk-only tags which are set when the scaler crop region / metering regions are set by camera clients. cameraserver fixes crop / metering regions if this tag is not set. Bug: 194143991 Test: CTS Change-Id: I08573bdc61b9bc9269034f4cc924238068eabc09 Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2021-07-22Snap for 7571067 from 08a997482f23f2c0fb5047a759b1adc2d0778c7f to sc-releaseAndroid Build Coastguard Worker2-12/+39
Change-Id: I61ffc56d668710f51b0ecec76be491635150a659
2021-07-16Camera: Improve logical camera RAW capture docsShuzhen Wang2-12/+39
- Clarify raw capture behavior for logical camera with backward compatible approach and MultiResolutionImageReader. - Some logical camera devices may have identical physical cameras with different focal length. Allow such logical camera to switch physical cameras when outputing raw. Test: ZoomCaptureTest CTS test Bug: 182217158 Change-Id: I393a2129a14f001615e99a729d070bebb194d8ef
2021-07-15Snap for 7550575 from 30504dee48a5365e930fdcaf069c7f581bb93b6b to sc-releaseAndroid Build Coastguard Worker2-2/+2
Change-Id: I43e2bcc4b50db873d832c3e95a737c9a8852ec81
2021-07-13Merge "ANDROID_JPEG_MAX_SIZE: Clarify this tag is for default sensor pixel ↵Jayant Chowdhary2-2/+2
mode." into sc-dev
2021-07-12ANDROID_JPEG_MAX_SIZE: Clarify this tag is for default sensor pixel mode.Jayant Chowdhary2-2/+2
Bug: 193346383 Test: builds Change-Id: I5731dd251fda1768800d39be36266d0f9de9c79e Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2021-07-09Snap for 7533212 from bd3ad5f271e515e48c4d7249208834099b5f459b to sc-releaseAndroid Build Coastguard Worker2-116/+36
Change-Id: I9cc2794f1f3606d0de16caebb2d1840c3b667352
2021-07-07Camera: Various zoom/crop documentation changesShuzhen Wang2-116/+36
- Clarify the zoom and crop behavior in the result metadata - Fix outdated maxDigitalZoom HAL doc - Remove a section of HAL doc that's confusing when it comes to sensor crop. The cropped sensor field-of-view shouldn't need to be mapped to active array size Test: Build Bug: 191317747 Change-Id: I4a157208ff6e4e69f14b80a4eb147bb0f7834780
2021-07-03Snap for 7521311 from 796bfdc4037ce7cbdcbbb07c8c4b8e640388ef38 to sc-releaseAndroid Build Coastguard Worker1-1/+1
Change-Id: I7d0f747fb7f1bd70e192ef22dfd9fe1e72538205
2021-07-02Audio: Increase FCC limit to 12Andy Hung1-1/+1
AudioTrackTest and AudioRecordTest will automatically check higher channel counts if enabled. Tested on Focusrite Scarlett 18i20 with legacy USB HAL. Test: Clarity with 12 channels AudioTrack and effects Test: AudioTrackTest AudioRecordTest Bug: 192662969 Change-Id: Id371b3d87d734690532004c6f03438e556447127
2021-06-22Snap for 7478986 from 2be3a5bdfea00028ef1e844d7b5b35c68774f1c1 to sc-releaseandroid-build-team Robot1-1/+3
Change-Id: Icbe0be436e1e96314dcb63c0fe8799d6f4ae7cde
2021-06-21Ensure audio_utils headers are available for sdk 29Ray Essick1-1/+3
Bug: 191284781 Test: atest android.media.cts.AudioNativeTest Test: cts-tradefed -m CtsMediaTestCases -t android.media.cts.AudioNativeTest Change-Id: I7021560d11b6aef4f4690f2ee8de76ab70f7938b
2021-06-19Snap for 7473808 from 4ba716ae3abd34a41629be8170c1f778e9926afc to sc-releaseandroid-build-team Robot2-16/+40
Change-Id: I20c06a28575f5e21fa48181fa134fc7a6284657d
2021-06-17Merge "Camera: Update API and HAL doc for 1080p min JPEG size" into sc-devTreeHugger Robot2-16/+40
2021-06-16Snap for 7460608 from 003c26741057a970b0a0b886dec8232b5bdfcb06 to sc-releaseandroid-build-team Robot10-46/+105
Change-Id: I61d9c2597714cdbfa6a7123866f0126b5506a744
2021-06-15Merge "Camera: Add black test pattern mode for privacy" into sc-devTreeHugger Robot10-46/+105
2021-06-11Camera: Update API and HAL doc for 1080p min JPEG sizeShuzhen Wang2-16/+40
To maintain app compat, filter small JPEG sizes based on targetSdkLevel. This means HAL still needs to support JPEG sizes smaller than 1080p, and camera service will filter out those sizes for performance class primary cameras. Test: Build Bug: 187913092 Change-Id: Iff07059ba86cb933b3d48694359ed5f31100c557
2021-06-11Snap for 7447836 from b87b22ed6f730756f6ee2d95725308cfc6a36b7e to sc-releaseandroid-build-team Robot2-39/+101
Change-Id: I30533a0bbbe0f16589344b50701232bd488b8618
2021-06-10Audio: Alsa fixes for FCC_LIMIT for 22.2 testingAndy Hung2-39/+101
An update to alsa_utils to support up to 22.2 on USB devices. Test: Run with dedicated 20 channel USB device. Bug: 189325443 Change-Id: Idcac43fde316b83f03c4b748f18b1ece916d9085
2021-06-10Snap for 7444394 from ee395b1f5e825343b5cfd6fc8cdd1102aad1584d to sc-releaseandroid-build-team Robot2-9/+10
Change-Id: I45212b2c557cd2291f0ca5cff6fcd4efdcb52e6c
2021-06-08Audio: Add FCC_LIMIT for HAL testing of 22.2Andy Hung2-9/+10
FCC_LIMIT specifies the maximum number of channels allowed for PCM data in the mixer pipeline / HAL. Test: Compiles, Basic audio works Bug: 189325443 Change-Id: I5f288eefb4f0d29f14bdb8fbfcd5e2bbc9857a71
2021-05-27Camera: Add black test pattern mode for privacyEino-Ville Talvala10-46/+105
Add an enum value for test pattern BLACK, to be used with camera muting on devices that can't implement the full SOLID_COLOR test pattern API. Also add it to test API to make it possible to verify device behavior. To do this, redo how enum values handle visibility at the various API surfaces. It now matches how metadata entries do visibility, plus supports TestAPI. Test: Camera CTS continues to pass Bug: 189507251 Change-Id: I8e94a10affc85cffeedd7862701777cd725b40e0
2021-05-25Snap for 7394644 from ff60e613c077689703bd4d58882c08fa3991ad7f to sc-releaseandroid-build-team Robot6-55/+302
Change-Id: I65413e79f96adef58a46c451ffe891ce562f6063
2021-05-24Merge changes I69570002,Ic86454b5 into sc-devAndy Hung6-55/+302
* changes: channels: pairIdxFromChannelIdx to find pair channel channels: add channel geometry for 22.2 tests
2021-05-22Snap for 7389169 from c1e8b1d9fa0eb222baa83ca81120caf478659bc7 to sc-releaseandroid-build-team Robot1-3/+7
Change-Id: I7c7272247d1188c4578d74b265fbfa524a856357
2021-05-21channels: pairIdxFromChannelIdx to find pair channelAndy Hung2-0/+78
Test: atest channels_tests Test: atest --host channels_tests Bug: 187062102 Change-Id: I695700021cde672f80dc1e3ee57392a5d2123a72
2021-05-21channels: add channel geometry for 22.2 testsAndy Hung6-55/+224
move channels.c -> channels.cpp for code checks and efficiency. Test: atest channels_tests Test: atest balance_tests Bug: 187062102 Change-Id: Ic86454b5bfb11c20ac46dbd27c5a0658f51b7d8e
2021-05-20LC3: support VX_AUDIO_FORMAT_LC3 in audio formatGautam Manam1-3/+7
Added support for VX_AUDIO_FORMAT_LC3 to maintain backward compatibility for vendor freeze targets Bug: 187391898 CRs-Fixed: 2934167 Test: m Change-Id: I9c25205cae9825c9d5a00dd5c07b566c957f3656
2021-05-08Snap for 7347062 from 39cc3cc560ef5f2a37a214a3cd3f33138b18aa09 to sc-releaseandroid-build-team Robot4-0/+176
Change-Id: Ib8af542676b2c472d75f3cde146d53895a89b747
2021-05-07Merge "Balance: Extend handling to 22.2 audio streams" am: bdf7451c81 am: ↵Andy Hung4-0/+176
d8c847ee9c am: 007162975f Original change: https://android-review.googlesource.com/c/platform/system/media/+/1699290 Change-Id: I179561e42d43c6237dc8c2d014617590baf1d657
2021-05-07Merge "Balance: Extend handling to 22.2 audio streams" am: bdf7451c81 am: ↵Andy Hung4-0/+176
d8c847ee9c Original change: https://android-review.googlesource.com/c/platform/system/media/+/1699290 Change-Id: Ia7494bb459d7f59bf9a2273bd50ba929d69d137c
2021-05-07Merge "Balance: Extend handling to 22.2 audio streams" am: bdf7451c81Andy Hung4-0/+176
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1699290 Change-Id: Ie74684e4c385b5a792b4c3c12e23a313c00df92a
2021-05-07Merge "Balance: Extend handling to 22.2 audio streams"android-s-beta-2android-s-beta-1Andy Hung4-0/+176
2021-05-07Balance: Extend handling to 22.2 audio streamsAndy Hung4-0/+176
Test: atest balance_tests Test: atest --host balance_tests Bug: 187062102 Change-Id: I438efd32a391a812d4573cf70f23a151c3fcca99
2021-05-05Snap for 7336869 from 0311d9c497b1ae80b1343ce804de62331630ee5d to sc-releaseandroid-build-team Robot3-1/+80
Change-Id: I2b3e1357f4b6fa428af346da82ab4b92c6684cf2
2021-05-04Merge "Metadata: Add audio_metadata_byte_string_len." am: 948f14d101 am: ↵Andy Hung3-1/+80
cfb138de15 am: fa7215f61e Original change: https://android-review.googlesource.com/c/platform/system/media/+/1692727 Change-Id: I6bb85cfa89bdca41088f1b89a4338db896a29a7c
2021-05-04Merge "Metadata: Add audio_metadata_byte_string_len." am: 948f14d101 am: ↵Andy Hung3-1/+80
cfb138de15 Original change: https://android-review.googlesource.com/c/platform/system/media/+/1692727 Change-Id: Ic57f8b8950924395288fb486cb37a5e398db0fcf
2021-05-04Merge "Metadata: Add audio_metadata_byte_string_len." am: 948f14d101Andy Hung3-1/+80
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1692727 Change-Id: I97bd76b9700dc3c175f0c412e45966eb66a9db28
2021-05-04Merge "Metadata: Add audio_metadata_byte_string_len."Andy Hung3-1/+80