summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Expand)AuthorAgeFilesLines
* Merge "nuplayer: remove prefill cache code"Chong Zhang2015-03-122-104/+27
|\
| * nuplayer: remove prefill cache codeChong Zhang2015-03-122-104/+27
* | Merge "NuPlayer: play out pending frames on discontinuity"Chong Zhang2015-03-126-59/+102
|\ \ | |/ |/|
| * NuPlayer: play out pending frames on discontinuityChong Zhang2015-03-106-59/+102
* | Merge "libmediaplayerservice: fix deadlock in dump()"Vineeta Srivastava2015-03-111-0/+5
|\ \
| * | libmediaplayerservice: fix deadlock in dump()Ravi Kumar Alamanda2015-03-111-0/+5
* | | Merge "mediaplayer: update mAnchorNumFramesWritten when anchor time is updated."Wei Jia2015-03-111-0/+1
|\ \ \
| * | | mediaplayer: update mAnchorNumFramesWritten when anchor time is updated.Wei Jia2015-03-111-0/+1
* | | | stagefright: don't use ALooperRoster mutex for reply handlingLajos Molnar2015-03-106-13/+14
|/ / /
* | | Merge "mediaplayer: move MediaClock from NuPlayer to libstagefright."Wei Jia2015-03-104-219/+1
|\ \ \ | |_|/ |/| |
| * | mediaplayer: move MediaClock from NuPlayer to libstagefright.Wei Jia2015-03-094-219/+1
* | | Merge "drm: use DrmSessionManager for session resource managing."Ronghua Wu2015-03-096-23/+135
|\ \ \
| * | | drm: use DrmSessionManager for session resource managing.Ronghua Wu2015-03-066-23/+135
* | | | Merge "drm: fix clang warning"Ronghua Wu2015-03-091-1/+1
|\ \ \ \
| * | | | drm: fix clang warningRonghua Wu2015-03-091-1/+1
| |/ / /
* | | | Merge "Defensively check for batterystats service instead of blocking to get ...Warren Rehman2015-03-091-1/+2
|\ \ \ \
| * | | | Defensively check for batterystats service instead of blocking to get it.Warren Rehman2015-03-051-1/+2
| | |_|/ | |/| |
* | | | libmediaplayerservice: fix make file for 64bit build.Ronghua Wu2015-03-061-9/+2
| |/ / |/| |
* | | Merge "Add DRM session manager."Ronghua Wu2015-03-067-0/+657
|\ \ \
| * | | Add DRM session manager.Ronghua Wu2015-03-067-0/+657
* | | | media: switch to new AMessage handlingLajos Molnar2015-03-0511-82/+82
* | | | Merge "Revert "Fix NuPlayer::Decoder input buffer loss upon seamless format c...Robert Shih2015-03-061-3/+6
|\ \ \ \
| * | | | Revert "Fix NuPlayer::Decoder input buffer loss upon seamless format change"Robert Shih2015-03-041-3/+6
* | | | | mediaplayer: call setPlaybackRate after Renderer has looper set up.Wei Jia2015-03-041-4/+3
| |_|_|/ |/| | |
* | | | Merge "Fix NuPlayer::Decoder input buffer loss upon seamless format change"Robert Shih2015-03-041-6/+3
|\ \ \ \ | |/ / /
| * | | Fix NuPlayer::Decoder input buffer loss upon seamless format changeRobert Shih2015-02-201-6/+3
* | | | mediaplayer: use non-blocking mode for AudioSink::write().Wei Jia2015-03-033-19/+19
| |_|/ |/| |
* | | Merge "mediaplayer: support dynamic playback rate"Wei Jia2015-02-2510-68/+152
|\ \ \
| * | | mediaplayer: support dynamic playback rateWei Jia2015-02-2410-68/+152
* | | | MediaRecorder: pass capture fps in floatChong Zhang2015-02-232-10/+38
* | | | Merge "MPEG4Writer: add capture fps in meta data"Chong Zhang2015-02-231-5/+9
|\ \ \ \
| * | | | MPEG4Writer: add capture fps in meta dataChong Zhang2015-02-231-5/+9
| |/ / /
* | | | nuplayer: do not use cached source for wvm contentChong Zhang2015-02-231-23/+32
|/ / /
* | | am a7c1df10: am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-181-3/+13
|\ \ \
| * \ \ am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-181-3/+13
| |\ \ \
| | * \ \ am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-181-3/+13
| | |\ \ \
| | | * | | Add dumpsys infoMarco Nelissen2015-02-181-3/+13
* | | | | | Merge "process all SEI messages for CC extraction"Chong Zhang2015-02-122-19/+48
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | process all SEI messages for CC extractionChong Zhang2015-02-122-19/+48
* | | | | | resolved conflicts for merge of 157defdd to masterLajos Molnar2015-02-102-1/+16
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pa...Lajos Molnar2015-02-102-1/+10
| |\ \ \ \ \
| | * | | | | nuplayer: acquire wakelock during offload pause timeoutWeiyin Jiang2015-02-062-1/+10
* | | | | | | StageFrightRecorder: update setVideoFrameRate sanity checkZhijun He2015-02-092-1/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | am 78a0d1ac: am 04d2804a: am 13cfe85a: Merge "reuse CCDecoder on video discon...Chong Zhang2015-02-061-1/+3
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | am 04d2804a: am 13cfe85a: Merge "reuse CCDecoder on video discontinuity" into...Chong Zhang2015-02-061-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-devChong Zhang2015-02-041-1/+3
| | |\ \ \
| | | * | | reuse CCDecoder on video discontinuityChong Zhang2015-02-041-1/+3
* | | | | | Merge "mediaplayer: Add MediaClock component and use it in NuPlayerRenderer."Wei Jia2015-02-045-295/+396
|\ \ \ \ \ \
| * | | | | | mediaplayer: Add MediaClock component and use it in NuPlayerRenderer.Wei Jia2015-02-035-295/+396
* | | | | | | am 07840f75: am 3a7ed550: am efbb6195: NuPlayer: pause playback when bufferin...Chong Zhang2015-02-045-33/+250
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /