summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* audio_channel_in/out_mask_from_countGlenn Kasten2012-03-157-16/+14
| | | | | | | and avoid ambiguous term "channels" where it might be confusing as to whether it is a channel mask or channel count Change-Id: I744fa08ccb6001a98c97bd638d2c9d56836c4234
* Merge "Remove dependency on audio_* location"Glenn Kasten2012-03-157-12/+12
|\
| * Remove dependency on audio_* locationGlenn Kasten2012-03-147-12/+12
| | | | | | | | Change-Id: I4bc66115fcb9ba22b057bd72db3f561dcb18a0d8
* | Merge "Defines MediaPlayer APIs to support multiple audio/video/timedtext ↵James Dong2012-03-1413-136/+229
|\ \ | | | | | | | | | tracks."
| * | Defines MediaPlayer APIs to support multiple audio/video/timedtextInsun Kang2012-03-1513-136/+229
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tracks. o Newly introduced APIs are (MediaPlayer): getTrackInfo() / addExternalSource() / enableTrack() / disableTrack(). o Timed text tracks are supported only, for now. o TODOs: - Define the audio/video behavior for enableTrack and disableTrack. - Refactoring AwesomePlayer / TimedTextDriver so that all types of track index can be managed in the correct order and be ready for supporting audio/video tracks. (MediaExtractor and MediaSource for text file might be necessary.) Change-Id: Idb85e1b3f2ed49a64f377d05472dd6663ce94e07
* | Fix Xing seeking when TOC[0] == 0Marco Nelissen2012-03-142-10/+15
|/ | | | | | | | | | A file purchased from the Amazon mp3 store had two 0 entries at the start of the TOC (presumably because there was a lot of silence at the beginning, which compresses well), which made TOC based seeking think the TOC was not valid. b/6170518 Change-Id: Ie7135b4af06ebb925f63a374be780cf3a9404347
* 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-143-7/+10
|\ \
| * | Use correct syntax for #include <> ""Glenn Kasten2012-03-133-7/+10
| |/ | | | | | | Change-Id: I943137108668ae66f8eba18dafe069a7951bcd8f
* | 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-135-10/+174
|\ \
| * | Gapless playback, step 1.Marco Nelissen2012-03-135-10/+174
| | | | | | | | | | | | | | | | | | | | | 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-1333-53/+55
|\ \ \ | | | | | | | | | | | | the duplicate header files in /frameworks/base"
| * | | Switched to use the header files in /frameworks/nativeJames Dong2012-03-1233-53/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* | | | Whitespace and indentationGlenn Kasten2012-03-1327-153/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Fixing coding style : IndentationInsun Kang2012-03-132-51/+51
|/ / / | | | | | | | | | Change-Id: Ia66f92aa74c55719bbc32211c75ea1ebdf828373
* | | 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
* | Use audio_policy_output_flags_t consistentlyGlenn Kasten2012-03-096-16/+17
| | | | | | | | | | | | | | | | | | | | This affects: - IAudioFlinger::openOutput - AudioTrack::AudioTrack - AudioTrack::set - apps that call these Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
* | Merge "Use AudioRecord::record_flags consistently"Glenn Kasten2012-03-092-4/+5
|\ \
| * | Use AudioRecord::record_flags consistentlyGlenn Kasten2012-03-082-4/+5
| | | | | | | | | | | | 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 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 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
* | | | | | | 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
* | | | | | Merge "audio policy: use audio_devices_t when appropriate"Eric Laurent2012-03-082-4/+4
|\ \ \ \ \ \
| * | | | | | audio policy: use audio_devices_t when appropriateEric Laurent2012-03-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | 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-072-9/+9
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | IAudioFlingerClient::ioConfigChanged param2 constGlenn Kasten2012-03-062-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Effect for multichannel PCM downmix to stereo"Jean-Michel Trivi2012-03-073-0/+1013
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Effect for multichannel PCM downmix to stereoJean-Michel Trivi2012-03-073-0/+1013
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First pass at implementing an audio effect whose role is to downmix multichannel PCM buffers to stereo. The effect is not handling volume changes. The effect code here handles quad, 4.0, 5.1 and 7.1 input configurations, to optimize the most commom configurations, and does not yet handle generic multichanel configurations. Change-Id: I74d04bd961348f3f0e4ae7714b70e620808a0829
* | | | | | | Merge "MediaPlayerService: fix AudioSink latency"Eric Laurent2012-03-063-5/+9
|\ \ \ \ \ \ \
| * | | | | | | MediaPlayerService: fix AudioSink latencyEric Laurent2012-03-053-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AudioSink latency is currently cached when the associated AudioTrack is created. However, the AudioTrack latency can change if the AudioTrack is moved from one output stream to another. The AudioPlayer must also periodically update its view of the latency as it is needed to compensate the real audio time used for A/V sync. This fixes an A/V sync problem seen when switching A2DP on and off while playing a video. Change-Id: I28b24049ca114e1af3e24791dcc900f463536ba4
* | | | | | | | Merge "AudioTrack: relax check on minimum buffer size"Eric Laurent2012-03-061-6/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
generated by cgit v1.1 at 2024-05-20 11:37:03 +0000