summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Expand)AuthorAgeFilesLines
* Revert "Fix NuPlayer::Decoder input buffer loss upon seamless format change"Robert Shih2015-03-041-3/+6
* Fix NuPlayer::Decoder input buffer loss upon seamless format changeRobert Shih2015-02-201-6/+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
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 3a7ed550: am efbb6195: NuPlayer: pause playback when buffering is lowChong Zhang2015-02-045-33/+250
| |\ \ \ | | |/ /
| | * | NuPlayer: pause playback when buffering is lowChong Zhang2015-02-035-33/+250
| | |/
* | | am 82bbd248: am c37a6e6b: am 7a434265: Merge "Wrong format used in seamless c...Robert Shih2015-02-021-4/+4
|\ \ \ | |/ /
| * | am c37a6e6b: am 7a434265: Merge "Wrong format used in seamless check" into lm...Robert Shih2015-02-021-4/+4
| |\ \ | | |/
| | * 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
* | | | am 5fcd4d19: am 0bd5274e: am 231406d5: NuPlayerRenderer: return current real ...Wei Jia2015-01-282-15/+18
|\ \ \ \ | |/ / /
| * | | am 0bd5274e: am 231406d5: NuPlayerRenderer: return current real time as rende...Wei Jia2015-01-282-15/+18
| |\ \ \ | | |/ /
| | * | NuPlayerRenderer: return current real time as render time for video frame whe...Wei Jia2015-01-272-15/+18
| | |/
* | | resolved conflicts for merge of 9391844d to masterMarco Nelissen2015-01-273-404/+2
|\ \ \ | |/ /
| * | resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-273-404/+2
| |\ \
| | * \ am 47deb15e: Merge "Remove MediaPlayerService::decode()"Marco Nelissen2015-01-273-401/+12
| | |\ \
| | | * | Remove MediaPlayerService::decode()Marco Nelissen2015-01-263-401/+12
* | | | | am 4beddcf5: am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if ...Chong Zhang2015-01-161-2/+8
|\ \ \ \ \ | |/ / / /
| * | | | am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if it\'s not ava...Chong Zhang2015-01-161-2/+8
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | 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
| | * | | | MidiFile: report correct state during transient period when start() is called...Wei Jia2015-01-141-1/+1
| * | | | | am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-138-880/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-138-880/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Replace MidiFile player with a Midi extractorMarco Nelissen2015-01-088-880/+0
| * | | | | resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-083-34/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | am c52af00b: Merge "Use callbacks for Midi I/O"Marco Nelissen2015-01-083-34/+14
| | |\ \ \ \ | | | |/ / /
| | | * | | Use callbacks for Midi I/OMarco Nelissen2015-01-083-34/+14
* | | | | | am 7993d6b3: am e0344754: am 468977f0: Merge "mark any copyrighted content as...Chong Zhang2015-01-083-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to...Chong Zhang2015-01-083-0/+6
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | mark any copyrighted content as protected to disable captureChong Zhang2015-01-073-0/+6
* | | | | | am 545d5c41: am 69bdf92f: am 0d19abb4: Merge "NuPlayer: Do not recreate Audio...Andy Hung2014-12-292-0/+39
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 69bdf92f: am 0d19abb4: Merge "NuPlayer: Do not recreate AudioTrack if not ...Andy Hung2014-12-292-0/+39
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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
* | | | | | am af318e28: am 0b87c0d9: am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-221-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 0b87c0d9: am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-221-1/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-221-1/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge "Fix double close."Marco Nelissen2014-12-221-1/+0
| | | |\ \ \
| | | | * | | Fix double close.Bao Haojun2014-05-171-1/+0
| | | * | | | DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from t...Ronghua Wu2014-12-183-5/+36
| | | * | | | DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed.Ronghua Wu2014-12-182-0/+8
| | |/ / / /
* | | | | | Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2014-12-228-880/+0
|\ \ \ \ \ \
| * | | | | | Replace MidiFile player with a Midi extractorMarco Nelissen2014-12-188-880/+0
* | | | | | | am bae511e3: am 4af263bd: am ad019236: Merge "NuPlayer: reports paused positi...Wei Jia2014-12-193-7/+67
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
generated by cgit v1.1 at 2024-06-10 06:47:58 +0000