summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
* am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface before ↵Lajos Molnar2014-12-111-1/+1
|\ | | | | | | | | | | | | setDataSource * commit '2253b3c50ee4b89349553f42edf676ce8579e680': mediaplayer: allow setVideoSurface before setDataSource
| * mediaplayer: allow setVideoSurface before setDataSourceLajos Molnar2014-12-101-1/+1
| | | | | | | | | | Bug: 18709604 Change-Id: I41e4734faed48b5583feb29896cd5783b8cd7e33
* | am 2a0f484e: am a04c05ab: Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
|\ \ | | | | | | | | | | | | * commit '2a0f484e7d95490274e77cd4adc01592cfdf6e3a': Truncate file before recording into it.
| * \ Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
| |\ \
| | * | Truncate file before recording into it.Marco Nelissen2014-12-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recording into an existing file of non-zero length could leave old data in the file after the recording ends. Best case that wastes space, worst case it results in a file that's considered corrupt on playback. Change-Id: I2c77a107603b2b36790958360ff0856c2b28d677
* | | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-091-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f143b60856d275a9dcda1f3084c768655b242022': Fix build with clang in C++11 mode
| * | | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the deprecated register keyword in many places, fixes one instance of passing '\0' where a char* is expected, and 2 switch type narrowing issues. Change-Id: Ie265ac26ff6a61267ad6406dfe237226d97ca9ac Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | am 0b672c8b: am ca7b4bc4: mediaplayerservice: add support for legacy DRMLajos Molnar2014-12-081-3/+32
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '0b672c8bc2d96db90c97cf3673e2d3650c96d945': mediaplayerservice: add support for legacy DRM
| * | | mediaplayerservice: add support for legacy DRMLajos Molnar2014-12-051-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Legacy DRM uses AwesomePlayer for widevine content. Bug: 18006370 Change-Id: I1de9e33de51b60352a9c79c2dcedec330160abe4
* | | | am 2b02f140: am 80c57d57: Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs ↵Wei Jia2014-12-084-1/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | when anchor time is changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev * commit '2b02f140d6a54ec2a704449463eb2c1ba760ddfb': NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition.
| * | | Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is ↵Wei Jia2014-12-064-1/+16
| |\ \ \ | | | | | | | | | | | | | | | changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev
| | * | | NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to ↵Wei Jia2014-12-054-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix pause-seek-getCurrentPosition. NuPlayerDecoder: Notify resume is done when EOS is reached. GenericSource: add code to signal pre-roll for seek so that it will seek to the requested position, not only I-frame. This code is disabled temporarily till we have a full solution to handle both single seek and continous seek gracefully. Bug: 18625723 Change-Id: I99a54d4d549e0d805e3abcc227fbf96c16405af0
* | | | | am 876c21b1: am a147c17a: Merge "fixes for non-secure widevine playback" ↵Chong Zhang2014-12-082-13/+32
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '876c21b1c10c953fac6acefdfb2cb8658cb462db': fixes for non-secure widevine playback
| * | | | fixes for non-secure widevine playbackChong Zhang2014-12-052-13/+32
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - separate secure decoding from widevine - use non-blocking mode when reading from widevine source - schedule buffer read when packet source is empty bug: 18536934 Change-Id: I65a8e5e819975ca6900ed8e887a442940f2d5d38
* | | | am 4c56f8e0: am b65842dd: Merge "Fix NuPlayer assertion on failure to create ↵Andy Hung2014-12-0810-82/+88
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | AudioTrack" into lmp-mr1-dev * commit '4c56f8e0329cbdd0f3406bde96fc6f0bba65664d': Fix NuPlayer assertion on failure to create AudioTrack
| * | | Merge "Fix NuPlayer assertion on failure to create AudioTrack" into lmp-mr1-devAndy Hung2014-12-0510-82/+88
| |\ \ \
| | * | | Fix NuPlayer assertion on failure to create AudioTrackAndy Hung2014-12-0310-82/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under heavy media load or monkey/stress testing, more than 32 AudioTracks may be created or memory resources may be scarce. Remove the assertion on failure to create AudioTrack and signal MEDIA_ERROR. Bug: 17319843 Change-Id: I5d4e200b5f50d800046851a33e035cdc6ff10075
* | | | | am 7cc9a1c5: am 76c156f7: Merge "fix threading in RTSPSource and ↵Chong Zhang2014-12-084-39/+172
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | StreamingSource" into lmp-mr1-dev * commit '7cc9a1c59af8a583d33971c0d12e32dc66f742a5': fix threading in RTSPSource and StreamingSource
| * | | | fix threading in RTSPSource and StreamingSourceChong Zhang2014-12-034-39/+172
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 18532335 Change-Id: I9c34401a928dc0ddbd0923aa5f127dc628efbb92
* | | | am b783a705: am ab05b4cc: StreamingSource: check mTSParser before ↵Wei Jia2014-12-031-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | dereferencing it. * commit 'b783a70593c85493a2578dd8fbd7935f1bf00420': StreamingSource: check mTSParser before dereferencing it.
| * | | StreamingSource: check mTSParser before dereferencing it.Wei Jia2014-12-021-0/+4
| | | | | | | | | | | | | | | | | | | | Bug: 18532335 Change-Id: I7819d8d359fe75ea4c827138e9aaa2454ccfe3b1
* | | | am 779d4164: am f1828910: nuplayer: clear pending audio access unit on flush.Ronghua Wu2014-12-022-6/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '779d41640615177524ecc8ce5cef4113de0c8ca2': nuplayer: clear pending audio access unit on flush.
| * | | nuplayer: clear pending audio access unit on flush.Ronghua Wu2014-12-012-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add flag to avoid reading on flush. Bug: 18540219 Change-Id: I2fc351c32c87db9a8c8c2aad12ee2bd56a0370ab
* | | | am 3253bef3: am d8731629: Merge "notify seek complete upon first video ↵Chong Zhang2014-12-028-28/+107
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | output frame" into lmp-mr1-dev * commit '3253bef38cd6653768e7858f95d8baf371d58bf0': notify seek complete upon first video output frame
| * | | notify seek complete upon first video output frameChong Zhang2014-12-018-28/+107
| | | | | | | | | | | | | | | | | | | | Bug: 18541814 Change-Id: Ie4e0976885f26eb253460eab371cb181ea85f2db
* | | | am e9e6a930: am 3a8d7d10: Merge "tunnel NuPlayer source and decoder input" ↵Chong Zhang2014-11-2113-1296/+1505
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'e9e6a9306c42e0902d31f32dffc75135ff9dca49': tunnel NuPlayer source and decoder input
| * | | Merge "tunnel NuPlayer source and decoder input" into lmp-mr1-devChong Zhang2014-11-2113-1296/+1505
| |\ \ \
| | * | | tunnel NuPlayer source and decoder inputChong Zhang2014-11-2013-1296/+1505
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18342383 Change-Id: Ieff1cd3bad2b39d46f127ddd5d5139b919992461
* | | | | am 2a424d6f: am 7966142a: Merge "NuPlayer: invalid anchor time when render ↵Ronghua Wu2014-11-212-0/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | is flushed." into lmp-mr1-dev * commit '2a424d6fdccc6152ae855025996beef39f20c6df': NuPlayer: invalid anchor time when render is flushed.
| * | | | Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-devRonghua Wu2014-11-202-0/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | NuPlayer: invalid anchor time when render is flushed.Ronghua Wu2014-11-192-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rememeber the pause time in NuPlayerDriver. Bug: 18436336 Change-Id: If09f680a0d0f9137bd55c5f94201eb3aa783278a
* | | | | am 9111465a: am ec9459c6: Merge "close fd if data source is reset without ↵Chong Zhang2014-11-211-1/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | prepare" into lmp-mr1-dev * commit '9111465a5f4a0bed8747da594070f35010644979': close fd if data source is reset without prepare
| * | | | Merge "close fd if data source is reset without prepare" into lmp-mr1-devChong Zhang2014-11-201-1/+7
| |\ \ \ \
| | * | | | close fd if data source is reset without prepareChong Zhang2014-11-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18434887 Change-Id: I70dff721710b7299d1ca1f8520278f82d355141d
* | | | | | am 9dad026b: am 574aed90: Merge "When aggregating buffers, make sure we ↵Marco Nelissen2014-11-211-0/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don\'t lose data" into lmp-mr1-dev * commit '9dad026b7c69add31e1cab48774223236efe801e': When aggregating buffers, make sure we don't lose data
| * | | | | Merge "When aggregating buffers, make sure we don't lose data" into lmp-mr1-devMarco Nelissen2014-11-201-0/+6
| |\ \ \ \ \
| | * | | | | When aggregating buffers, make sure we don't lose dataMarco Nelissen2014-11-191-0/+6
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 18277034 Change-Id: Ia8c35791eea88545a873cad339eb6b5fc25d1d97
* | | | | | am 8ed5afa3: Merge "mediaplayer: request auto-frc for high quality avsync" ↵Lajos Molnar2014-11-201-0/+13
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 225f4f6 * commit '225f4f6d458331c26e2015a593079c45942520e3': mediaplayer: request auto-frc for high quality avsync
| * | | | | mediaplayer: request auto-frc for high quality avsyncLajos Molnar2014-11-191-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17383204 Change-Id: I7209305b4ff3c2386019d7a09d6a0536e9f21522
* | | | | | am 0c999060: am 18899808: Merge "NuPlayer: open audio sink in offload mode ↵Ronghua Wu2014-11-193-5/+36
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when resuming from timeout teardown." into lmp-mr1-dev * commit '0c999060549796ccd13aefc00ece993500d8931f': NuPlayer: open audio sink in offload mode when resuming from timeout teardown.
| * | | | | Merge "NuPlayer: open audio sink in offload mode when resuming from timeout ↵Ronghua Wu2014-11-193-5/+36
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | teardown." into lmp-mr1-dev
| | * | | | | NuPlayer: open audio sink in offload mode when resuming from timeout teardown.Ronghua Wu2014-11-183-5/+36
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also always recheck if a new stream can do offload. Bug: 18154425 Change-Id: I121877834bd963eeeba91a2b951fd30d5dc36a8b
* | | | | | am db95b7db: am ba0790bf: Merge "Don\'t autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-191-0/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'db95b7dbba21fc0b1112f9c362d4d942dddefba0': Don't autoloop notifications
| * | | | | Merge "Don't autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-191-0/+10
| |\ \ \ \ \
| | * | | | | Don't autoloop notificationsMarco Nelissen2014-11-181-0/+10
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some apps think it's cool to use ringtones as notification sounds, but ringtones often loop, which is not appropriate for notifications. Bug: 15929273 Change-Id: I77c4277801cb2561743f8c676ef76ab4d1668b08
* | | | | | am 2f65ada8: am 993d57ec: Merge "NuPlayer: pass media time to selectTrack ↵Robert Shih2014-11-198-13/+39
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for responsiveness" into lmp-mr1-dev * commit '2f65ada84cced6704e8fcdb03835fe218d917fcb': NuPlayer: pass media time to selectTrack for responsiveness
| * | | | | NuPlayer: pass media time to selectTrack for responsivenessRobert Shih2014-11-198-13/+39
| |/ / / / | | | | | | | | | | | | | | | Bug: 18020001 Change-Id: Id50f8473992f39d8c0aa86a1fabb2601093d2572
* | | | | am efd33e8d: am 35b0f709: Merge "Fix missing mutex lock in Drm::binderDied" ↵Jeff Tinker2014-11-181-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'efd33e8da29243b6bddf3f787034960b0717de90': Fix missing mutex lock in Drm::binderDied
| * | | | Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-devJeff Tinker2014-11-181-1/+5
| |\ \ \ \
| | * | | | Fix missing mutex lock in Drm::binderDiedJeff Tinker2014-11-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18194977 Change-Id: Ie6107a34237577c3b9cc6507d507f5c51f49fcf6
generated by cgit v1.1 at 2024-08-03 23:02:15 +0000