summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* C++11 compatibility.Dan Albert2014-11-206-15/+21
| | | | | | | | | | | | | | * Fix string literal concatenation to not be interpreted as UD literals. * Add constexpr compatibility for non-integral static members. * Use __typeof__ instead of typeof (should become decltype once this actually becomes C++11). * Add an appropriate cast for atomic_uintptr_t, since moving to C++11 means moving from <stdatomic.h> to <atomic>, which has better typechecking (hooray for not macros!). Bug: 18466763 Change-Id: I9561dcb2526578687819ff85421ba80d8e1a9694
* Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-182-0/+12
|\
| * Disable clang++ due to compiler error.Chih-Hung Hsieh2014-11-142-0/+12
| | | | | | | | | | | | | | | | Clang++ chokes on AudioMixer.cpp. It does not know "how to split this operator." BUG: 18373866 Change-Id: I3d588d44596c7c3b6f97e5f822545e015b074206
* | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-171-7/+0
| | | | | | | | Change-Id: Ib91ff0696ab2472c62168eb5261bbda5d22f623e
* | Update calls to IInterface::asBinder()Marco Nelissen2014-11-1712-29/+29
| | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* | Include AudioPolicyInterface.h only when needed.Chih-Hung Hsieh2014-11-142-0/+3
|/ | | | | | | | | | Both legacy and non-legacy AudioPolicyInterface define extern "C" functions createAudioPloicyManager and destroyAudioPloicyManager. Standard C++ does not allow overloading of extern C functions. g++ did not catch this problem but clang++ does. Change-Id: I80869cdb26e7721777e53d4eff71c5c733044abf
* Move to libc++.Dan Albert2014-11-111-14/+3
| | | | | | | This also cleans up some makefile cruft. Bug: 15193147 Change-Id: Ia53ca4f6fb2153f4e77e6f696eb27dcaae73a78e
* Camera: Guard against asBinder() calls on NULL interfacesEino-Ville Talvala2014-11-076-16/+26
| | | | | Bug: 18207548 Change-Id: I9879c9b4c0282a6b96b77398f62beedc47f7f0a0
* am ac302143: Fix the fixMarco Nelissen2014-10-201-1/+3
|\ | | | | | | | | * commit 'ac302143551a8b964f026385a524dda9ff8ea5ba': Fix the fix
| * Fix the fixMarco Nelissen2014-10-201-1/+3
| | | | | | | | | | | | | | We need to clear the buffer a little more often. Bug: 18023017 Change-Id: If8a522b9133a4269e2435af8958f6ced322e71e9
* | am 22bc10a3: Merge "Clear effect buffer before sending to chain" into lmp-devMarco Nelissen2014-10-201-4/+3
|\ \ | |/ | | | | | | * commit '22bc10a347569a0ab2980c24783e31aba4d7414d': Clear effect buffer before sending to chain
| * Merge "Clear effect buffer before sending to chain" into lmp-devMarco Nelissen2014-10-201-4/+3
| |\
| | * Clear effect buffer before sending to chainMarco Nelissen2014-10-171-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | otherwise the effect might get a buffer with previous data instead of silence. Bug: 18023017 Change-Id: Ic6be5ce0e74552aac2a0cce9c660893f9ad27f5c
* | | am a2d4a6da: audio policy: Fix for voice call audio lossHaynes Mathew George2014-10-161-0/+20
|\ \ \ | |/ / | | | | | | | | | * commit 'a2d4a6dac432f0c4f543d79b9a63c55ae91f81d6': audio policy: Fix for voice call audio loss
| * | audio policy: Fix for voice call audio lossHaynes Mathew George2014-10-151-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Audio Policy service filters out one of the create patch commands when it finds two pending commands with the same patch handles. Due to this routing command is not received to audio HAL and the voice call set up fails. Fix this by filtering create patch commands only when they are issued on the same output. authored-by: Karthik Reddy Katta <a_katta@codeaurora.org> Bug: 17787282 Change-Id: If36f0ab71e9b72d6a8eb61d31f762bc5e1683b89
* | | am 9d2189ff: Merge "Camera2Client: avoid two consecutive sets of ↵Zhijun He2014-10-141-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | configure_streams calls" into lmp-dev * commit '9d2189ffcf1142b2948ce3065c32521ed7d966c4': Camera2Client: avoid two consecutive sets of configure_streams calls
| * | Camera2Client: avoid two consecutive sets of configure_streams callsZhijun He2014-10-141-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | When mediaRecorder starts without an active preview stream, Camera2Client starts preview then immediately start recording, which could cause the second configure_streams to call into HAL before any preview request is sent. This could cause HAL to run into bad state. This change work around this issue by making sure the first preview request is submitted to the HAL before start recording. Bug: 17915062 Change-Id: I94ae64ee76487603695a469240da601ddcb29a66
* | am 9286354c: Merge "Revert "audio policy: add support for ↵Dave Burke2014-10-122-13/+1
|\ \ | |/ | | | | | | | | | | ro.audio.media_deep_buffer"" into lmp-dev * commit '9286354c0a864ce2348cc7dfc6ca81e84a15f8e2': Revert "audio policy: add support for ro.audio.media_deep_buffer"
| * Revert "audio policy: add support for ro.audio.media_deep_buffer"Vineeta Srivastava2014-10-112-13/+1
| | | | | | | | | | | | This reverts commit 95511add8ad4d440c67272503559f5042c4e6f1f. Change-Id: I76a8b86790b06b08d8ca0f8d374e585f964ffba8
* | am ffd5cdbd: Merge "audio policy: add support for ↵Eric Laurent2014-10-102-1/+13
|\ \ | |/ | | | | | | | | | | ro.audio.media_deep_buffer" into lmp-dev * commit 'ffd5cdbd3e3faa203539e26adc755f860c8cac80': audio policy: add support for ro.audio.media_deep_buffer
| * audio policy: add support for ro.audio.media_deep_bufferEric Laurent2014-10-102-1/+13
| | | | | | | | | | Bug: 17931716. Change-Id: Ife170f20f5d02b71059fbd384bd29759fafee826
* | am f5ada6ed: audio policy: move intializations to onFirstRef()Eric Laurent2014-10-102-0/+7
|\ \ | |/ | | | | | | * commit 'f5ada6edcc83bb1b313abcd4c4fbdc4f7724f04d': audio policy: move intializations to onFirstRef()
| * audio policy: move intializations to onFirstRef()Eric Laurent2014-10-102-0/+7
| | | | | | | | | | | | Bug: 17896324. Change-Id: I3bb74f5397142ac354bd815eb362e5ddacdcb463
* | am 07811789: Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" ↵Eric Laurent2014-10-072-2/+3
|\ \ | |/ | | | | | | | | | | into lmp-dev * commit '07811789ebf31f5317403356f624d04282e666aa': audio policy: fix build with USE_LEGACY_AUDIO_POLICY
| * audio policy: fix build with USE_LEGACY_AUDIO_POLICYEric Laurent2014-10-072-2/+3
| | | | | | | | | | Bug: 17894512. Change-Id: I6431c0b03ba02cf561413c34848a334caa0261fa
* | am 5bee844f: Merge "audio policy: fix lockup during mediaserver restart" ↵Eric Laurent2014-10-075-115/+186
|\ \ | |/ | | | | | | | | | | into lmp-dev * commit '5bee844fd8c2f6d9fa78ed5e063a8e3df9f2f7b6': audio policy: fix lockup during mediaserver restart
| * audio policy: fix lockup during mediaserver restartEric Laurent2014-10-075-115/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When pre or post processing effects are applied by audio policy service automatically there is a potential lockup if the first call into AudioPolicyService is made while creating one of those effects. This is because effects are created with AudioPolicyService mutex held and effect creation calls into methods (e.g registerClient()) which also acquire the mutex. The fix consists in adding a new mutex to AudioPolicyEffects class and not hold the AudioPolicyService mutex when calling methods in of class. Bug: 17830596. Change-Id: Ie61c3671d3147f46e99ba208f39c1a3bf180779f
* | am 2b217bb3: Merge "audioflinger: fix pre processing transfer between record ↵Eric Laurent2014-10-034-15/+76
|\ \ | |/ | | | | | | | | | | threads." into lmp-dev * commit '2b217bb3aee87ce8486014f261c0f498f6209e80': audioflinger: fix pre processing transfer between record threads.
| * Merge "audioflinger: fix pre processing transfer between record threads." ↵Eric Laurent2014-10-034-15/+76
| |\ | | | | | | | | | into lmp-dev
| | * audioflinger: fix pre processing transfer between record threads.Eric Laurent2014-10-024-15/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix two problems remaining with pre processing effects transfer from one record thread to the next in case of tear down due to device connection: 1 - the enabled state of the effects was not communicated to the new HAL input stream. 2 - the effects saved in orphan chains list were not transfered to the new thread when a AudioRecord was created. Bug: 17757378. Change-Id: I0923c98470db3b51154dc89846157780a4c21e86
* | | am be9ebd46: Merge "Fix uncertainty of one normal mix buffer in ↵Glenn Kasten2014-10-033-2/+29
|\ \ \ | |/ / | | | | | | | | | | | | | | | AudioTrack::getTimestamp" into lmp-dev * commit 'be9ebd46c1ec366dca5f142a36a71015b048c037': Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp
| * | Fix uncertainty of one normal mix buffer in AudioTrack::getTimestampGlenn Kasten2014-10-023-2/+29
| |/ | | | | | | | | | | | | | | | | | | The per-thread timestamp latch was not synchronized with the per-track released frames. Now the value of each track's released frames is latched along with the timestamp. Bug: 17531839 Bug: 17669342 Change-Id: I9d50c8c6a5de55a3f4561ac40e20d497376c1257
* | am cb4b6e9f: audioflinger: fix failure to indicate volume to effectEric Laurent2014-10-022-10/+23
|\ \ | |/ | | | | | | * commit 'cb4b6e9f05d1c0b3fcc5be5ebe3f7d6f32669b1a': audioflinger: fix failure to indicate volume to effect
| * audioflinger: fix failure to indicate volume to effectEric Laurent2014-10-012-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | If an effect is added and enabled after a track is started it will not receive current volume information because volume is indicated only to active effects and if there is a volume change. Add a flag to force EffectChain::setVolume_l() to pass volume indication to all effects each time an effect is enabled. Bug: 17572556. Change-Id: I6b68488c9aca8b2095fb210aa124d02e4f759660
* | am a49c94ea: Merge "Revert "Fix uncertainty of one normal mix buffer in ↵Glenn Kasten2014-10-013-23/+1
|\ \ | |/ | | | | | | | | | | AudioTrack::getTimestamp"" into lmp-dev * commit 'a49c94ea49c8329a1bdefe980e1f7d335c0d1ec5': Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"
| * Merge "Revert "Fix uncertainty of one normal mix buffer in ↵Glenn Kasten2014-10-013-23/+1
| |\ | | | | | | | | | AudioTrack::getTimestamp"" into lmp-dev
| | * Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"Glenn Kasten2014-10-013-23/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 54464ba861aaafd11ee5645f5d1ecd1171c6e9fe. Bug: 17733142. Change-Id: I9886d40032b2f7d96bee03e600e14f78943d8052
* | | am 955e24d3: Merge "Fix uncertainty of one normal mix buffer in ↵Glenn Kasten2014-09-303-1/+23
|\ \ \ | |/ / | | | | | | | | | | | | | | | AudioTrack::getTimestamp" into lmp-dev * commit '955e24d3a8e218d4711cabc6558781e095011132': Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp
| * | Merge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" ↵Glenn Kasten2014-09-303-1/+23
| |\ \ | | |/ | | | | | | into lmp-dev
| | * Fix uncertainty of one normal mix buffer in AudioTrack::getTimestampGlenn Kasten2014-09-303-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The per-thread timestamp latch was not synchronized with the per-track released frames. Now the value of each track's released frames is latched along with the timestamp. Bug: 17531839 Bug: 17669342 Change-Id: I96252782911bd42a2534cc4030521b7eeb99a7b9
* | | am 6c7ae72f: Merge "audio policy: fix HW A/V sync output selection" into lmp-devEric Laurent2014-09-301-1/+3
|\ \ \ | |/ / | | | | | | | | | * commit '6c7ae72f0eccf456744474785afd25f9e205881c': audio policy: fix HW A/V sync output selection
| * | Merge "audio policy: fix HW A/V sync output selection" into lmp-devEric Laurent2014-09-301-1/+3
| |\ \
| | * | audio policy: fix HW A/V sync output selectionEric Laurent2014-09-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit b732cf5a broke the selection mechanism for the HW A/V sync direct output. Add a rule to only select a mixed output for basic PCM stereo content when a direct output is not explicitly requested. Bug: 17702382. Change-Id: I1387690ace77cd4d6a8faf0b525c3d1008fba3f1
* | | | am f71224ce: Merge "audioflinger: forward flush to direct output streams" ↵Eric Laurent2014-09-303-4/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'f71224ce266abb39f83ecba87783c2347631654a': audioflinger: forward flush to direct output streams
| * | | Merge "audioflinger: forward flush to direct output streams" into lmp-devEric Laurent2014-09-303-4/+16
| |\ \ \
| | * | | audioflinger: forward flush to direct output streamsEric Laurent2014-09-293-4/+16
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track flush should be forwarded to the audio HAL when playing on a direct output stream. Bug: 17704953. Change-Id: Iafc94327fe9aebf1d4eaa97b76c6767b7ac5babe
* | | | am c8c05d6a: Merge "CameraService: API1: Reallocate JPEG ashmem heap if size ↵Eino-Ville Talvala2014-09-301-1/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | changes" into lmp-dev * commit 'c8c05d6a5821dd56209e160066314a03d2f2ca06': CameraService: API1: Reallocate JPEG ashmem heap if size changes
| * | | Merge "CameraService: API1: Reallocate JPEG ashmem heap if size changes" ↵Eino-Ville Talvala2014-09-291-1/+14
| |\ \ \ | | | | | | | | | | | | | | | into lmp-dev
| | * | | CameraService: API1: Reallocate JPEG ashmem heap if size changesEino-Ville Talvala2014-09-291-1/+14
| | |/ / | | | | | | | | | | | | | | | | Bug: 17682603 Change-Id: I7cba3365d00c33cf4267b1b59a94bd7d0bba08df
* | | | am 4379c034: Merge "Fix tee sink" into lmp-devGlenn Kasten2014-09-291-3/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4379c03433e4613c417998ca7917059ef17dc3a9': Fix tee sink