summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "AudioFlinger playback thread CPU measurement in Hz"Glenn Kasten2012-03-141-22/+82
|\
| * AudioFlinger playback thread CPU measurement in HzGlenn Kasten2012-03-141-22/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | Log statistics on CPU usage in Hz in addition to wall clock time Use CPU statistics for all playback threads, not just MIXER (but they are disabled by default by a compile-time debug macro). ThreadCpuUsage library: - Move statistics out of the library and leave that up to the caller - Add API to determine a CPU's frequency Change-Id: Ia1011123146e641fcf210ef26e78ae2b4d3b64ad
* | Merge "audioflinger: more info in dumpsys"Eric Laurent2012-03-141-0/+4
|\ \
| * | audioflinger: more info in dumpsysEric Laurent2012-03-141-0/+4
| | | | | | | | | | | | | | | | | | Added TID and io handle to AudioFlinger threads dump. Change-Id: Ib1a856f3bad55c73e4c395b5e59d57435f4b9a4c
* | | Merge "Break circular dependency on media player service"Glenn Kasten2012-03-141-0/+16
|\ \ \
| * | | Break circular dependency on media player serviceGlenn Kasten2012-03-131-0/+16
| | |/ | |/| | | | | | | | | | Bug: 6165157 Change-Id: I3c85bbcaf31f3cb9a009e273f7b6284015eb3bd8
* | | Merge "Prepare frameworks/native/services/audioflinger"Glenn Kasten2012-03-141-5/+5
|\ \ \
| * | | Prepare frameworks/native/services/audioflingerGlenn Kasten2012-03-131-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Part of this change will be reverted after the move is complete. Change-Id: Ie7f6355368258f2b1344f4ef754da9151a06e41d
* | | | Merge "Use correct syntax for #include <> """Glenn Kasten2012-03-144-8/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use correct syntax for #include <> ""Glenn Kasten2012-03-134-8/+11
| |/ / | | | | | | | | | Change-Id: I943137108668ae66f8eba18dafe069a7951bcd8f
* | | Merge "make sure that lower-case mime and file suffix is used to check ↵James Dong2012-03-141-5/+8
|\ \ \ | | | | | | | | | | | | against the supported ones"
| * | | make sure that lower-case mime and file suffix is used to check against the ↵James Dong2012-03-131-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | supported ones Change-Id: I6a20832f6a2dfb8554dbddef0dee87cc21c05c80
* | | | Merge "Fixed a buffer overflow bug in DrmPassthruPlugin"James Dong2012-03-141-2/+8
|\ \ \ \
| * | | | Fixed a buffer overflow bug in DrmPassthruPluginJames Dong2012-03-131-2/+8
| |/ / / | | | | | | | | | | | | Change-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16
* | | | Merge "Turned off log spamming from DrmPassthruPlugin"James Dong2012-03-141-28/+28
|\ \ \ \
| * | | | Turned off log spamming from DrmPassthruPluginJames Dong2012-03-131-28/+28
| |/ / / | | | | | | | | | | | | Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
* | | | SurfaceTexture: Fully refactored from BufferQueueDaniel Lam2012-03-132-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | Cleaning up camera and media interactions as part of SurfaceTexture refactoring Change-Id: Iea2b10ff80b5f01f83ed0902c725df1d3b4c541a
* | | | Merge "Gapless playback, step 1."Marco Nelissen2012-03-138-10/+180
|\ \ \ \
| * | | | Gapless playback, step 1.Marco Nelissen2012-03-138-10/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently able to play Ogg Vorbis, PCM WAV and other lossless files seamlessly by reusing the initial AudioTrack for subsequent players. Change-Id: Ie7cf6b9076bdf4f9211574456d192c02c04fecc7
* | | | | Merge "Switched to use the header files in /frameworks/native and deleted ↵James Dong2012-03-1347-7278/+64
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | the duplicate header files in /frameworks/base"
| * | | | Switched to use the header files in /frameworks/nativeJames Dong2012-03-1247-7278/+64
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* | | | Whitespace and indentationGlenn Kasten2012-03-1345-319/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix indentation to be multiple of 4. Make it easier to search: sp< not sp < to "switch (...)" instead of "switch(...)" (also "if" and "while") Remove redundant blank line at start or EOF. Remove whitespace at end of line. Remove extra blank lines where they don't add value. Use git diff -b or -w to verify. Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
* | | | Merge "Fixing coding style : Indentation"James Dong2012-03-132-51/+51
|\ \ \ \
| * | | | Fixing coding style : IndentationInsun Kang2012-03-132-51/+51
| |/ / / | | | | | | | | | | | | Change-Id: Ia66f92aa74c55719bbc32211c75ea1ebdf828373
* | | | Merge "Clean up assertion checks"Glenn Kasten2012-03-132-27/+25
|\ \ \ \ | |/ / / |/| | |
| * | | Clean up assertion checksGlenn Kasten2012-03-122-27/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ALOG_ASSERT instead of assert. Use compile-time asserts where appropriate. Fix typo in an ALOGV. Change-Id: I58f1c1ffc14319a022c88b5a88b8d0368660da8b
* | | | Fix bug where mMixerStatus was set to IDLEGlenn Kasten2012-03-121-2/+1
|/ / / | | | | | | | | | Change-Id: I55df1738fb7ba17ba6caeea6a17557526eac17a7
* | | Inline applyVolume() into threadLoop_mix()Glenn Kasten2012-03-122-80/+73
| | | | | | | | | | | | | | | | | | Also the declaration of applyVolume in PlaybackThread was dead. Change-Id: I4b1a9848d07d3d7f340baea05b17f667c78df868
* | | Merge "Remove unnecessary friend declarations"Glenn Kasten2012-03-121-42/+10
|\ \ \
| * | | Remove unnecessary friend declarationsGlenn Kasten2012-03-091-42/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add comments to the remaining friends, so we know what is left if we decide to remove them later. Change-Id: I1de929257dc4700960f77902cda3d303177c72cf
* | | | Merge "Remove virtual from methods that don't need it"Glenn Kasten2012-03-122-3/+6
|\ \ \ \
| * | | | Remove virtual from methods that don't need itGlenn Kasten2012-03-092-3/+6
| |/ / / | | | | | | | | | | | | Change-Id: I30e17e61aae25b036436c0e270313c80c43e5f06
* | | | Merge "Merge dup code at thread entry and param change"Glenn Kasten2012-03-122-52/+81
|\ \ \ \
| * | | | Merge dup code at thread entry and param changeGlenn Kasten2012-03-122-52/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL is mostly just cleanup, but there are a couple of fixes marked "FIX" below. Merge the duplicate code that was at the beginning of threadLoop() and after a parameter change. cacheParameters_l() is now called at entry to threadLoop() and after any parameter change. It re-calculates all values that are derived from parameters, and caches them in instance variables. updateWaitTime_l(): - FIX activeSleepTime depends on mWaitTimeMs, which was initially set to infinity. updateWaitTime_l() was not called at entry to threadLoop(), so activeSleepTime was not set correctly before the first parameter change. - FIX reversed the order of calls after parameter change for the same reason so that updateWaitTime_l() is called before calculating values that are derived from wait time. - marked it private since now it's only called from DuplicatingThread Change-Id: If2607d2ed66c6893d910433e48208a93c41fb7e9
* | | | | Merge "Extend WAV extractor for multichannel"Jean-Michel Trivi2012-03-122-10/+73
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Extend WAV extractor for multichannelJean-Michel Trivi2012-03-092-10/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support multichannel (more than 2) audio in WAV. Support WAV_EXT format. Change-Id: If0e6cf28cb3096f4f148ff6583f7e01db8f8a901
* | | | | Merge "Avoid checking supported mime types or file suffixes in multiple places"James Dong2012-03-123-53/+55
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Avoid checking supported mime types or file suffixes in multiple placesJames Dong2012-03-093-53/+55
| | |/ / | |/| | | | | | | | | | Change-Id: I47d24070c7bda385cd1d7fa1f6a75dbb1f82b476
* | | | Merge "Added an failure log message when the fwdlock engine fails to open a ↵James Dong2012-03-091-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | given file."
| * | | | Added an failure log message when the fwdlock engine fails to open a given file.James Dong2012-03-091-1/+8
| |/ / / | | | | | | | | | | | | Change-Id: I0e7f60b61f03fde046fc1ad668b28cdee635898b
* | | | Use audio_policy_output_flags_t consistentlyGlenn Kasten2012-03-0910-25/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This affects: - IAudioFlinger::openOutput - AudioTrack::AudioTrack - AudioTrack::set - apps that call these Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
* | | | Merge "Use AudioRecord::record_flags consistently"Glenn Kasten2012-03-093-7/+10
|\ \ \ \
| * | | | Use AudioRecord::record_flags consistentlyGlenn Kasten2012-03-083-7/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: I6f369a2b99eb515603bc7d5629a07db2b96783fe
* | | | | am ea374096: am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright ↵Conley Owens2012-03-091-4/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | amrwbenc: Simplify the definition of static_vo" * commit 'ea374096511f92206c264f3f1eb0551a05a34cd5': stagefright amrwbenc: Simplify the definition of static_vo
| * \ \ \ \ am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify ↵Conley Owens2012-03-091-4/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the definition of static_vo" * commit 'c24f5ba4ee2873d6fd980229f0d24c80104d3558': stagefright amrwbenc: Simplify the definition of static_vo
| | * \ \ \ \ am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the ↵Conley Owens2012-03-091-4/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | definition of static_vo" * commit '9a3f3b9db63e7e109a417c0959b8bc589ab70e04': stagefright amrwbenc: Simplify the definition of static_vo
| | | * \ \ \ \ am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"Conley Owens2012-03-091-4/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '67cf093d86539d4f3db7e2a2b168c9a250c0a5b8': stagefright amrwbenc: Simplify the definition of static_vo
| | | | * \ \ \ \ Merge "stagefright amrwbenc: Simplify the definition of static_vo"Conley Owens2012-03-091-4/+0
| | | | |\ \ \ \ \
| | | | | * | | | | stagefright amrwbenc: Simplify the definition of static_voMartin Storsjo2012-01-301-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For GCC, all of inline, __inline and __inline__ work fine. For MSVC, only __inline works. (__inline should also be accepted by RVCT.) Change-Id: Ifbb1c848b200a8c4080624a3d3bd8b6ee498edb2
* | | | | | | | | | am 3557654c: am 66da3fdc: am 972efafb: am 6db6ea02: Merge changes ↵Conley Owens2012-03-091-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I00c852e4,Ib31bf028 * commit '3557654c95bae7754dcd1951ec10742b895817e2': stagefright aacenc: Avoid overflows when calculating normFactor stagefright aacenc: Avoid a division by zero
generated by cgit v1.1 at 2024-09-09 10:49:13 +0000