summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* 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-131-1/+5
|\
| * Gapless playback, step 1.Marco Nelissen2012-03-131-1/+5
| | | | | | | | | | | | | | 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-1328-42/+44
|\ \ | | | | | | | | | the duplicate header files in /frameworks/base"
| * | Switched to use the header files in /frameworks/nativeJames Dong2012-03-1228-42/+44
| | | | | | | | | | | | | | | | | | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* | | 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-091-1/+1
| | | | | | | | | | | | | | | | | | | | This affects: - IAudioFlinger::openOutput - AudioTrack::AudioTrack - AudioTrack::set - apps that call these Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
* | Merge "Use AudioRecord::record_flags consistently"Glenn Kasten2012-03-091-2/+3
|\ \
| * | Use AudioRecord::record_flags consistentlyGlenn Kasten2012-03-081-2/+3
| | | | | | | | | | | | 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 "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 "MediaPlayerService: fix AudioSink latency"Eric Laurent2012-03-061-0/+6
|\ \ \ \ \ \
| * | | | | | MediaPlayerService: fix AudioSink latencyEric Laurent2012-03-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Remove unused code - MediaSourceSplitter"James Dong2012-03-062-235/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove unused code - MediaSourceSplitterJames Dong2012-03-052-235/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Icf37832a1c234501ee3ff91ff13eece2242425ae
* | | | | | | Merge "Remove references to sched_policy.h"Glenn Kasten2012-03-061-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove references to sched_policy.hGlenn Kasten2012-03-051-2/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of scheduling policy cleanup, remove obsolete references to sched_policy.h and its APIs. Change-Id: Id957d11dd645cdf9d53dd6c02e568369aef23243
* | | | | | | Add channel mask in AudioSinkJean-Michel Trivi2012-03-021-6/+15
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for specifying a channel mask when opening an AudioSink. This parameter does not replace the channel count parameter in order to not have to duplicate the logic to derive a mask from the channel count everywhere an AudioSink is used without a known mask. A mask of 0 (CHANNEL_MASK_USE_CHANNEL_ORDER) means a mask will be automatically derived from the number of channels. Update existing AudioSink implementations to use the channel mask, and users of AudioSink to specify the mask if available, and CHANNEL_MASK_USE_CHANNEL_ORDER otherwise. Change-Id: Ifa9bd259874816dbc25ead2b03ea52e873cff474
* | | | | | Merge "Remove hacks that worked around issues in OMX components several ↵Andreas Huber2012-03-011-66/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | releases back."
| * | | | | | Remove hacks that worked around issues in OMX components several releases back.Andreas Huber2012-03-011-66/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I89bb3d0be4d2c1824de382aedfdd4f9bd2547dbc
* | | | | | | am 9de7793b: am 4f906362: am 97348431: am 704131cb: Merge changes ↵Jean-Baptiste Queru2012-03-013-14/+43
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I46c81dba,If1f40e9c,I652eaaa5 * commit '9de7793b425be89889412f3a86466d7b19055c3c': stagefright aacenc: Use QDADD/QDSUB instructions stagefright aacenc: Remove useless inline asm for simple right shift stagefright aacenc: Use ARMv6 SSAT instruction
| * | | | | | am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5Jean-Baptiste Queru2012-02-293-14/+43
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '704131cb7e4f9cc682ea57ed569375f9f289368e': stagefright aacenc: Use QDADD/QDSUB instructions stagefright aacenc: Remove useless inline asm for simple right shift stagefright aacenc: Use ARMv6 SSAT instruction
| | * | | | | Merge changes I46c81dba,If1f40e9c,I652eaaa5Jean-Baptiste Queru2012-02-293-14/+43
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: stagefright aacenc: Use QDADD/QDSUB instructions stagefright aacenc: Remove useless inline asm for simple right shift stagefright aacenc: Use ARMv6 SSAT instruction
| | | * | | | | stagefright aacenc: Use QDADD/QDSUB instructionsMans Rullgard2012-01-131-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I46c81dba0486d515f1f2b89a13fae27f6ab1e122
| | | * | | | | stagefright aacenc: Remove useless inline asm for simple right shiftMans Rullgard2012-01-131-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1f40e9c16952182e974af1c86a14995259c2ade
| | | * | | | | stagefright aacenc: Use ARMv6 SSAT instructionMans Rullgard2012-01-133-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I652eaaa54e7766d9dca80fd8cc156ca481359471
* | | | | | | | am 715c78b9: am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright ↵Jean-Baptiste Queru2012-03-011-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | aacenc: Safeguard against overwriting bits" * commit '715c78b933f8dec04882ebb73acd61fdd42c6c64': stagefright aacenc: Safeguard against overwriting bits
| * | | | | | am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"Jean-Baptiste Queru2012-02-291-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '69aae36e900cf7114c5895618747906951a11730': stagefright aacenc: Safeguard against overwriting bits
| | * | | | | Merge "stagefright aacenc: Safeguard against overwriting bits"Jean-Baptiste Queru2012-02-291-0/+1
| | |\ \ \ \ \
| | | * | | | | stagefright aacenc: Safeguard against overwriting bitsMartin Storsjo2012-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if bits above the lowest noBitsToWrite were set, they would be ORed into the previous cache word, setting unrelated bits erroneously. This doesn't noticeably affect the performance of the codec as a whole. Change-Id: Ie9935533c4299b8f07cb14485f039a9be9c84016
* | | | | | | | Instead of hardcoding OMX component names in our code, supportAndreas Huber2012-03-014-227/+580
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a config file instead. Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57