summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into ↵HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004cm-13.0Emilian Peev2018-07-161-2/+2
| | | | | | | | | | | | am-0d58d39a-0539-474e-b9c8-36cc976d15e8 * commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57': Camera: Initialize metadata padding field Test: Camera CTS Bug: 77238656 Change-Id: I6c8b3138a0e2176228180d7b1edc9f9352d0c07f (cherry picked from commit 6837fddebdc0ee6afe15517a620f754d88a3da42)
* Camera metadata: Check source metadata sizeEmilian Peev2018-01-101-0/+6
| | | | | | | | | | | | Source size passed by client could be smaller than 'camera_metadata_t'. In this case the cast in 'allocate_copy_camera_metadata_checked()' will be incorrect and we will try to access invalid heap memory. Bug: 67782345 Test: Camera CTS Change-Id: I9582c704f414493978d09ffb603b5e8368cda5ce (cherry picked from commit 489bbd13bf0add8029444b9d9505b3d118776ea3) CVE-2017-13210
* Merge tag 'android-6.0.1_r74' into HEADreplicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5YJessica Wagantall2016-11-091-0/+1
|\ | | | | | | | | | | | | | | CYNGNOS-3303 Android 6.0.1 release 74 Change-Id: Ib27588e0b38a1471aedd610a69520737bf85d8d6
| * Fix potential overflow in Visualizer effectrago2016-09-271-0/+1
| | | | | | | | | | | | | | Bug: 30229821 Change-Id: Ia07041a5a149d7d3e120aa6ea0345fb86da37c9b (cherry picked from commit b61dd321d08b21a5629044eca7f96e2ecd348e5f) (cherry picked from commit 7bbd5008747431d42e2f8cfbc0ddcb8465cdb4a5)
| * Camera metadata: Check for inconsistent data countEino-Ville Talvala2016-08-261-0/+14
| | | | | | | | | | | | | | | | Resolve Merge conflic for mnc-mr2-release Also check for overflow of data/entry count on append. Bug: 30591838 Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2
| * Camera: Prevent data size overflowChien-Yu Chen2016-08-251-14/+43
| | | | | | | | | | | | | | | | Add a function to check overflow when calculating metadata data size. Bug: 30741779 Change-Id: I6405fe608567a4f4113674050f826f305ecae030
* | Merge tag 'android-6.0.1_r72' into HEADJessica Wagantall2016-10-061-14/+57
|\ \ | | | | | | | | | | | | | | | | | | Android 6.0.1 Release 72 (M4B30X) # gpg: Signature made Tue 04 Oct 2016 09:47:48 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| * | Camera metadata: Check for inconsistent data countEino-Ville Talvala2016-08-261-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve Merge conflic for mnc-mr2-release Also check for overflow of data/entry count on append. Bug: 30591838 Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2 (cherry picked from commit 8d0a86a45af999de64805bf471b60cc7120b8076)
| * | Camera: Prevent data size overflowChien-Yu Chen2016-08-261-14/+43
| |/ | | | | | | | | | | | | | | | | Add a function to check overflow when calculating metadata data size. Bug: 30741779 Change-Id: I6405fe608567a4f4113674050f826f305ecae030 (cherry picked from commit 882db905c04b09e3ce527d265eefbb7056543c93)
* | Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-102-11/+22
|\ \ | | | | | | | | | | | | | | | https://android.googlesource.com/platform/system/media into cm-13.0 Android 6.0.1 release 22
| * \ Camera: update FPS range specYin-Chia Yeh2015-12-042-9/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | am: 30bf75b88a * commit '30bf75b88a25a49fdd388fc3c5a77ecbdede2e24': Camera: update FPS range spec
| | * | Camera: update FPS range specYin-Chia Yeh2015-11-302-9/+20
| | | | | | | | | | | | | | | | | | | | Bug: 25427163 Change-Id: Id020b051f0ee082f9883f9a73fa3ac34540c0cfc
| * | | Camera: Documentation updatesEino-Ville Talvala2015-11-122-2/+2
| |\| | | | |/ | |/| | | | | | | | | | | | | am: 04292697a7 * commit '04292697a7841d6e45e0355c9dc3ced3bbedc768': Camera: Documentation updates
| | * Camera: Documentation updatesEino-Ville Talvala2015-11-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | - Use preCorrectionActiveArray instead of activeArray for one of the possible sizes for raw outputs. Bug: 23908116 Change-Id: I5f7efb4e399f392b9442ad458335eb0b4777e35c
* | | effects: Add AUDIO_EFFECT_VENDOR_CONFIG_FILE2Steve Kondik2016-01-121-0/+5
| | | | | | | | | | | | Change-Id: I457f8bd4229062a0348e7bcc1d88e1123aac4dc8
* | | audio_utils: Fix 24-bit offload conversionsKeith Mok2016-01-051-0/+3
| | | | | | | | | | | | | | | | | | | | | * Use standard functions instead of open-coding. * Add PCM_FLOAT conversion too. Change-Id: I8890645e81edee7bfcc05e247d8a4c68fc05f697
* | | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-081-0/+6
|\| | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/system/media into HEAD Android 6.0.1 release 3
| * | fix usb audio for devices with more than 8 channelsAndy Hung2015-10-011-0/+6
| |/ | | | | | | | | | | | | | | Use the lowest 8 channels. Bug: 24468939 Change-Id: If116133ab3c902cc6d431b287058897c8e3af875 (cherry picked from commit 67c63b290460f36f7841d6f01017bb116a2a36f1)
* | audio_route: fix unsupported control types in audio_route_update_pathChristian Morlok2015-11-231-0/+1
| | | | | | | | | | | | I don't like infinite loops Change-Id: I57f1f871b572c68cf1d7adef599396a3cbb7fc5d
* | audio_route: Support BYTE type controlsScott Mertz2015-11-211-0/+48
| | | | | | | | | | | | | | - Offers limited support to set byte controls like you would any control with an id, or even without. Change-Id: I0ce97f3c8e8155c5330655072e504d1ee68177db
* | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-052-3/+31
|\ \ | | | | | | | | | Android 6.0.0 release 26
| * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-10-020-0/+0
| |\ \ | | |/ | |/|
| | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-220-0/+0
| | |\
| | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-080-0/+0
| | | |\
| | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-060-0/+0
| | | | |\
| | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-180-0/+0
| | | | | |\
| | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-150-0/+0
| | | | | | |\
| | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-140-0/+0
| | | | | | | |\
| | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-110-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-090-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-080-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| | | | | | | | | | | | |\
| * | | | | | | | | | | | | Camera: update video stabilization API doc.Jianing Wei2015-09-292-3/+31
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the video stabilization API description to specify which scenarios guarantee stabilization is performed if the control is set to ON and the static metadata supports stabilization ON. Bug: 23353979 Change-Id: I0f8662864e1c397c0a53edf11a685de2f6feb7f2
* | | | | | | | | | | | | audio: Add helper method for PCM offload formatsSteve Kondik2015-10-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie00a65ad1449c1838fd4335b7083351c59240e9c
* | | | | | | | | | | | | audio: add support for direct pcmvivek mehta2015-10-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - extend audio_offload_info and audio_config structure to support direct pcm Change-Id: Ie39c2f666e9d4ec1e1c20fdc648d8c04f0f2edce
* | | | | | | | | | | | | audio_offload: add support to set offload fragment sizeManish Dewangan2015-10-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of audio offload,add parameter to set offload fragment size. If the size passed is greater than the computed offload fragment size in HAL then use the size passed. Change-Id: I2a4c321583c70c617584b0811a10c76b1a198c08
* | | | | | | | | | | | | audio: Add support for AAC ADTS offloadManish Dewangan2015-10-061-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Add support for AAC ADTS format. -Parser sends bistream in ADTS format if configure in Byte Stream Mode Change-Id: I496faf9fb7b7742b674da52ef6f45494f5e3de88
* | | | | | | | | | | | | audio: fix duplicate value in enumeration for audio output flagsDhananjay Kumar2015-10-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Audio output flag have same enumeration for VOIP and COMPRESS_PASSTHROUGH. Update COMPRESS_PASSTHROUGH with next bitmask to resolve conflict. Change-Id: Idee4ac9f7f59fdc9b81b6c46b5df6c006acda97e
* | | | | | | | | | | | | audio: add support for extended audio featuresMingming Yin2015-10-061-7/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add extended enums for audio stream, audio source, audio format, audio channel, audio device, and audio flags Change-Id: I5b05eade71ab12b5e08e2f186d40e787a2af024a
* | | | | | | | | | | | | audio : add definition for VOIP_RX flagKarthik Reddy Katta2015-10-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define VOIP_RX flag to start voip over voice path. Change-Id: Ieee65680aebe3903a316dd2c87ade4c0b08a830c
* | | | | | | | | | | | | audio: add ALAC/APE/WMA format in audio.hSharad Sangle2015-10-061-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add ALAC/APE/ALAC as a valid audio format in audio.h add field for bit width in offload structure Change-Id: I35bba7a608f636337d4c8b4afd4cdf9fe476018a
* | | | | | | | | | | | | Nullify non-initialized entries in the mixer control structureBaruch Eruchimovitch2015-10-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While initialization process of some internal control structure, some entries can remain non-initialized. To avoid possible crash while the structure release, the non-initialized entries should be zeroed. Change-Id: I2450c9214eeb478cc57feef706d00b10c6897b60
* | | | | | | | | | | | | audio: Add flac in valid audio formatsSharad Sangle2015-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added FLAC as a valid format in audio.h Change-Id: Ief3e68c25c86f9a06314787f805785593aaf5943
* | | | | | | | | | | | | audio : Add PCM offload formatsPreetam Singh Ranawat2015-10-061-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -add 16 and 24 bit PCM offlaod formats Change-Id: Ib4229440dc362905753ef8e6444cbf0940fca885
* | | | | | | | | | | | | audio: add flac formatSharad Sangle2015-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add flac format in audio.h Change-Id: I1dfd9a7791fe82efd25f4f10ba9cf133d3b0710f
* | | | | | | | | | | | | audio_utils: Support more format conversionsPreetam Singh Ranawat2015-10-061-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support conversion from 24 bit packed PCM to 8_24 bit padded pcm. Support conversion from 8_24 bit and packed 24 bit to 24 bit offload. Change-Id: I09762c4ef4b85fe3c1a74d808f517c659b6d75f4 CRs-Fixed: 809383
* | | | | | | | | | | | | audio: Add Audio Proxy deviceYamit Mehta2015-10-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add audio proxy device for WFD and Visualiser. Change-Id: Ie35a43943b12e92172da564126d2719629c47829
* | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 14:20:37 +0000