summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2020-12-01Camera: Document behavior when zoomRatio and cropRegion conflictandroid-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38aosp-new/android11-qpr3-s1-releaseaosp-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-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-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-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-08-13Camera: Update doc to allow maxDigitalZoom to be less than maxZoomRatio am: ↵Shuzhen Wang2-12/+10
c8f279004f am: 1756cb6d8f Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12354170 Change-Id: I8b5416df8736cd86be1d31f5b218639537e09f11
2020-08-13Camera: Update doc to allow maxDigitalZoom to be less than maxZoomRatio am: ↵Shuzhen Wang2-12/+10
c8f279004f Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12354170 Change-Id: Ifbeddfac557d211226c3eda72785be9a46b642b0
2020-08-11Camera: Update doc to allow maxDigitalZoom to be less than maxZoomRatioShuzhen Wang2-12/+10
Test: Build Bug: 163634334 Change-Id: Iaafa078d55699985538ff06ecff97a2fab0dfa9a
2020-07-14Make libcamera_metadata buildable for native_bridge am: e21d858f8b am: ↵Victor Khimenko1-0/+2
2697f4ea79 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12128191 Change-Id: I50042f5bae1f0751b4c568566fbaee3c08cc7b70
2020-07-14Make libaudio_system_headers for renderscript am: 565fa696ca am: 0cce107a28Victor Khimenko1-0/+2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12128187 Change-Id: I6e918272e191a39b4f7ecead117ab13d1f0d803b
2020-07-14Make libcamera_metadata buildable for native_bridge am: e21d858f8bVictor Khimenko1-0/+2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12128191 Change-Id: Ie50f385ef6c2b8e8e03716bd101e844e81842e0c
2020-07-14Make libaudio_system_headers for renderscript am: 565fa696caVictor Khimenko1-0/+2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12128187 Change-Id: Ia24b03219c21f1430d0c21551f559b858272a02d
2020-07-11Make libcamera_metadata buildable for native_bridgeaosp-new/android11-devVictor Khimenko1-0/+2
Bug: http://b/153609531 Test: m libcamera_metadata.native_bridge Change-Id: I10a5e77d8e706f4a9e20311c45af0f6af49d7729
2020-07-10Make libaudio_system_headers for renderscriptVictor Khimenko1-0/+2
Bug: http://b/153609531 Test: use libhardware_headers in native_bridge library Change-Id: Ia6261a15c7d83ffd12ba23e94c069dab01340ad9 Merged-In: Ia6261a15c7d83ffd12ba23e94c069dab01340ad9
2020-06-21Merge "Camera: Fix documentation, scripts, and comments for insensitive ↵TreeHugger Robot6-12/+14
language." into rvc-dev am: 3742676f29 am: a062fffd5f Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11937678 Change-Id: Ic0915d238049a5fce0ded4545a34cb79bf36dca8
2020-06-21Merge "Camera: Fix documentation, scripts, and comments for insensitive ↵TreeHugger Robot6-12/+14
language." into rvc-dev am: 3742676f29 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11937678 Change-Id: I304e071e96d1c863786e17555cd8bd6e29334d5e
2020-06-21Merge "Camera: Fix documentation, scripts, and comments for insensitive ↵TreeHugger Robot6-12/+14
language." into rvc-dev
2020-06-19Camera: Update physical stream cropping behavior am: f8139f91a2 am: 0398a1d0bdShuzhen Wang2-26/+60
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11457218 Change-Id: I7aa6b79847fc3d92eb798f4173da2bd2395f2130
2020-06-19Camera: Update physical stream cropping behavior am: f8139f91a2Shuzhen Wang2-26/+60
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11457218 Change-Id: If1fb020fdbee323ed6065cbb42d6097f4255aabd
2020-06-19Camera: Fix documentation, scripts, and comments for insensitive language.Eino-Ville Talvala6-12/+14
Test: Builds Bug: 159480149 Change-Id: I04e8299edf42e56ca8720da2a9dca420a27b5472
2020-06-18Camera: Update physical stream cropping behaviorShuzhen Wang2-26/+60
Allow physical stream's field-of-view to be larger than that of the logical stream. Test: Build Bug: 155393103 Bug: 153583897 Bug: 157676445 Bug: 157138779 Change-Id: Ife0587e35b3495da92a96ce6dbd01ebc1033e68a
2020-06-05Camera: Fix python and binary check command am: 2687a33a24 am: 930964fef9Shuzhen Wang1-2/+2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11761454 Change-Id: I3e115562ea02e1005e3041b7b201d24bdace75cd
2020-06-05Camera: Fix python and binary check command am: 2687a33a24Shuzhen Wang1-2/+2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11761454 Change-Id: Icaca01841e732f1858e7266eb4d1a8ea40033ee4
2020-06-05Camera: Fix python and binary check commandShuzhen Wang1-2/+2
Need to have proper package name in case they need to be installed Test: ./metadata-generate Bug: 158321682 Change-Id: I620eeaf2008f5c5b19b34a28bf8db3bbb5e234d0
2020-06-03Merge "spdif: fix possible buffer overflow" into qt-dev am: 31759bef66 am: ↵TreeHugger Robot4-11/+31
4e58bb55b1 am: c7eea4d86b am: e00bb4ffc4 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11445945 Change-Id: I1549905c7f5f0f9ef221e04be39c2ecf1c3203ec
2020-06-03audio_utils: test SPDIFEncoder am: 4523a5863f am: 2f1344bf78 am: 30a601b839 ↵Phil Burk2-0/+169
am: a1893a61d7 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11445944 Change-Id: Ib390f10d7e2971b686f6e4b8676d2d5c1ee016a5
2020-06-03Merge "spdif: fix possible buffer overflow" into qt-dev am: 31759bef66 am: ↵TreeHugger Robot4-11/+31
4e58bb55b1 am: c7eea4d86b Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11445945 Change-Id: I021e40197bc40631c3f88a89c4dbf6b48eedc584
2020-06-03audio_utils: test SPDIFEncoder am: 4523a5863f am: 2f1344bf78 am: 30a601b839Phil Burk2-0/+169
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/11445944 Change-Id: Ia4dc4b713a68bbd4a290d8413cec76e77d299b21