summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | | am 66da3fdc: am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028Conley Owens2012-03-091-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '66da3fdce4dc61f7d1c125eda9b2e065658cc0e5': stagefright aacenc: Avoid overflows when calculating normFactor stagefright aacenc: Avoid a division by zero
| | * | | | | | am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028Conley Owens2012-03-091-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '972efafb90b543eea51aa5b23104d469a1bcc1fb': stagefright aacenc: Avoid overflows when calculating normFactor stagefright aacenc: Avoid a division by zero
| | | * | | | | am 6db6ea02: Merge changes I00c852e4,Ib31bf028Conley Owens2012-03-091-2/+2
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6db6ea02b999e86dfbddd08780eeab0034389f93': stagefright aacenc: Avoid overflows when calculating normFactor stagefright aacenc: Avoid a division by zero
| | | | * | | | Merge changes I00c852e4,Ib31bf028Conley Owens2012-03-091-2/+2
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: stagefright aacenc: Avoid overflows when calculating normFactor stagefright aacenc: Avoid a division by zero
| | | | | * | | | stagefright aacenc: Avoid overflows when calculating normFactorMartin Storsjo2012-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | normFactor is calculated using the saturating L_add function, but if the value added (*psfbPeFactors) is negative, the sum can end up negative. *psfbPeFactors can end up negative if redThrExp is less than *psfbNActiveLines. In cases where *psfbPeFactors ended up negative, normFactor became INT_MIN, causing division by zero later. Change-Id: I00c852e457b22f7eef4d6ed1887629828057206b
| | | | | * | | | stagefright aacenc: Avoid a division by zeroMartin Storsjo2012-02-191-1/+1
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rare cases, the result of normFactor * (*psfbNActiveLines) could be zero, leading to a division by zero in pow2_xy. In these cases, normFactor was INT_MIN, and if *psfbNActiveLines was 2, the product was zero. normFactor being INT_MIN is a bug in itself though. Change-Id: Ib31bf02889615a7be3bd1bc028da8a7651a8dbee
* | | | | | | | Merge "Fix memory leak when carrying ABuffer* in AMessages."Andreas Huber2012-03-091-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix memory leak when carrying ABuffer* in AMessages.Andreas Huber2012-03-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb4770ca238d316e6dd2d89159357a8fdb504ea9
* | | | | | | | | Merge "Replace hard-coded 3 by FCC_2 to simplify searches"Glenn Kasten2012-03-092-4/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace hard-coded 3 by FCC_2 to simplify searchesGlenn Kasten2012-03-082-4/+13
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I92881d04e8378307f849fb343071a58d181a68b4
* | | | | | | | | Merge "Improve AudioPlayer position reporting"Marco Nelissen2012-03-091-2/+7
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Improve AudioPlayer position reportingMarco Nelissen2012-03-091-2/+7
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latency was not taken into account when updating mPositionTimeRealUs inside of the fillBuffer hook, contrary to what the getRealTimeUsLocked() method does. This caused the realTimeOffset calculated in the getMediaTimeUs to always be negative, causing the reported position to always be equal to mPositionTimeMediaUs, which is updated infrequently. With this change, the reported position is updated more frequently, allowing apps to perform smoother UI updates. Change-Id: I61e05c1a8b53d46b9091afb0d18a6289d13a7a5e
* | | | | | | | fix EOS handling in codec test.Andreas Huber2012-03-091-27/+30
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I5eb6d00aa0c1a728a951c7ffa4faebcadd7b14a6
* | | | | | | Merge "Don't ask policy manager about invalid stream type"Glenn Kasten2012-03-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Don't ask policy manager about invalid stream typeGlenn Kasten2012-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If50fbff9d34045d1398984da48da7e6428a74491
* | | | | | | | Merge "AudioPolicyService InputDesc minor cleanup"Glenn Kasten2012-03-092-9/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | AudioPolicyService InputDesc minor cleanupGlenn Kasten2012-03-082-9/+7
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a non-default constructor to set the mSessionId, and make mSessionId const. Remove explicit clear on mEffects - it is automatically cleared by the destructor. AudioPolicyService::setPreProcessorEnabled: - parameter is const * - use an alias instead of making a Vector copy Destructor doesn't need to be virtual since there are no subclasses. Change-Id: Ibc3c3bea8259839430b1cf5356186c7d96f1082f
* | | | | | | | Merge "audio policy: use audio_devices_t when appropriate"Eric Laurent2012-03-086-9/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | audio policy: use audio_devices_t when appropriateEric Laurent2012-03-086-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b3a5879e81c789fb53d356af3d3a1ee2dca955f
* | | | | | | | | Merge "Fix videos app bandwidth accounting for 4G streaming"Jeff Tinker2012-03-083-0/+11
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix videos app bandwidth accounting for 4G streamingJeff Tinker2012-02-143-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Register the app uid with the WV extractor so it can attribute bandwidth usage to the proper process. Multi-repository commit, also changes in vendor/widevine Change-Id: I42395fd08bf0bfc7e224745f820a714400066456 related-to-bug: 5434244
* | | | | | | | | Merge changes I140d291e,Id443ec5cMathias Agopian2012-03-087-584/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: remove files that moved to frameworks/native fixup hardcoded include paths for new project
| * | | | | | | | | remove files that moved to frameworks/nativeMathias Agopian2012-03-077-584/+0
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I140d291e520097b1148930f736823650e08488f7
* | | | | | | | | Merge "Added better codec statistics to evaluate performance."Andreas Huber2012-03-081-31/+73
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added better codec statistics to evaluate performance.Andreas Huber2012-03-071-31/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a1e4a803502329e0342ddde07b6df6b3761afd8
* | | | | | | | | | Mixer status cleanupGlenn Kasten2012-03-082-33/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use mPrevMixerStatus for DirectOutputThread also. Remove the MIXER_CONTINUE logic and use MIXER_IDLE instead. Rename the field mixerStatus to mMixerStatus. Rename local variable back to mixerStatus. Change-Id: I0a8145fc856c6c5ff8b784b6176ef3c4d8eb7408
* | | | | | | | | | Merge "Cleanup DirectOutputThread::mActiveTrack"Glenn Kasten2012-03-082-17/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Cleanup DirectOutputThread::mActiveTrackGlenn Kasten2012-03-072-17/+7
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename activeTrack to mActiveTrack. Release the reference earlier, at the end of threadLoop_mix(). This allows the field to be made private and to move the declaration from PlaybackThread to DirectOutputThread. Change-Id: I02be7a254638f7d85e92aaf0002d20ca0092a5c3
* | | | | | | | | | am 391bb522: am 859717ad: am 4d7bc655: Doc change: String changes for ↵Dirk Dougherty2012-03-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android Market * commit '391bb522013fab16b28dd8304530778114b448ce':
| * | | | | | | | | am 859717ad: am 4d7bc655: Doc change: String changes for Android MarketDirk Dougherty2012-03-050-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | * commit '859717ad627374c6e6ceae9f7cccf73084cb5fae':
| | * | | | | | | | am 4d7bc655: Doc change: String changes for Android MarketDirk Dougherty2012-03-051-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219': Doc change: String changes for Android Market
* | | \ \ \ \ \ \ \ \ resolved conflicts for merge of 532679a5 to masterDirk Dougherty2012-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | / / / / / / / | |_|_|/ / / / / / / |/| | | | | | | | | Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
| * | | | | | | | | am 4d7bc655: Doc change: String changes for Android MarketDirk Dougherty2012-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | * commit '4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219': Doc change: String changes for Android Market
| | * | | | | | | Doc change: String changes for Android MarketDirk Dougherty2012-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
* | | | | | | | | Merge "IAudioFlingerClient::ioConfigChanged param2 const"Glenn Kasten2012-03-076-14/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | IAudioFlingerClient::ioConfigChanged param2 constGlenn Kasten2012-03-066-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 3rd parameter (param2) to AudioFlingerClient::ioConfigChanged is used as an input. So changed it from void * to const void *. It is then cast to const OutputDescriptor * or const audio_stream_type_t * depending on the event. Change-Id: Ieec0d284f139b74b3389b5ef69c7935a8e5650ee
generated by cgit v1.1 at 2024-11-12 08:31:05 +0000