summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Expand)AuthorAgeFilesLines
* am 4c56f8e0: am b65842dd: Merge "Fix NuPlayer assertion on failure to create ...Andy Hung2014-12-0810-82/+88
|\
| * 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
* | | am 7cc9a1c5: am 76c156f7: Merge "fix threading in RTSPSource and StreamingSou...Chong Zhang2014-12-084-39/+172
|\ \ \ | |/ /
| * | fix threading in RTSPSource and StreamingSourceChong Zhang2014-12-034-39/+172
| |/
* | am b783a705: am ab05b4cc: StreamingSource: check mTSParser before dereferenci...Wei Jia2014-12-031-0/+4
|\ \ | |/
| * StreamingSource: check mTSParser before dereferencing it.Wei Jia2014-12-021-0/+4
* | am 779d4164: am f1828910: nuplayer: clear pending audio access unit on flush.Ronghua Wu2014-12-022-6/+14
|\ \ | |/
| * nuplayer: clear pending audio access unit on flush.Ronghua Wu2014-12-012-6/+14
* | am 3253bef3: am d8731629: Merge "notify seek complete upon first video output...Chong Zhang2014-12-028-28/+107
|\ \ | |/
| * notify seek complete upon first video output frameChong Zhang2014-12-018-28/+107
* | am e9e6a930: am 3a8d7d10: Merge "tunnel NuPlayer source and decoder input" in...Chong Zhang2014-11-2113-1296/+1505
|\ \ | |/
| * 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
* | | am 2a424d6f: am 7966142a: Merge "NuPlayer: invalid anchor time when render is...Ronghua Wu2014-11-212-0/+8
|\ \ \ | |/ /
| * | 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
* | | am 9111465a: am ec9459c6: Merge "close fd if data source is reset without pre...Chong Zhang2014-11-211-1/+7
|\ \ \ | |/ /
| * | 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
* | | | am 9dad026b: am 574aed90: Merge "When aggregating buffers, make sure we don\'...Marco Nelissen2014-11-211-0/+6
|\ \ \ \ | |/ / /
| * | | 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
| | | |/ | | |/|
* | | | am 8ed5afa3: Merge "mediaplayer: request auto-frc for high quality avsync" in...Lajos Molnar2014-11-201-0/+13
|\ \ \ \ | |/ / /
| * | | mediaplayer: request auto-frc for high quality avsyncLajos Molnar2014-11-191-0/+13
* | | | am 0c999060: am 18899808: Merge "NuPlayer: open audio sink in offload mode wh...Ronghua Wu2014-11-193-5/+36
|\ \ \ \ | |/ / /
| * | | Merge "NuPlayer: open audio sink in offload mode when resuming from timeout t...Ronghua Wu2014-11-193-5/+36
| |\ \ \
| | * | | NuPlayer: open audio sink in offload mode when resuming from timeout teardown.Ronghua Wu2014-11-183-5/+36
| | |/ /
* | | | am db95b7db: am ba0790bf: Merge "Don\'t autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-191-0/+10
|\ \ \ \ | |/ / /
| * | | Merge "Don't autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-191-0/+10
| |\ \ \
| | * | | Don't autoloop notificationsMarco Nelissen2014-11-181-0/+10
| | |/ /
* | | | am 2f65ada8: am 993d57ec: Merge "NuPlayer: pass media time to selectTrack for...Robert Shih2014-11-198-13/+39
|\ \ \ \ | |/ / /
| * | | NuPlayer: pass media time to selectTrack for responsivenessRobert Shih2014-11-198-13/+39
| |/ /
* | | am efd33e8d: am 35b0f709: Merge "Fix missing mutex lock in Drm::binderDied" i...Jeff Tinker2014-11-181-1/+5
|\ \ \ | |/ /
| * | 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
* | | | am 1c764234: am 88ec9e99: Merge "Fix race condition in signaling completion f...Andy Hung2014-11-181-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "Fix race condition in signaling completion for decode." into lmp-mr1-devAndy Hung2014-11-171-0/+1
| |\ \ \
| | * | | Fix race condition in signaling completion for decode.Andy Hung2014-11-171-0/+1
* | | | | am 811a92f6: am 39b109a1: Merge "NuPlayer HTTPLiveSource: impl getSelectedTra...Robert Shih2014-11-182-0/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-devRobert Shih2014-11-172-0/+9
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | NuPlayer HTTPLiveSource: impl getSelectedTrackRobert Shih2014-11-062-0/+9
* | | | | am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-172-2/+1
|\ \ \ \ \
| * | | | | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-172-2/+1
* | | | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-172-4/+3
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-172-4/+3
* | | | | NuPlayer: tunnel decoder with renderer for data buffer passing.Wei Jia2014-11-146-123/+204
| |_|/ / |/| | |
* | | | Merge "Revert "mediaplayer: make frame-accurate avsync configurable"" into lm...Lajos Molnar2014-11-131-20/+0
|\ \ \ \
| * | | | Revert "mediaplayer: make frame-accurate avsync configurable"Lajos Molnar2014-11-071-20/+0
* | | | | Fix looping sound playbackMarco Nelissen2014-11-111-0/+5