summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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
| | * | | am 47deb15e: Merge "Remove MediaPlayerService::decode()"Marco Nelissen2015-01-273-401/+12
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit '47deb15e99cbf60e558027e074b7415c95637943': Remove MediaPlayerService::decode()
| | | * | Remove MediaPlayerService::decode()Marco Nelissen2015-01-263-401/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and make SoundPool use MediaCodec for decoding files to PCM. Bug: 18239054 Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
* | | | | am 4beddcf5: am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if ↵Chong Zhang2015-01-161-2/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | it\'s not available" into lmp-mr1-dev * commit '4beddcf5130bd24847c1e87696f864df41d42cae': do not use paused postition if it's not available
| * | | | am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if it\'s not ↵Chong Zhang2015-01-161-2/+8
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | available" into lmp-mr1-dev * commit '9e308de9214e55dd0d102484ea44b117ec050540': do not use paused postition if it's not available
| | * | | Merge "do not use paused postition if it's not available" into lmp-mr1-devChong Zhang2015-01-161-2/+8
| | |\ \ \
| | | * | | do not use paused postition if it's not availableChong Zhang2015-01-151-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18896133 bug: 18996505 Change-Id: I1e24fabe3fe8f2275b1ccc0df100cb2c4ba2264b
| | * | | | MidiFile: report correct state during transient period when start() is ↵Wei Jia2015-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called first time. Bug: 18905421 Bug: 18994222 Change-Id: Iee47043e60740fab9e62aa28db4cbcec4f339c22
| * | | | | am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-138-880/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit 'cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f': Replace MidiFile player with a Midi extractor
| | * | | | am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-138-880/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | * commit '724b9ea51db0c191cc3184319719a38b5a1f6502': Replace MidiFile player with a Midi extractor
| | | * | | Replace MidiFile player with a Midi extractorMarco Nelissen2015-01-088-880/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets rids of a bunch of special midi handling and replaces it with an extractor that works with NuPlayer and MediaMetadataRetriever. Change-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217
| * | | | | resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-083-34/+12
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Change-Id: Ic9841f0a66930f57a5ebea527c6a841d7c49cccf
| | * | | | am c52af00b: Merge "Use callbacks for Midi I/O"Marco Nelissen2015-01-083-34/+14
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'c52af00beda4477d0fd00c3071e6ffd9c465430b': Use callbacks for Midi I/O
| | | * | | Use callbacks for Midi I/OMarco Nelissen2015-01-083-34/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having the Sonivox engine directly open the file and use stdio to read from it, use caller-provided callbacks. Change-Id: Ie55129109060a4a7862fee3177f994401e00b6c1
* | | | | | am 7993d6b3: am e0344754: am 468977f0: Merge "mark any copyrighted content ↵Chong Zhang2015-01-083-0/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as protected to disable capture" into lmp-mr1-dev * commit '7993d6b343f2723872dac085756743630371454d': mark any copyrighted content as protected to disable capture
| * | | | | am e0344754: am 468977f0: Merge "mark any copyrighted content as protected ↵Chong Zhang2015-01-083-0/+6
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | to disable capture" into lmp-mr1-dev * commit 'e03447548d1c56fa9875cac7d500f1012a6b5c26': mark any copyrighted content as protected to disable capture
| | * | | | mark any copyrighted content as protected to disable captureChong Zhang2015-01-073-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18916274 Change-Id: I23f096b51433bf18a10dc5fe6dc6b75c3881c340
* | | | | | am 545d5c41: am 69bdf92f: am 0d19abb4: Merge "NuPlayer: Do not recreate ↵Andy Hung2014-12-292-0/+39
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack if not needed" into lmp-mr1-dev * commit '545d5c41f04ec591bd0f034434b6d65ffd4c4c9c': NuPlayer: Do not recreate AudioTrack if not needed
| * | | | | am 69bdf92f: am 0d19abb4: Merge "NuPlayer: Do not recreate AudioTrack if not ↵Andy Hung2014-12-292-0/+39
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | needed" into lmp-mr1-dev * commit '69bdf92f3e20147a08194da45e3c61ac7f16d280': NuPlayer: Do not recreate AudioTrack if not needed
| | * | | | Merge "NuPlayer: Do not recreate AudioTrack if not needed" into lmp-mr1-devAndy Hung2014-12-232-0/+39
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | NuPlayer: Do not recreate AudioTrack if not neededAndy Hung2014-12-192-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On output format change from the decoder, check if a new audio track is really needed. This prevents excessive track creation/destruction during seeks. Bug: 18817027 Change-Id: I4290dcb90cb35bc1303b025e162f6b813d49a05b
generated by cgit v1.1 at 2024-06-08 09:21:31 +0000