summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Use audio_source_t consistently"Glenn Kasten2012-01-274-8/+7
|\
| * Use audio_source_t consistentlyGlenn Kasten2012-01-264-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was a mix of audio_source_t, uint8_t, and int. Related fixes: - fix comments in MediaRecorder.java - AudioPolicyService server side was not checking source parameter at all, so if the client wrapper was bypassed, invalid values could be passed into audio HAL - JNI android_media_AudioRecord_setup was checking source for positive values, but not negative values. This test is redundant, since already checked at Java and now checked by AudioPolicyService also, but might as well make it correct. Change-Id: Ie5e25d646dcd59a86d7985aa46cfcb4a1ba64a4a
* | The software AAC encoder is now an OMX component.Andreas Huber2012-01-261-0/+1
|/ | | | | | Yay. Change-Id: I74938a20b4e0a622836ea5184d3761180eb0f5de
* Remove AudioFlinger dependencies on clientGlenn Kasten2012-01-201-1/+1
| | | | Change-Id: Ibb591e41a3ca5d7015e2b66b98b8fef5f415fb37
* Use audio_format_t consistently, continuedGlenn Kasten2012-01-204-20/+20
| | | | | | | | | | | | Was int or uint32_t. When AudioFlinger::format can't determine the correct format, return INVALID rather than DEFAULT. Init mFormat to INVALID rather than DEFAULT in the constructor. Subclass constructors will set mFormat to the correct value. Change-Id: I9b62640aa107d24d2d27925f5563d0d7407d1b73
* Merge "Remove dead file include/media/thread_init.h"Glenn Kasten2012-01-201-24/+0
|\
| * Remove dead file include/media/thread_init.hGlenn Kasten2012-01-191-24/+0
| | | | | | | | Change-Id: I98688bb7109b5f82953988935c7c33fe3c7f4ec0
* | Merge "Remove dead setRingerMode(mode, mask)"Glenn Kasten2012-01-202-2/+0
|\ \ | |/ |/|
| * 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
* | | 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 "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 "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
* | 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
* Audio C++ commentsGlenn Kasten2011-12-143-58/+54
| | | | Change-Id: I84906ebb9dfcfa5b96b287d18364b407f02a30c1
* 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
| * | Updated (internal) API for IStreamSource to signal discontinuitiesAndreas Huber2011-11-291-6/+11
| |/ | | | | | | | | Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96 related-to-bug: 5553055
* | split ComposerService out of SurfaceComposerClient.hMathias Agopian2011-11-281-0/+53
| | | | | | | | Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6
* | Merge "Make AudioTrack a RefBase so wrappers not needed"Glenn Kasten2011-11-281-1/+1
|\ \
| * | Make AudioTrack a RefBase so wrappers not neededGlenn Kasten2011-11-151-1/+1
| | | | | | | | | | | | Change-Id: I2305abe586ac41251af04a194bc818c110a1b293
* | | am 31626b30: am cb6fbc89: Merge "Report a runtime error instead of asserting ↵Andreas Huber2011-11-221-0/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | on malformed avc configuration data." into ics-mr1 * commit '31626b3075335f4cf579342e99436bb45870cf55': Report a runtime error instead of asserting on malformed avc configuration data.
| * | Merge "Report a runtime error instead of asserting on malformed avc ↵Andreas Huber2011-11-221-0/+4
| |\ \ | | | | | | | | | | | | configuration data." into ics-mr1
| | * | Report a runtime error instead of asserting on malformed avc configuration data.Andreas Huber2011-11-181-0/+4
| | |/ | | | | | | | | | | | | Change-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845 related-to-bug: 5641069
* | | am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video ↵James Dong2011-11-212-4/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | recording" into ics-mr1 * commit 'd0a254566f5f0be5607b4d64839a575c888c94f6': Fix log spamming during time lapse video recording
| * | Fix log spamming during time lapse video recordingJames Dong2011-11-212-4/+3
| |/ | | | | | | | | | | Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f related-to-bug: 5626569
* | Merge "JetPlayer uses C++ Thread not createThreadEtc"Glenn Kasten2011-11-171-1/+22
|\ \
| * | JetPlayer uses C++ Thread not createThreadEtcGlenn Kasten2011-11-161-1/+22
| |/ | | | | | | | | | | This permits leveraging future improvements to Thread. Change-Id: I60deed8565ed54f13d9f770c76504e411b154276
* | Bug 4903178 Restore priority and cgroup on stopGlenn Kasten2011-11-162-0/+4
|/ | | | | | | | | | On AudioTrack and AudioRecord stop or failed start, restore the priority and cgroup of the caller to their previous values, rather than forcing to NORMAL. Dependent on new thread APIs. Also fixes bug where priority was set to AUDIO but cgroup not set. Change-Id: Ib83893918fb4fdf57c6b87884b51038997a631d8
generated by cgit v1.1 at 2024-06-18 10:41:34 +0000