summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer
Commit message (Collapse)AuthorAgeFilesLines
* mediaplayer: check existence of AudioTrack before trying to access it.Wei Jia2015-03-191-1/+11
| | | | | Bug: 19828971 Change-Id: Ib7fdb8bf36e33ef95d21fa5342cd1647fd81ff24
* Merge "nuplayer: remove prefill cache code"Chong Zhang2015-03-122-104/+27
|\
| * nuplayer: remove prefill cache codeChong Zhang2015-03-122-104/+27
| | | | | | | | | | | | | | | | | | | | it's only needed if we post Reset to GenericSource's looper, but we now do reset outside NuPlayer or GenericSource's looper. also don't allow buffering percentage to go backward unless there's seek or pause. Change-Id: I1a39df4bc0a685f76d8558c368db1bac92b490c2
* | 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
| | | | | | | | | | | | bug: 19567254 Change-Id: Iff689e1eea54283095068d68bcdff4c2674af554
* | 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
| | | | | | | | | | | | | | | | | | | | | This will fix the max duration for anchor time. Bug: 19196501 Change-Id: I9b8e0775105e31d47d919afaf49ca1e3d608a2f6
* | | stagefright: don't use ALooperRoster mutex for reply handlingLajos Molnar2015-03-106-13/+14
|/ / | | | | | | | | | | | | | | Change replyID-s from uint32_t to an object Move reply handling into the loopers (to reuse a common mutex) Bug: 19607784 Change-Id: Iaa035b846c424c5687ed17ce1079b325e86c54be
* | 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
| | | | | | | | | | Bug: 19666434 Change-Id: I86865e594226419bbbbee217098f96434e43afbe
* | 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-031-16/+16
| | | | | | | | | | | | | | 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-258-68/+143
|\ \
| * | mediaplayer: support dynamic playback rateWei Jia2015-02-248-68/+143
| | | | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I856b1507d5fa2cedfb645706d2435683a7d3e050
* | | nuplayer: do not use cached source for wvm contentChong Zhang2015-02-231-23/+32
|/ / | | | | | | | | bug: 18730095 Change-Id: Ibd4f54907949daae1d095fa0922050310d16698f
* | 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
* | | | 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-271-2/+1
|\ \ \ | |/ / | | | | | | Change-Id: I348a71d1b3e3238bc3871a69454edc8247d03111
| * | resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-271-2/+1
| |\ \ | | | | | | | | | | | | Change-Id: I385371869169eee4fe6330ffe0abc5eda4cb4f72
| | * \ am 47deb15e: Merge "Remove MediaPlayerService::decode()"Marco Nelissen2015-01-271-2/+11
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '47deb15e99cbf60e558027e074b7415c95637943': Remove MediaPlayerService::decode()
| | | * | Remove MediaPlayerService::decode()Marco Nelissen2015-01-261-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and make SoundPool use MediaCodec for decoding files to PCM. Bug: 18239054 Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
| | | * | DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from ↵Ronghua Wu2014-12-183-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout teardown. Also always recheck if a new stream can do offload. Bug: 18154425 Change-Id: I121877834bd963eeeba91a2b951fd30d5dc36a8b
| | | * | DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed.Ronghua Wu2014-12-182-0/+8
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Also rememeber the pause time in NuPlayerDriver. Bug: 18436336 Change-Id: If09f680a0d0f9137bd55c5f94201eb3aa783278a
* | | | 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
| | |\ \
generated by cgit v1.1 at 2024-09-28 03:56:34 +0000