summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | AnotherPacketSource: make getBufferedDurationUs more discontinuity-awareRobert Shih2015-04-213-105/+102
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new getBufferedDurationUs implementation obsoletes the purpose of getEstimatedDurationUs; remove getEstimatedDurationUs and its associated member variables. Finally replace calls to getEstimatedDurationUs with getBufferedDurationUs. Change-Id: I38f20df8e177ffbfe299b203d99076fc98dcd274
* | | | | Merge "HLS: remove no more than 10% of bandwidth history at a time"Chong Zhang2015-04-213-12/+53
|\ \ \ \ \
| * | | | | HLS: remove no more than 10% of bandwidth history at a timeChong Zhang2015-04-213-12/+53
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix a 'possible video time jump' after seek, don't update renderer anchor time for 0-sized audio buffers - fix another 'possible video time jump' caused by some states not reset in mStreams - bandwidth estimator changes to not remove more than 10% of total transfer duration at a time to avoid jumping up too quickly bug: 20267388 related-to-bug: 19864613 related-to-bug: 20138395 Change-Id: I8812332cd1e26bf562acfaf086fd679a3549debc
* | | | | Merge "audio policy: remove permission check for ports and patches getters"Eric Laurent2015-04-211-9/+0
|\ \ \ \ \
| * | | | | audio policy: remove permission check for ports and patches gettersEric Laurent2015-04-201-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove check for MODIFY_AUDIO_ROUTING permission in audio policy methods just getting devices or patches state. Change-Id: Id3bafc5ad0d0bd96210822243139898e314327d8
* | | | | | Merge "Fix mips build."Ying Wang2015-04-212-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix mips build.Ying Wang2015-04-202-2/+2
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I49aa83e38e90ebd20793885de9420de96062aa37
* | | | | Merge "media: ignore the result of linkToDeath, which can fail if called ↵Ronghua Wu2015-04-201-5/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | from same process."
| * | | | media: ignore the result of linkToDeath, which can fail if called from same ↵Ronghua Wu2015-04-201-5/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | process. Bug: 19620911 Change-Id: I6a25ed1ef1b2790d0976943ec129f31972e27714
* | | | Merge "stagefright: add a 2kb cache for CallbackDataSource."Chris Watkins2015-04-203-4/+80
|\ \ \ \ | |_|/ / |/| | |
| * | | stagefright: add a 2kb cache for CallbackDataSource.Chris Watkins2015-04-203-4/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without a cache the mediaserver does a lot of small reads which result in round trips through binder and jni to the app MediaDataSource. On a Nexus 5 I measured time to first frame from MediaPlayer for 1) 1350kbps h264, and 2) 20480kbps vp8. Without a cache, MediaDataSource was ~250ms slower than an fd. With a 2kb cache it's 30ms slower for (1) and 70ms slower for (2). Change-Id: If1e811db7b853c4f79430603318d4744ac30acb9
* | | | Merge "HLS: reduce number of guessed wrong seq numbers"Chong Zhang2015-04-187-191/+267
|\ \ \ \
| * | | | HLS: reduce number of guessed wrong seq numbersChong Zhang2015-04-177-191/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - account for playlist age in live streaming when calculating segment time - be more conservative on downswitching if bandwidth is unstable - adjust forward or backward if guessed wrong seq number - code refactor bug: 19567254 Change-Id: I0b61cea888fdffd1b3ee2446747ed10152e9e7d7
* | | | | am 4c85e16c: am d2dc1ea3: am 88574352: am 7725022e: Merge "SoftMPEG2: start ↵Lajos Molnar2015-04-182-5/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | output at first I-frame" * commit '4c85e16c9f7cbd9e9fa4713d62ed2c7f4da2f7d3': SoftMPEG2: start output at first I-frame
| * \ \ \ \ am d2dc1ea3: am 88574352: am 7725022e: Merge "SoftMPEG2: start output at ↵Lajos Molnar2015-04-182-5/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first I-frame" * commit 'd2dc1ea3a3426238b9dcb4b2fa17f98a1ac5beec': SoftMPEG2: start output at first I-frame
| | * \ \ \ \ am 88574352: am 7725022e: Merge "SoftMPEG2: start output at first I-frame"Lajos Molnar2015-04-172-5/+21
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88574352adec1af117d21bb6fadf85b3b9b2f4bc': SoftMPEG2: start output at first I-frame
| | | * \ \ \ \ am 7725022e: Merge "SoftMPEG2: start output at first I-frame"Lajos Molnar2015-04-172-5/+21
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7725022e8bbff4160e46055ebaa4128dff86821c': SoftMPEG2: start output at first I-frame
| | | | * \ \ \ \ Merge "SoftMPEG2: start output at first I-frame"Lajos Molnar2015-04-172-5/+21
| | | | |\ \ \ \ \
| | | | | * | | | | SoftMPEG2: start output at first I-frameVenkatarama Avadhani2015-04-172-5/+21
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes thumbnail generation for open GOP sequences Also add -Werror to this library to detect issues. Change-Id: I0136ca05070326c895fb3010b8e9557eac2d25df
* | | | | | | | | Merge "NuPlayer: queue a deferred scan sources when flushing during scan"Chong Zhang2015-04-187-31/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NuPlayer: queue a deferred scan sources when flushing during scanChong Zhang2015-04-177-31/+32
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also refactor code to move scheduleRequestBuffers to decoder base. bug: 20267388 Change-Id: I48f16adc6b4d4008f8fcda8b3b01c595ad199f8b
* | | | | | | | | Merge "libmediaplayerservice: fix warnings, make warnings errors, use clang"Lajos Molnar2015-04-1728-50/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | libmediaplayerservice: fix warnings, make warnings errors, use clangLajos Molnar2015-04-1728-50/+55
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b2f6b65c5abbc366068a60b8909104f31b94228
* | | | | | | | | Merge "stagefright: make more warnings errors"Lajos Molnar2015-04-1724-44/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stagefright: make more warnings errorsLajos Molnar2015-04-1724-44/+46
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b1ad60fbfb866dbf9c00843e06553c3eb25c113
* | | | | | | | | libmedia: fix all warning, make warnings errors, use clangLajos Molnar2015-04-1712-16/+16
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic00d2c5d0bbb1605e96666e25c9ccc22bea6d3ff
* | | | | | | | stagefright: warnings be gone, some are now errors, use clangLajos Molnar2015-04-1795-227/+295
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
* | | | | | | Merge "NuPlayerDriver: Maintain the timeStamp after seek"Wei Jia2015-04-171-0/+3
|\ \ \ \ \ \ \
| * | | | | | | NuPlayerDriver: Maintain the timeStamp after seekHaynes Mathew George2015-04-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While offload playback is going on, if user pause and seeks to new position before offload tear-down, on resume playback starts from old time-stamp. Once tear-down happens NuPlayer loses updated time-stamp so while resuming it resumes playback with stale time-stamp. Make sure the updated time-stamp is maintained in NuPlayerDriver which is used while starting the playback after resume. authored-by: Sharad Sangle <assangle@codeaurora.org> Change-Id: Ie125cf0fab1b0a237e67e43b0e5b4a704483ef99
* | | | | | | | Merge "stagefright: initial timed id3 support in hls"Robert Shih2015-04-1720-84/+402
|\ \ \ \ \ \ \ \
| * | | | | | | | stagefright: initial timed id3 support in hlsRobert Shih2015-04-1620-84/+402
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00a8a786b3f4b74742c34770edd94e937abe20a8
* | | | | | | | MediaSync: sanity check native sample rate.Wei Jia2015-04-161-0/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I0eb7a70c81c4fcc336f52f014eeb6d261ac2c501
* | | | | | | MediaCodec: hold input buffers during FLUSHED stateChong Zhang2015-04-162-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 20267388 Change-Id: I21a12cb2ebb74e17dcdb7b502c3f674e9e64b5dc
* | | | | | | Merge "Work around lack of pitch adjustment in Timestretcher"Andy Hung2015-04-161-12/+40
|\ \ \ \ \ \ \
| * | | | | | | Work around lack of pitch adjustment in TimestretcherAndy Hung2015-04-161-12/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3e057b97c250a826133248b6aa1ff9ed677d88df
* | | | | | | | am 6705a49f: am 541a9ac7: am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end ↵Marco Nelissen2015-04-164-1/+33
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of mpeg video to flush out final sample" * commit '6705a49f6481ad1728215a2a72472fe43c786cd0': Signal EOS at end of mpeg video to flush out final sample
| * | | | | | | am 541a9ac7: am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end of mpeg ↵Marco Nelissen2015-04-164-1/+33
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | video to flush out final sample" * commit '541a9ac77ecaa26449fcad5c116fb93657ca17c1': Signal EOS at end of mpeg video to flush out final sample
| | * | | | | | am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end of mpeg video to flush ↵Marco Nelissen2015-04-164-1/+33
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out final sample" * commit '8cd4132a85239fd318193e10c0817ac7784c304a': Signal EOS at end of mpeg video to flush out final sample
| | | * | | | | am 3f22f5a2: Merge "Signal EOS at end of mpeg video to flush out final sample"Marco Nelissen2015-04-164-1/+33
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | * commit '3f22f5a2d95699650a454041bcaa1d5a248cca88': Signal EOS at end of mpeg video to flush out final sample
| | | | * | | | Merge "Signal EOS at end of mpeg video to flush out final sample"Marco Nelissen2015-04-164-1/+33
| | | | |\ \ \ \
| | | | | * | | | Signal EOS at end of mpeg video to flush out final sampleMarco Nelissen2015-04-154-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27196a4a4b7fe37da52d3ee99da8cb80294d36d0
* | | | | | | | | Merge "Unhide the android.media.[Media]DataSource interface."Chris Watkins2015-04-1633-29/+552
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-1533-29/+552
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows apps to implement MediaDataSource, which is modeled on stagefright's DataSource, to supply media data to the framework. This was already implemented for MediaExtractor, but it was renamed from DataSource. MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new overload: #setDataSource(android.media.MediaDataSource) Only NuPlayer supports this new data source. The change introduces: * IDataSource: The binder interface for DataSource. * JMediaDataSource: The native counterpart to the java interface. It implements IDataSource. * CallbackDataSource: A stagefright DataSource that wraps an IDataSource. Change-Id: Ib3c944b49cc8a792c8eb9c85e5015c07f298ebc1
* | | | | | | | | Merge "CameraService: Add support for module init, some logging updates"Eino-Ville Talvala2015-04-164-72/+120
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | CameraService: Add support for module init, some logging updatesEino-Ville Talvala2015-04-154-72/+120
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add support for camera HAL module init() method on v2.4 - Add logging for service errors such as failure to init - Minor cleanup to dumping of event log Bug: 20016050 Change-Id: I94e18b52c186f16fb096457015f7ae761e867fd8
* | | | | | | | | am 5c16a387: am 382bcd5a: am 6a2dffb1: am 4491a4ab: Merge "libstagefright: ↵Lajos Molnar2015-04-161-0/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | free mMoovBoxBuffer" * commit '5c16a3877c0b32f21cbee7f1bdc77a2a4d2b79c6': libstagefright: free mMoovBoxBuffer
| * | | | | | | | am 382bcd5a: am 6a2dffb1: am 4491a4ab: Merge "libstagefright: free ↵Lajos Molnar2015-04-161-0/+2
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mMoovBoxBuffer" * commit '382bcd5a63d3edba3950e120e452f4dd42c608c2': libstagefright: free mMoovBoxBuffer
| | * | | | | | | am 6a2dffb1: am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '6a2dffb1c7a0e45388257bc5d2ec763f234f8cca': libstagefright: free mMoovBoxBuffer
| | | * | | | | | am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | * commit '4491a4ab2d6991baa1ce15f24025aa24430d15d1': libstagefright: free mMoovBoxBuffer
| | | | * | | | | Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | | | |\ \ \ \ \