summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Remove dead setRingerMode(mode, mask)Glenn Kasten2012-01-182-2/+0
| | | | | | | | | | | | Change-Id: Ia4cc8be8424a40b3dcb7ebd0264fdff4e5247f7f
* | | Merge "Fix incorrect includes of AudioTrack.h"Glenn Kasten2012-01-191-1/+2
|\ \ \
| * | | Fix incorrect includes of AudioTrack.hGlenn Kasten2012-01-181-1/+2
| |/ / | | | | | | | | | | | | | | | | | | Remove unnecessary includes of AudioTrack.h. Use forward declaration of class names in preference to #include when possible. Change-Id: I12982811fa75c2c7695d8bbfa595a7aaec047dc0
* | | Temporarily restore AudioSystem/AudioTrack APIs with their former signaturesAndreas Huber2012-01-182-0/+18
|/ / | | | | | | | | | | until we get updated prebuilts from vendor. Change-Id: I8aae81d2513edca0ab268053a11c8c4206879e61
* | Merge "Track volume cleanup"Glenn Kasten2012-01-181-4/+7
|\ \
| * | Track volume cleanupGlenn Kasten2012-01-171-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always read and write track volumes atomically. In most places this was already being done, but there were a couple places where the left and right channels were read independently. Changed constant MAX_GAIN_INT to be a uint32_t instead of a float. It is always used as a uint32_t in comparisons and assignments. Use MAX_GAIN_INT in more places. Now that volume is always accessed atomically, removed the union and alias for uint16_t volume[2], and kept only volumeLR. Removed volatile as it's meaningless. In AudioFlinger, clamp the track volumes read from shared memory before applying master and stream volume. Change-Id: If65e2b27e5bc3db5bf75540479843041b58433f0
* | | Merge "audio framework: manage stream volume per device"Eric Laurent2012-01-172-4/+12
|\ \ \ | |/ / |/| |
| * | audio framework: manage stream volume per deviceEric Laurent2012-01-172-4/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve volume management by keeping track of volume for each type of device independently. Volume for each stream (MUSIC, RINGTONE, VOICE_CALL...) is now maintained per device. The main changes are: - AudioService now keeps tracks of stream volumes per device: volume indexes are kept in a HashMap < device , index>. active device is queried from policy manager when a volume change request is received initalization, mute and unmute happen on all device simultaneously - Settings: suffixes is added to volume keys to store each device volume independently. - AudioSystem/AudioPolicyService/AudioPolicyInterface: added a device argument to setStreamVolumeIndex() and getStreamVolumeIndex() to address each device independently. - AudioPolicyManagerBase: keep track of stream volumes for each device and apply volume according to current device selection. Change-Id: I61ef1c45caadca04d16363bca4140e0f81901b3f
* | Merge "Use audio_mode_t consistently"Glenn Kasten2012-01-173-5/+5
|\ \
| * | Use audio_mode_t consistentlyGlenn Kasten2012-01-123-5/+5
| | | | | | | | | | | | | | | | | | | | | It was int or uint32_t. Also make getMode() const. Change-Id: Ibe45aadbf413b9158e4dd17f2b3bcc6355288d37
* | | Rename Visualizer::mLockGlenn Kasten2012-01-171-1/+1
| |/ |/| | | | | | | | | | | This avoids confusion with parent class AudioEffect's mLock which is protected. Change-Id: I2ae0b0869fe3c606f682252973795b34477951d0
* | Merge "Use size_t for frame size"Glenn Kasten2012-01-173-3/+8
|\ \
| * | Use size_t for frame sizeGlenn Kasten2012-01-133-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | except in the control block, where we don't have room. In AudioFlinger::ThreadBase::TrackBase::getBuffer, read the frame size from control block only once. Change-Id: Id6c4bccd4ed3e07d91df6bbea43bae45524f9f4e
* | | Merge "Use audio_stream_type_t consistently"Glenn Kasten2012-01-178-30/+31
|\ \ \
| * | | Use audio_stream_type_t consistentlyGlenn Kasten2012-01-138-30/+31
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | At native level it was a mixture of audio_stream_type_t, int, uint32_t, and uint8_t. Java is still int. Also fixed a couple of hard-coded -1 instead of AUDIO_STREAM_DEFAULT, and in startToneCommand a hard-coded 0 instead of AUDIO_STREAM_VOICE_CALL. Change-Id: Ia33bfd70edca8c2daec9052984b369cd8eee2a83
* | | Merge "AudioTrack and AudioFlinger send level cleanup"Glenn Kasten2012-01-171-1/+16
|\ \ \
| * | | AudioTrack and AudioFlinger send level cleanupGlenn Kasten2012-01-131-1/+16
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an API to control block for getting/setting send level. This allow us to make the mSendLevel field private. Document the lack of barriers. Use 0.0f to initialize floating-point values (for doc only). Change-Id: I59f83b00adeb89eeee227e7648625d9a835be7a4
* | | Merge "Fix compilation with Clang."Jeff Brown2012-01-131-4/+0
|\ \ \ | |/ / |/| |
| * | Fix compilation with Clang.Evgeniy Stepanov2012-01-131-4/+0
| |/ | | | | | | | | | | | | warning: extraneous template parameter list in template specialization template<> Change-Id: If3e3e1d06a018343b40ac0984dfd9ecc12629f8d
* | Merge "Separate sniffing from session initialization"James Dong2012-01-124-6/+8
|\ \
| * | Separate sniffing from session initializationJames Dong2012-01-124-6/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened o The change is backward compatibile in that no update is required for existing drm plug-ins if they do not plan to provide separate sniffer/extractor related-to-bug: 5725548 Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
* | Merge "remove dead/usnused code"Mathias Agopian2012-01-121-70/+0
|\ \
| * | remove dead/usnused codeMathias Agopian2012-01-111-70/+0
| |/ | | | | | | Change-Id: I6fa2bc6ee01790abd2c1533f043d61a5e5c8d26e
* | Merge "Use audio_format_t consistently"Glenn Kasten2012-01-124-12/+14
|\ \ | |/ |/|
| * Use audio_format_t consistentlyGlenn Kasten2012-01-054-12/+14
| | | | | | | | | | | | | | | | Was int, uint32_t, uint16_t, and uint8_t with 2-bit bitfield. Also replace 0 by AUDIO_FORMAT_DEFAULT and replace 1 by AUDIO_FORMAT_PCM_16_BIT. Change-Id: Ia8804f53f1725669e368857d5bb2044917e17975
* | Merge "Fix bug in JetPlayer::loadFromFile"Glenn Kasten2012-01-111-1/+1
|\ \
| * | Fix bug in JetPlayer::loadFromFileGlenn Kasten2012-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | A long pathname would corrupt the heap due to incorrect use of strncpy. Also was using hard-coded constant 256 instead of PATH_MAX. Change-Id: Iba382bbb38624fbc41fec91449f9814f77d4ac0d
* | | Merge "Declare IAudioTrack methods in binder opcode order"Glenn Kasten2012-01-111-2/+3
|\ \ \ | |/ / |/| |
| * | Declare IAudioTrack methods in binder opcode orderGlenn Kasten2012-01-061-2/+3
| |/ | | | | | | | | | | This makes it easier to match up the declarations. Change-Id: I0996c20b2903b778b356dfe52b07b0ec634855dd
* | Merge "Clean up AudioTrack::mActive and stopped()"Glenn Kasten2012-01-091-2/+3
|\ \
| * | Clean up AudioTrack::mActive and stopped()Glenn Kasten2012-01-051-2/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mActive is protected by mLock; volatile is meaningless on SMP. Fixed a couple of places where mActive was accessed without a lock: - stopped() - processAudioBuffer() Added stopped_l() for cases where we already hold the lock. Made mActive a bool not int. Moved down a lock in setPosition that was being acquired too early. Change-Id: I73ff368e991c0db9f9472df0b3f96fd33fcc7311
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-1/+1
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-5/+5
|/ | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
* Add a new ui mode for "appliance"Joe Onorato2011-12-151-0/+1
| | | | | | | | The idea is that this is a device which is more-or-less headless. It might have some limited interaction capabilities, but it's not something that you want to rely on having. Change-Id: Ib92f53a120bf83de781728011721a4859def7d9f
* Audio C++ commentsGlenn Kasten2011-12-143-58/+54
| | | | Change-Id: I84906ebb9dfcfa5b96b287d18364b407f02a30c1
* Merge "GenerationCache::get would return a random value instead of NULL Bug ↵Romain Guy2011-12-081-2/+4
|\ | | | | | | #5401917"
| * GenerationCache::get would return a random value instead of NULLRomain Guy2011-12-081-2/+4
| | | | | | | | | | | | | | | | Bug #5401917 This was causing a ton of random crashes in apps. Change-Id: I9069a060824ec89115cd3bcd38beaeb9ecc4488e
* | Improve the VSYNC api a bit.Mathias Agopian2011-12-062-0/+32
|/ | | | | | | | | | | - add the ability to set the vsync delivery rate, when the rate is set to N>1 (ie: receive every N vsync), SF process' is woken up for all of vsync, but clients only see the every N events. - add the concept of one-shot vsync events, with a call-back to request the next one. currently the call-back is a binder IPC. Change-Id: I09f71df0b0ba0d88ed997645e2e2497d553c9a1b
* am 55d3880e: am bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1Mathias Agopian2011-11-301-4/+22
|\ | | | | | | | | | | * commit '55d3880eed3450748eb7b97281e030902ee29c2a': SurfaceTexture: add EGL_KHR_fence_sync option SurfaceTexture: add a blit-to-FBO test
| * Merge changes I7e973a35,Ib3386fcc into ics-mr1Mathias Agopian2011-11-291-4/+22
| |\ | | | | | | | | | | | | | | | * changes: SurfaceTexture: add EGL_KHR_fence_sync option SurfaceTexture: add a blit-to-FBO test
| | * SurfaceTexture: add EGL_KHR_fence_sync optionJamie Gennis2011-11-291-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | This change adds a compile-time option for SurfaceTexture to use the EGL_KHR_fence_sync extension to synchronize access to Gralloc buffers. Bug: 5122031 Change-Id: I7e973a358631fff5308acf377581b811911fe790
* | | am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage ↵Jamie Gennis2011-11-301-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | bit" into ics-mr1 * commit 'c040e1e77923d81050f2d3dbdac5d07e01be72f6': SurfaceMediaSource: use the vid enc usage bit
| * | Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1Jamie Gennis2011-11-291-0/+1
| |\ \
| | * | SurfaceMediaSource: use the vid enc usage bitJamie Gennis2011-11-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes SurfaceMediaSource add the VIDEO_ENC usage bit when allocating its GraphicBuffers rather than the HW_TEXTURE bit. Change-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb
* | | | am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from ↵Andreas Huber2011-11-291-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | reallocating buffers during a format change" into ics-mr1 * commit '52607c5364446df6ac5b2f55cb50e146e6023a4f': If an error occurs that prevents us from reallocating buffers during a format change
| * | | Merge "If an error occurs that prevents us from reallocating buffers during ↵Andreas Huber2011-11-291-0/+2
| |\ \ \ | | | | | | | | | | | | | | | a format change" into ics-mr1
| | * | | If an error occurs that prevents us from reallocating buffers during a ↵Andreas Huber2011-11-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format change we need to transition to executing state anyway to be able to properly flush/shutdown in the future. Change-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f related-to-bug: 5655016
* | | | | am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to ↵Andreas Huber2011-11-291-6/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | signal discontinuities" into ics-mr1 * commit '074133b260f8d12e484e93b9aa5a33a4983b7349': Updated (internal) API for IStreamSource to signal discontinuities
| * | | | Merge "Updated (internal) API for IStreamSource to signal discontinuities" ↵Andreas Huber2011-11-291-6/+11
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | into ics-mr1
| | * | | Updated (internal) API for IStreamSource to signal discontinuitiesAndreas Huber2011-11-291-6/+11
| | |/ / | | | | | | | | | | | | | | | | Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96 related-to-bug: 5553055