summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
Commit message (Expand)AuthorAgeFilesLines
...
* | am d996c469: am fc55783d: Merge "NuPlayer will notify SeekComplete only when ...Wei Jia2014-09-241-4/+2
|\ \ | |/
| * NuPlayer will notify SeekComplete only when requested so.Wei Jia2014-09-231-4/+2
* | am a9612acf: am 21a1d72b: Merge "NuPlayer: update timestamp handling" into lm...Andy Hung2014-09-171-2/+30
|\ \ | |/
| * Merge "NuPlayer: update timestamp handling" into lmp-devAndy Hung2014-09-171-2/+30
| |\
| | * NuPlayer: update timestamp handlingAndy Hung2014-09-171-2/+30
* | | am d2fc5dac: am 866e028b: Merge "Add support for ANDROID_LOOP to NuPlayer" in...Marco Nelissen2014-09-171-1/+11
|\ \ \ | |/ /
| * | Merge "Add support for ANDROID_LOOP to NuPlayer" into lmp-devMarco Nelissen2014-09-171-1/+11
| |\ \ | | |/ | |/|
| | * Add support for ANDROID_LOOP to NuPlayerMarco Nelissen2014-09-171-1/+11
* | | resolved conflicts for merge of a7efc1af to masterRobert Shih2014-09-161-2/+6
|\ \ \ | |/ /
| * | NuPlayerDriver: restart after eos pauseRobert Shih2014-09-161-2/+9
| |/
* | resolved conflicts for merge of 42db212e to masterWei Jia2014-09-111-6/+7
|\ \ | |/
| * NuPlayerDriver: do not set to paused state when receiving playback complete a...Wei Jia2014-09-101-5/+8
* | am e2b2e5fb: am 43cbe059: Merge "NuPlayerDriver: put player in paused state w...Wei Jia2014-09-081-2/+2
|\ \ | |/
| * NuPlayerDriver: put player in paused state when reaching EOS.Wei Jia2014-09-051-2/+2
* | am 6a857f52: am 767fc12e: Merge "NuPlayer: Discard seeks when source and deco...Andy Hung2014-09-051-1/+1
|\ \ | |/
| * NuPlayer: Discard seeks when source and decoders are NULLAndy Hung2014-09-041-1/+1
* | am 18e24608: am e7494680: Merge "NuPlayerRenderer: stop feeding AudioSink whe...Wei Jia2014-09-021-2/+4
|\ \ | |/
| * NuPlayerRenderer: stop feeding AudioSink when paused.Wei Jia2014-08-291-2/+4
* | am faf71460: am 355286ee: Merge "Fix SoundPool lockup" into lmp-devMarco Nelissen2014-08-261-6/+8
|\ \ | |/
| * Fix SoundPool lockupMarco Nelissen2014-08-261-6/+8
* | am 008cee91: am 052efa49: Merge "wait for flush to finish before returning se...Chong Zhang2014-08-251-0/+20
|\ \ | |/
| * wait for flush to finish before returning setSurfaceChong Zhang2014-08-221-0/+20
* | am 3672da6f: am 7992a5d0: Merge "NuPlayerDriver: fix current position for sto...Wei Jia2014-08-221-17/+42
|\ \ | |/
| * NuPlayerDriver: fix current position for stop and pause.Wei Jia2014-08-221-17/+42
* | am 5bf363ae: am 01047680: Merge "NuPlayerDriver: include lapsed time when rep...Wei Jia2014-08-211-1/+10
|\ \ | |/
| * NuPlayerDriver: include lapsed time when reporting current position.Wei Jia2014-08-201-1/+10
* | am 472ff73c: am e0b5cf7e: Merge "Fix typo in comment" into lmp-devMarco Nelissen2014-08-211-1/+1
|\ \ | |/
| * Fix typo in commentMarco Nelissen2014-08-201-1/+1
* | am d05795e5: am 4deb606b: Merge "Fix NuPlayer deadlock" into lmp-devMarco Nelissen2014-08-211-14/+19
|\ \ | |/
| * Fix NuPlayer deadlockMarco Nelissen2014-08-201-14/+19
* | am c2a02f95: am af11287b: Merge "NuPlayer: add support for proper stop" into ...Lajos Molnar2014-08-191-3/+61
|\ \ | |/
| * Merge "NuPlayer: add support for proper stop" into lmp-devLajos Molnar2014-08-191-3/+61
| |\
| | * NuPlayer: add support for proper stopLajos Molnar2014-08-081-3/+61
* | | am 28928517: am 426c719a: Merge "use dedicated looper for GenericSource" into...Chong Zhang2014-08-151-20/+0
|\ \ \ | |/ /
| * | use dedicated looper for GenericSourceChong Zhang2014-08-141-20/+0
| |/
* | am f2bd67bc: am f7999047: Merge "NuPlayer: getSelectedTrack" into lmp-devRobert Shih2014-08-091-0/+6
|\ \ | |/
| * NuPlayer: getSelectedTrackRobert Shih2014-08-081-0/+6
* | resolved conflicts for merge of e1009a0f to masterLajos Molnar2014-08-011-6/+27
|\ \ | |/
| * mediaplayer: add looping support to NuPlayerLajos Molnar2014-07-311-4/+26
* | Fix deadlock in NuPlayerMarco Nelissen2014-07-021-0/+14
|/
* Fix some NuPlayer issues.Marco Nelissen2014-05-281-0/+4
* warnings be gone.Andreas Huber2014-02-111-5/+7
* resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-111-1/+2
|\
| * Make frameworks/av 64-bit compatibleKévin PETIT2014-02-111-1/+2
* | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-041-2/+4
|/
* MediaPlayer: add listener for raw track dataChong Zhang2013-08-191-2/+20
* Add MEDIA_STARTED/PAUSED/STOPPED events to media playersLajos Molnar2013-08-151-0/+5
* Handle the case where an asynchronous prepare was initiated and thenAndreas Huber2013-04-251-0/+16
* Instead of returning an error, return an invalid duration (-1 ms)Andreas Huber2013-04-111-3/+3
* Squashed commit of the following:Andreas Huber2013-03-121-0/+1