summaryrefslogtreecommitdiffstats
path: root/services/audioflinger
Commit message (Collapse)AuthorAgeFilesLines
* am 900f6535: am 561f50de: am db995fe3: Merge "Fix getTimestamp if offload ↵Andy Hung2014-12-091-1/+2
|\ | | | | | | | | | | | | thread is not initialized." into lmp-mr1-dev * commit '900f6535af232298e4a77477907a40f68e8dc61b': Fix getTimestamp if offload thread is not initialized.
| * am 561f50de: am db995fe3: Merge "Fix getTimestamp if offload thread is not ↵Andy Hung2014-12-081-1/+2
| |\ | | | | | | | | | | | | | | | | | | initialized." into lmp-mr1-dev * commit '561f50de82ce47f11ba8d4f25db1ca1d8467b2a7': Fix getTimestamp if offload thread is not initialized.
| | * Fix getTimestamp if offload thread is not initialized.Andy Hung2014-12-031-1/+2
| | | | | | | | | | | | | | | | | | | | | Returns INVALID_OPERATION. Bug: 18605649 Change-Id: I440fb687fbf9249098e049982fa83bcd1515fd80
* | | am 0ed71389: am eb05bacc: am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY ↵Elliott Hughes2014-12-031-4/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | is always true for __arm__." * commit '0ed7138903a85526a85d0cea8ff51b56d5aac236': __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.
| * | am eb05bacc: am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true ↵Elliott Hughes2014-12-031-4/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | for __arm__." * commit 'eb05baccea81f125d042be33c36dcf1893d903d9': __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.
| | * | __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.Elliott Hughes2014-12-021-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And this is the only user of that macro... Bug: 18556103 Change-Id: I1b515a54ac8530b150f4dd93070db60c701a5603
* | | | am 121143d5: am bf14c62e: am 72bf901c: Merge "audio policy: new ↵Eric Laurent2014-11-262-5/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | getOutputForAttr() prototype." into lmp-mr1-dev * commit '121143d5242a790d0bd01fe1b9cec5d28a1ba1d7': audio policy: new getOutputForAttr() prototype.
| * | | am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() ↵Eric Laurent2014-11-262-5/+9
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | prototype." into lmp-mr1-dev * commit 'bf14c62e7973ed793a3b00c2c67beca4484c1c7a': audio policy: new getOutputForAttr() prototype.
| | * | audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-252-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update getOutputForAttr() prototype and group all logic dealing with audio attributes to stream type conversion in audio policy manager. getOutputForAttr(): - specifies the audio session (for future use) - returns a status code - receives either stream type (for legacy) or audio attributes - returns an updated streamtype Remove logic dealing with legacy stream types to attributes conversion from AudioTrack. Use correct type for audio sessions in other APIs (startOutput() ...). releaseOutput() specifies the audio session (for future use). Bug: 18067208. Change-Id: I1bfbe9626c04c7955d77f8a70aecfad2cb204817
* | | | am 72215491: am 1a475921: am 223fd5c9: audio: new routing strategies and ↵Eric Laurent2014-11-265-18/+40
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | stream types * commit '72215491c60fbcdb9a2f0be782e24e39cca249c5': audio: new routing strategies and stream types
| * | | am 1a475921: am 223fd5c9: audio: new routing strategies and stream typesEric Laurent2014-11-265-18/+40
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '1a475921c0577a4650d1bbe40a85b732d1766939': audio: new routing strategies and stream types
| | * | audio: new routing strategies and stream typesEric Laurent2014-11-215-18/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new routing strategies and stream type for internal use by audio policy manager and audio flinger: - One for accessibility to allow different routing than media - One for re-routing (remote submix) in preparation of dynamic policies - Added stream type for "internal" audio flinger tracks used for audio patches and duplication. Bug: 18067208. Change-Id: I88f884b552e51e4a49c29125e5a1204cf58ff434
| * | | am d48f1b68: am f50db74f: Merge "Fix format conversion in DuplicatingThread" ↵Glenn Kasten2014-11-211-8/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'd48f1b68b2b824ffcfdbf6aa67ad4696020a8a11': Fix format conversion in DuplicatingThread
* | | | am c63c0973: am f50db74f: Merge "Fix format conversion in DuplicatingThread" ↵Glenn Kasten2014-11-211-8/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: d48f1b6 * commit 'c63c09738772133e9b20a7c8576ad116ff855ee2': Fix format conversion in DuplicatingThread
| * \ \ \ am f50db74f: Merge "Fix format conversion in DuplicatingThread" into lmp-mr1-devGlenn Kasten2014-11-211-8/+8
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | automerge: d48f1b6 * commit 'd48f1b68b2b824ffcfdbf6aa67ad4696020a8a11': Fix format conversion in DuplicatingThread
| | * | Fix format conversion in DuplicatingThreadHaynes Mathew George2014-11-201-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DuplicatingThread converts PCM data from the format of the source thread to PCM_16BIT before writing to all connected output tracks. This needs to be done just once before writing to all tracks. Bug: 18461844 Change-Id: If05254f87f9198e09a0fa3c4e857afbb53ae7073
* | | | am d0e12a16: am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-204-12/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd0e12a161471823d1ab269cb608be3f3b0a71ed1': C++11 compatibility.
| * | | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-204-12/+16
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '902dc42d79b075395d484ce1c71f215b199aaa2a': C++11 compatibility.
| | * | C++11 compatibility.Dan Albert2014-11-204-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 "Fix AudioMixer floating interaction with downmixer"Andy Hung2014-11-194-56/+136
|\ \ \ \
| * | | | Fix AudioMixer floating interaction with downmixerAndy Hung2014-11-074-56/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously _if_ the full floating point mixer is enabled, a downmixer would force the mixer input for a session submix to integer, breaking other mixer inputs to the same submix that were in float. Use another ReformatBufferProvider after the downmixer to solve this issue. Update the test-mixer app and the mixer_to_wave_tests shell script to detect this issue. Bug: 17363939 Change-Id: I74a56333f9ee75ddde39a75392c021c5eebddbef
* | | | | Merge "Move AudioMixer buffer provider preparation into track"Andy Hung2014-11-192-74/+66
|\ \ \ \ \ | |/ / / /
| * | | | Move AudioMixer buffer provider preparation into trackAndy Hung2014-11-072-74/+66
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17363939 Change-Id: I1f0f597b008f7369df87ba369fabaa93dec08ea1
* | | | | am 640228b8: am 9b323821: am e4044209: Merge "Disable clang++ due to ↵Chih-Hung Hsieh2014-11-192-0/+12
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | compiler error." * commit '640228b8e0e537a527f2bb63a4f4d4b5a1ef29cd': Disable clang++ due to compiler error.
| * | | | am 9b323821: am e4044209: Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-192-0/+12
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '9b3238218cf24c75f92c5174e3a4edb8aff17047': Disable clang++ due to compiler error.
| | * | | 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
* | | | | | am a248703b: am a3e2c146: am 4d0a5985: Merge "Prevent stopped audio tracks ↵Andy Hung2014-11-181-8/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from mixing data" into lmp-mr1-dev * commit 'a248703b0799a9a27481f0ec13df90214a661eb5': Prevent stopped audio tracks from mixing data
| * | | | | am a3e2c146: am 4d0a5985: Merge "Prevent stopped audio tracks from mixing ↵Andy Hung2014-11-181-8/+9
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | data" into lmp-mr1-dev * commit 'a3e2c146eda841d84faa0093d26d7414de78bbaa': Prevent stopped audio tracks from mixing data
| | * | | | Prevent stopped audio tracks from mixing dataAndy Hung2014-11-171-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Static tracks should have zero framesReady when stopping or stopped, to prevent mixer from running potentially indefinitely with loop mode. Bug: 16070883 Change-Id: Iab9968044d1a6f8543bbcbfb246f49f27d68cace
* | | | | | am f1b0c671: am 2716969d: resolved conflicts for merge of 3bc345f5 to ↵Elliott Hughes2014-11-171-7/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master * commit 'f1b0c671e85d7ad5e1aa94d16336cda57158cd33': libcutils no longer requires that its users configure ANDROID_SMP.
| * | | | | am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-masterElliott Hughes2014-11-171-7/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '2716969d2b88e85a6ed5a766b54a0a34dc137118': libcutils no longer requires that its users configure ANDROID_SMP.
| | * | | | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-171-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib91ff0696ab2472c62168eb5261bbda5d22f623e
| * | | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-172-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
| | * | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-172-2/+2
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* | | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: I89a5988a0ac694ffc04d88cf939e8455bf925d4c
* | | | | Merge "Include normal output track buffer depth in systrace"Glenn Kasten2014-11-141-0/+21
|\ \ \ \ \
| * | | | | Include normal output track buffer depth in systraceGlenn Kasten2014-11-101-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also log "second chance" sleeps Change-Id: I6e352948926c246002642a50c92af213e6b79040
* | | | | | am 9226e7c5: am 2f702c9b: am 43e10bb7: Merge "Move to libc++."Dan Albert2014-11-111-14/+3
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * commit '9226e7c5eba914e6917bf59e1b26417aedf1436a': Move to libc++.
| * | | | am 2f702c9b: am 43e10bb7: Merge "Move to libc++."Dan Albert2014-11-111-14/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '2f702c9bc0d07f5d48f6f50586b1e11d9ac59381': Move to libc++.
| | * | | Move to libc++.Dan Albert2014-11-111-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also cleans up some makefile cruft. Bug: 15193147 Change-Id: Ia53ca4f6fb2153f4e77e6f696eb27dcaae73a78e
| | * | | am ac302143: Fix the fixMarco Nelissen2014-10-201-1/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac302143551a8b964f026385a524dda9ff8ea5ba': Fix the fix
| | * \ \ \ 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
| | * \ \ \ \ 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.
| | * \ \ \ \ \ 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
| | * \ \ \ \ \ \ 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
| | * \ \ \ \ \ \ \ 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"
| | * \ \ \ \ \ \ \ \ 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
| | * \ \ \ \ \ \ \ \ \ 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
| | * \ \ \ \ \ \ \ \ \ \ am 4379c034: Merge "Fix tee sink" into lmp-devGlenn Kasten2014-09-291-3/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4379c03433e4613c417998ca7917059ef17dc3a9': Fix tee sink
generated by cgit v1.1 at 2024-09-26 18:15:34 +0000