summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-04-07Merge "Snap for 7192656 from 2c04bfe3f12a4419f635b17058185aacf86a6607 to ↵aosp-new/android11-gsiAutomerger Merge Worker2-5/+18
rvc-platform-release am: 54eb19341a" into android11-gsi
2021-04-07Snap for 7192656 from 2c04bfe3f12a4419f635b17058185aacf86a6607 to ↵android-build-team Robot2-5/+18
rvc-platform-release am: 54eb19341a Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/13876903 Change-Id: I84429d819dc49b4223ee469650112bb8b35d4006
2021-03-15Snap for 7192656 from 2c04bfe3f12a4419f635b17058185aacf86a6607 to ↵android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5aosp-new/android11-platform-releaseandroid-build-team Robot2-5/+18
rvc-platform-release Change-Id: I7e4b6296123b29d85e1e1db0e282220bfddbb26a
2021-03-01Merge commit '257b08782222c24ae6c85cc35854cdb2757e066d' into HEADYimin Li2-5/+18
Change-Id: Iafcb151c2033b2779f4dd58a655539857b7077c0
2020-12-08Merge "Snap for 6948038 from 3d435736f5ca74ec7d4340662a4863ff319a4711 to ↵Automerger Merge Worker3-27/+47
rvc-platform-release am: 5a2ff5bc80" into android11-gsi
2020-12-08Snap for 6948038 from 3d435736f5ca74ec7d4340662a4863ff319a4711 to ↵android-build-team Robot3-27/+47
rvc-platform-release am: 5a2ff5bc80 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12979283 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic437da87b450a609bb2dbeaa4921c7b670c8b0c8
2020-12-04Snap for 7010201 from 0ca63168a46b28551b3beca0c46393d8c9907594 to ↵android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32aosp-new/android11-qpr2-releaseandroid-build-team Robot2-5/+18
rvc-qpr2-release Change-Id: Ice5aae96ec42d4ec87cf432122afb155e0afb58f
2020-12-01Camera: Document behavior when zoomRatio and cropRegion conflictandroid-11.0.0_r39android-11.0.0_r38aosp-new/android11-qpr3-releaseShuzhen Wang2-5/+18
In case zoomRatio != 1.0 and cropRegion == windowboxing, specify the camera framework behavior overriding the cropRegion with active array. Test: Build Bug: 172873869 Change-Id: If61bc1720ab502826ccbaf0b8eac36d715e2a0ea
2020-11-03Snap for 6948038 from 3d435736f5ca74ec7d4340662a4863ff319a4711 to ↵android-platform-11.0.0_r4android-platform-11.0.0_r3android-build-team Robot3-27/+47
rvc-platform-release Change-Id: I137b652a4b6346ab3890fcb0707239a0bb7d9806
2020-10-07Snap for 6890386 from 65f1d9d660df9f0b6a2fe13c007e7f915b65defa to ↵android-build-team Robot0-0/+0
rvc-qpr2-release Change-Id: Iac21e04e3a4ba7ab39f6c42a0bade0f32afe9431
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: ↵Phil Burk0-0/+0
86ca73cbd3 -s ours am: 32b99befb3 -s ours am: d7c086743a -s ours am: e8a7e84274 -s ours am: 11f5386fec -s ours am: 10b636389f -s ours am: 2652aae1f9 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 762fbb3e09 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: I6a20569487e681c8d3ba42fb29e59504370dbc2e
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: ↵Phil Burk0-0/+0
86ca73cbd3 -s ours am: 32b99befb3 -s ours am: d7c086743a -s ours am: e8a7e84274 -s ours am: 11f5386fec -s ours am: 10b636389f -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 762fbb3e09 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: I2a7aaac560ea4edfd75f68460465c91d2f7cbcbf
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: ↵Phil Burk0-0/+0
86ca73cbd3 -s ours am: 32b99befb3 -s ours am: d7c086743a -s ours am: e8a7e84274 -s ours am: 11f5386fec -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 762fbb3e09 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: Iad31bba4e8565ae64906c79ddcd4e26528372d44
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: ↵Phil Burk0-0/+0
86ca73cbd3 -s ours am: 32b99befb3 -s ours am: d7c086743a -s ours am: e8a7e84274 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 762fbb3e09 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: If32ef07e33e54160b86a866112055ff2c0d88fb6
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s ↵Phil Burk0-0/+0
ours am: 075b93f931 -s ours am: b941c1e8ff -s ours am: a61e2b8125 -s ours am: 182132e141 -s ours am: f34124922f -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 b2fe1bc25c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638669 Change-Id: Ie60157767098977e872f5f0792f5054f5035a6be
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s ↵Phil Burk0-0/+0
ours am: 075b93f931 -s ours am: b941c1e8ff -s ours am: a61e2b8125 -s ours am: 182132e141 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 b2fe1bc25c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638669 Change-Id: I4c02bae48c9da9688fe90fd6ddfe8ac2e63a2353
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: ↵Phil Burk0-0/+0
86ca73cbd3 -s ours am: 32b99befb3 -s ours am: d7c086743a -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 762fbb3e09 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: Ic9ad85d82f77fe7fee152fa6dcdf142c5b35f7d3
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -s ↵Phil Burk0-0/+0
ours am: 62a0d0409b -s ours am: 7017fb5b49 -s ours am: b2b8014ab2 -s ours am: 24730901ab -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 1f73a728ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638668 Change-Id: Idf10407adf31204ff9ea29c67c9f03d826852d17
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s ↵Phil Burk0-0/+0
ours am: 075b93f931 -s ours am: b941c1e8ff -s ours am: a61e2b8125 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 b2fe1bc25c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638669 Change-Id: I915216056ef60d9309b9b525323aa8dd6ee90356
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: ↵Phil Burk0-0/+0
86ca73cbd3 -s ours am: 32b99befb3 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 762fbb3e09 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: I620e68a998aa0a5358a5d10a39b4c06de0a6b616
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -s ↵Phil Burk0-0/+0
ours am: 62a0d0409b -s ours am: 7017fb5b49 -s ours am: b2b8014ab2 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 1f73a728ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638668 Change-Id: I430a796699ccbb3fb50d012114c183a4dc23518f
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s ↵Phil Burk0-0/+0
ours am: 075b93f931 -s ours am: b941c1e8ff -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 b2fe1bc25c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638669 Change-Id: Ie09e89cf1b3c0c4fd5efd742b95f2123b80731c7
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: ↵Phil Burk0-0/+0
86ca73cbd3 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 762fbb3e09 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: Ibaac99c33bb33784d9901c5d8666605b1246e1b6
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -s ↵Phil Burk0-0/+0
ours am: 62a0d0409b -s ours am: 7017fb5b49 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 1f73a728ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638668 Change-Id: I1d9243e7d37f935d5035f44802cd979392e1a612
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s ↵Phil Burk0-0/+0
ours am: 075b93f931 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 b2fe1bc25c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638669 Change-Id: I2603bcba0a34cce60b62617e01c4515fc0157de7
2020-10-07spdif: fix possible buffer overflow am: 1b72d76412Phil Burk4-11/+31
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: Ib1c876ecd14703497dbe8244161fedeb064be061
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s oursPhil Burk0-0/+0
am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 b2fe1bc25c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638669 Change-Id: I882a788494d98427a056892b084da17670f9e116
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -s ↵Phil Burk0-0/+0
ours am: 62a0d0409b -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 1f73a728ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638668 Change-Id: Id39acd9200e4a5ca63670ae973b55ed1802040fd
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -s oursPhil Burk0-0/+0
am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 1f73a728ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638668 Change-Id: Icf6e22440f729d66ee23af5165254af20b2b5c03
2020-10-06Merge commit '436152b543de619004ab61f6d40c39ea862c48f0' into HEADYimin Li3-27/+47
Change-Id: I4a94e3c6ad9fdb602f3ee40df26938c76b85029c
2020-09-29Snap for 6872792 from 3cf456e6b32f30ff30bf9b86453ec51d933fb4f5 to ↵android-11.0.0_r31android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18aosp-new/android11-qpr1-s2-releaseaosp-new/android11-qpr1-s1-releaseaosp-new/android11-qpr1-releaseaosp-new/android11-qpr1-d-s1-releaseaosp-new/android11-qpr1-d-releaseandroid-build-team Robot2-15/+31
rvc-qpr1-release Change-Id: Id9e440cef847b0a2fd0c91f26c7f95465e14f975
2020-09-29Camera: Clarify SCALER_CROP_REGION usage am: 3770561af1 am: 11804edf21android-11.0.0_r30aosp-new/android11-qpr1-c-releaseShuzhen Wang2-15/+31
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12585894 Change-Id: Id571c94ad22e2bd9f2f9a07c756fb501b28182f1
2020-09-29Camera: Clarify SCALER_CROP_REGION usage am: 3770561af1Shuzhen Wang2-15/+31
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12585894 Change-Id: I510670c1232c094520cc754d23fd392f40ab95c2
2020-09-24Snap for 6862191 from 266a3da6c7f5a9b30a5801bc69db098c6dfd807c to ↵android-build-team Robot1-0/+6
rvc-qpr1-release Change-Id: Ieb7fcaef8ef916af46544bb231130d909f7178bf
2020-09-23audio_utils: check for zero numBytes in SPDIFEncoderPhil Burk1-0/+6
Fuzzing revealed that it was possible to read one word past the end of the burst buffer in the SPDIF Encoder. We can avoid that corner case by checking for numBytes equal to zero. Bug: 145262423 Test: see b/145262423#53 for fuzzing test instructions Test: atest spdif_tests Test: But if that does not work, try this: Test: mmm system/media/audio_utils Test: adb push $OUT/data/nativetest64/spdif_tests/spdif_tests /system/bin/. Test: adb shell spdif_tests Change-Id: If4ea3dfbfbd1fc9a7fbe0b5dfdc549f919ac2b40 Merged-In: If4ea3dfbfbd1fc9a7fbe0b5dfdc549f919ac2b40 (cherry picked from commit a486d6d653421da2a0f548138ca45b61fecc7b5e)
2020-09-18spdif: fix possible buffer overflowPhil Burk4-11/+31
SPDIF burst buffer could overflow if given bad data. Check for frmsiz in header being too low. Prevent numeric overflow in pending bytes calculation. Prevent numeric overflow when checking for buffer overflow. Bug: 145262423 Bug: 160265164 Test: tests/spdif_tests.cpp Change-Id: Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 Merged-In: Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 (cherry picked from commit 1f73a728ef4b6d7d350c0715bdb10d59e5b5f9be)
2020-09-18spdif: fix possible buffer overflowPhil Burk4-11/+31
SPDIF burst buffer could overflow if given bad data. Check for frmsiz in header being too low. Prevent numeric overflow in pending bytes calculation. Prevent numeric overflow when checking for buffer overflow. Bug: 145262423 Bug: 160265164 Test: tests/spdif_tests.cpp Change-Id: Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 Merged-In: Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 (cherry picked from commit 1f73a728ef4b6d7d350c0715bdb10d59e5b5f9be)
2020-09-18spdif: fix possible buffer overflowPhil Burk4-11/+31
SPDIF burst buffer could overflow if given bad data. Check for frmsiz in header being too low. Prevent numeric overflow in pending bytes calculation. Prevent numeric overflow when checking for buffer overflow. Bug: 145262423 Bug: 160265164 Test: tests/spdif_tests.cpp Change-Id: Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 Merged-In: Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 (cherry picked from commit 1f73a728ef4b6d7d350c0715bdb10d59e5b5f9be)
2020-09-16Camera: Clarify SCALER_CROP_REGION usageShuzhen Wang2-15/+31
1. Document same SCALER_CROP_REGION may map to different aspect ratio/output size for different sessions. 2. Remove the text in ZOOM_RATIO about using SCALER_CROP to change aspect ratio. Test: Build and read doc Bug: 168493526 Change-Id: I11d3a5a32255d4b8a71fd89632230f3003af9959
2020-09-14Merge "Camera: Fix documentation, scripts, and comments for insensitive ↵TreeHugger Robot0-0/+0
language." into rvc-dev am: 3742676f29 am: a062fffd5f am: 3b80393a98 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11937678 Change-Id: I383e17759393895f8a8deebb90eb89c3a30b648a
2020-09-14Camera: Update physical stream cropping behavior am: f8139f91a2 am: ↵Shuzhen Wang0-0/+0
0398a1d0bd am: c2d5e2f7cd Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11457218 Change-Id: I9c2a375cccc19e2b43ed0a43a88b0b8850db2d0c
2020-09-14Camera: Fix python and binary check command am: 2687a33a24 am: 930964fef9 ↵Shuzhen Wang0-0/+0
am: e0b15e1c58 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11761454 Change-Id: Ia28c57fbdcbdf7448913d18d5e2375247ffb964a
2020-09-14[automerger skipped] Merge "spdif: fix possible buffer overflow" into qt-dev ↵TreeHugger Robot0-0/+0
am: 31759bef66 am: 4e58bb55b1 am: c7eea4d86b am: e00bb4ffc4 am: a9e7425998 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 1f73a728ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11445945 Change-Id: Ia527782fef97ca142e84867c14b8246c5c1d131a
2020-09-14[automerger skipped] audio_utils: test SPDIFEncoder am: 4523a5863f am: ↵Phil Burk0-0/+0
2f1344bf78 am: 30a601b839 am: a1893a61d7 am: f756cc507d -s ours am skip reason: Change-Id I411a9b911f5e5e7a0528f9a9bc4bcb29e0657b62 with SHA-1 4523a5863f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11445944 Change-Id: I7a2750f47e8b85bb45da23f79f13400a2ef32362
2020-09-14Merge "Camera: Update documentation for rolling shutter skew" into rvc-dev ↵Eino-Ville Talvala0-0/+0
am: 43d874ba0a am: 33335f44a3 am: e828f84776 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11444669 Change-Id: I428942b5a13bcc9ca94d7ed0d2bff652e19d3638
2020-09-14Merge "Camera: Move metadata generation scripts to python3" into rvc-dev am: ↵Eino-Ville Talvala0-0/+0
0ee5b3713c am: cb28476c8e am: 7829ef90f4 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11444668 Change-Id: I5b2e0d95595047320b3d54e2e75d33cf6e30abd6
2020-09-14Merge "Metadata: Fix comments and add test example" into rvc-dev am: ↵Andy Hung0-0/+0
2ea0ae67ce am: d13958a858 am: 8d4de3d12b Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11427231 Change-Id: Iff16464bb9052331dcf7454ee67817164ac779b8
2020-09-14Merge "Set sdk_version for libaudioutils_headers" into rvc-dev am: ↵Colin Cross0-0/+0
f65a064d28 am: 288d4a283f am: 81d9eadbd7 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11421020 Change-Id: Ie0b8bea0aecf11165eceb992dbb1a51ff54e2aa0
2020-09-14Add constants for encapsulation modes and metadata types. am: 3d8cf38893 am: ↵jiabin0-0/+0
885b2a4cdc am: 0aa3b26999 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11417926 Change-Id: I80883a8e440b524a7d062d93055630e8155b9c91
2020-09-14[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han0-0/+0
7fe723a1c2 am: 6ccc559fea am: ed8e40fe55 -s ours am skip reason: Change-Id I5294876cd4a234d157db1b83de4714de87394a47 with SHA-1 7fe723a1c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11258089 Change-Id: I93f69cb1f3c3c1defb2277276edb7f47fb282e0e