summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| | | | | | | | | | | | | | | | | | | | Bug: 19265536 Change-Id: Ie35184f99c51e7bd94d7c826ffb8e89040a81905
* | | | Merge "drm: fix clang warning"Ronghua Wu2015-03-091-1/+1
|\ \ \ \
| * | | | drm: fix clang warningRonghua Wu2015-03-091-1/+1
| |/ / / | | | | | | | | | | | | | | | | Bug: 19265536 Change-Id: Ic22368d1bed5d4226f6be4011a377b57787ac322
* | | | Merge "Defensively check for batterystats service instead of blocking to get ↵Warren Rehman2015-03-091-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | it."
| * | | | Defensively check for batterystats service instead of blocking to get it.Warren Rehman2015-03-051-1/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19189826 Change-Id: I656e863eb68edf22812eb380ec6cd4105f4000aa On branch checkbattstats Changes to be committed: modified: MediaPlayerService.cpp
* | | | libmediaplayerservice: fix make file for 64bit build.Ronghua Wu2015-03-061-9/+2
| |/ / |/| | | | | | | | | | | Bug: 19265536 Change-Id: I5fa9ca39909b8ae2d6c2da8ac9fd3c4f9863b1f3
* | | Merge "Add DRM session manager."Ronghua Wu2015-03-067-0/+657
|\ \ \
| * | | Add DRM session manager.Ronghua Wu2015-03-067-0/+657
| | | | | | | | | | | | | | | | | | | | Bug: 19265536 Change-Id: Ia9f2c94c64ed6c1fe99d54de81d71c8973994865
* | | | media: switch to new AMessage handlingLajos Molnar2015-03-0511-82/+82
| | | | | | | | | | | | | | | | | | | | Bug: 19607784 Change-Id: I94cddcb81f671422ad4982a23dc4acfe57a9f1aa
* | | | Merge "Revert "Fix NuPlayer::Decoder input buffer loss upon seamless format ↵Robert Shih2015-03-061-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | change""
| * | | | Revert "Fix NuPlayer::Decoder input buffer loss upon seamless format change"Robert Shih2015-03-041-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c5eef08195a6f81c2ae8fe7d4c346f12b15944e5. Change-Id: I49d817ed367aaa29a93e22135e9adf1e2ad253f1
* | | | | mediaplayer: call setPlaybackRate after Renderer has looper set up.Wei Jia2015-03-041-4/+3
| |_|_|/ |/| | | | | | | | | | | | | | | Bug: 19196501 Change-Id: Iaac34a4a9e095799eb60e7d7a9bc228f0c7212b6
* | | | 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
| | | | | | | | | | | | | | | | | | | | Bug: 19462710 Change-Id: I30f2ab76785a524e95b404b8b18ddc862e9c414e
* | | | mediaplayer: use non-blocking mode for AudioSink::write().Wei Jia2015-03-033-19/+19
| |_|/ |/| | | | | | | | | | | | | | | | | This cherry picks https://googleplex-android-review.git.corp.google.com/#/c/643541/ to master. Bug: 19448263 Change-Id: I43dea830212de79c2b080185b6c6b36078f517d2
* | | Merge "mediaplayer: support dynamic playback rate"Wei Jia2015-02-2510-68/+152
|\ \ \
| * | | mediaplayer: support dynamic playback rateWei Jia2015-02-2410-68/+152
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I856b1507d5fa2cedfb645706d2435683a7d3e050
* | | | MediaRecorder: pass capture fps in floatChong Zhang2015-02-232-10/+38
| | | | | | | | | | | | | | | | | | | | | | | | bug: 19460202 Change-Id: Ic8f2dc02dfd482c4b2065b16e28721fc6e3cf696
* | | | 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
| |/ / / | | | | | | | | | | | | | | | | | | | | bug: 19460202 Change-Id: I3a6ea3a5149d124ca9a2487a300dcc2db4405d0f
* | | | nuplayer: do not use cached source for wvm contentChong Zhang2015-02-231-23/+32
|/ / / | | | | | | | | | | | | bug: 18730095 Change-Id: Ibd4f54907949daae1d095fa0922050310d16698f
* | | am a7c1df10: am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-181-3/+13
|\ \ \ | | | | | | | | | | | | | | | | * commit 'a7c1df10d39a8056ca755ccd77b06816c6de3225': Add dumpsys info
| * \ \ am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-181-3/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'a963dacc1b44ec80742c86ce75611eb9cfa936ea': Add dumpsys info
| | * \ \ am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-181-3/+13
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '64753517e8ee315654441512a1f59b28fe5c1bc1': Add dumpsys info
| | | * | | Add dumpsys infoMarco Nelissen2015-02-181-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print a list of looper-handler pairs and the number of messages they've processed, and optionally break those stats out by message type. Change-Id: I68ce4a7003152d5c9b5cb3f42e6f3949b471aa6e
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19297083 Change-Id: I5b89e35cc2bd5fb2f332872941e7978f15a6f403
* | | | | | resolved conflicts for merge of 157defdd to masterLajos Molnar2015-02-102-1/+16
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: I14fd8063fa052f16868b8053a211190092131317
| * | | | | am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload ↵Lajos Molnar2015-02-102-1/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pause timeout" into lmp-mr1-dev * commit '4fc5d758d6722bedf341e5d93a0ba5698c658c29': nuplayer: acquire wakelock during offload pause timeout
| | * | | | | nuplayer: acquire wakelock during offload pause timeoutWeiyin Jiang2015-02-062-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hold a wakelock while paused in audio offload mode, until audio teardown event is received, or pause is canceled. Since ARM cores are sleeping, the delayed AMessage will not be received, and the audio output driver will not be closed. This blocks XO shutdown. Bug: 19297092 Change-Id: I3d11fef633e3f2783f4aa31e71285e2fa09d234c
* | | | | | | StageFrightRecorder: update setVideoFrameRate sanity checkZhijun He2015-02-092-1/+3
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow high speed recording fps to be up to 1000fps Change-Id: I975d11b8a9abbd50ce6982fb46f4a4a3a035e475
* | | | | | am 78a0d1ac: am 04d2804a: am 13cfe85a: Merge "reuse CCDecoder on video ↵Chong Zhang2015-02-061-1/+3
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | | | | | | | | | | discontinuity" into lmp-mr1-dev * commit '78a0d1acd4cb7103bba349f8a23fd1814bed483b': reuse CCDecoder on video discontinuity
| * | | | am 04d2804a: am 13cfe85a: Merge "reuse CCDecoder on video discontinuity" ↵Chong Zhang2015-02-061-1/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '04d2804a212c2625425cb23b2b778ab4f3683769': reuse CCDecoder on video discontinuity
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19266084 Change-Id: I06ef57b09b048a85f77be4dee27599c4f60aacc9
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix some racing conditions, remove unused code in NuPlayerRenderer. This obsoletes https://googleplex-android-review.git.corp.google.com/#/c/609880/. Bug: 19196501 Change-Id: I0eebeb573ce7229dd8bacecd0e1c5d6f5634a72f
* | | | | | | am 07840f75: am 3a7ed550: am efbb6195: NuPlayer: pause playback when ↵Chong Zhang2015-02-045-33/+250
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | buffering is low * commit '07840f7544de883fe5c00cbd18bc6458a20e2691': NuPlayer: pause playback when buffering is low
| * | | | | am 3a7ed550: am efbb6195: NuPlayer: pause playback when buffering is lowChong Zhang2015-02-045-33/+250
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '3a7ed550579b5ecd99439c44ce13a48b3f0639ae': NuPlayer: pause playback when buffering is low
| | * | | | NuPlayer: pause playback when buffering is lowChong Zhang2015-02-035-33/+250
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fix buffering percentage report (should be the buffered position) bug: 18730095 Change-Id: I11e7ca4ba9e772a1ae76861ca1ff1725b62f65ae
* | | | | am 82bbd248: am c37a6e6b: am 7a434265: Merge "Wrong format used in seamless ↵Robert Shih2015-02-021-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | check" into lmp-mr1-dev * commit '82bbd248d0578e5da04aa95d9906006275c330b5': Wrong format used in seamless check
| * | | | am c37a6e6b: am 7a434265: Merge "Wrong format used in seamless check" into ↵Robert Shih2015-02-021-4/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'c37a6e6bbe038cf94d11abdb6f8003e7476e11af': Wrong format used in seamless check
| | * | | Merge "Wrong format used in seamless check" into lmp-mr1-devRobert Shih2015-01-311-4/+4
| | |\ \ \
| | | * | | Wrong format used in seamless checkjoakim johansson2015-01-301-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The targetFormat that is sent to supportsSeamlessFormatChange function corresponds to the data in mInputFormat but the format provided is the output format, so the check will always return false. Use the input format instead. Bug: 18821145 Change-Id: Iea3cbd59e423da5f2f813e98505b40dc341061b8
* | | | | | am 5fcd4d19: am 0bd5274e: am 231406d5: NuPlayerRenderer: return current real ↵Wei Jia2015-01-282-15/+18
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time as render time for video frame when paused. * commit '5fcd4d19e95d5237fef46b1dec8b6f649ea64b84': NuPlayerRenderer: return current real time as render time for video frame when paused.
| * | | | | am 0bd5274e: am 231406d5: NuPlayerRenderer: return current real time as ↵Wei Jia2015-01-282-15/+18
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | render time for video frame when paused. * commit '0bd5274ef93eae389cd7da89e163b1a5b67a47e1': NuPlayerRenderer: return current real time as render time for video frame when paused.
| | * | | | NuPlayerRenderer: return current real time as render time for video frame ↵Wei Jia2015-01-272-15/+18
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when paused. This allows video to display immediately during seeking in paused state. Also fix some racing condition. Bug: 19153026 Change-Id: I0d7a8981ca3c121f5dbc430c2c6d8b7522edc24a
* | | | | resolved conflicts for merge of 9391844d to masterMarco Nelissen2015-01-273-404/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I348a71d1b3e3238bc3871a69454edc8247d03111
| * | | | resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-273-404/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: I385371869169eee4fe6330ffe0abc5eda4cb4f72
generated by cgit v1.1 at 2024-06-08 12:58:05 +0000