summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 23718a84: am 34febc96: stagefright: process CSD regardless of what port wa...Lajos Molnar2014-08-251-3/+2
|\
| * am 34febc96: stagefright: process CSD regardless of what port was last queuedLajos Molnar2014-08-231-3/+2
| |\
| | * stagefright: process CSD regardless of what port was last queuedLajos Molnar2014-08-231-3/+2
* | | am 211aae92: am 848726d8: Merge "MediaCodec: handle errors during flushing." ...Wei Jia2014-08-251-6/+10
|\ \ \ | |/ /
| * | am 848726d8: Merge "MediaCodec: handle errors during flushing." into lmp-devWei Jia2014-08-231-6/+10
| |\ \ | | |/
| | * Merge "MediaCodec: handle errors during flushing." into lmp-devWei Jia2014-08-231-6/+10
| | |\
| | | * MediaCodec: handle errors during flushing.Wei Jia2014-08-221-6/+10
* | | | am 008cee91: am 052efa49: Merge "wait for flush to finish before returning se...Chong Zhang2014-08-253-0/+29
|\ \ \ \ | |/ / /
| * | | am 052efa49: Merge "wait for flush to finish before returning setSurface" int...Chong Zhang2014-08-233-0/+29
| |\ \ \ | | |/ /
| | * | Merge "wait for flush to finish before returning setSurface" into lmp-devChong Zhang2014-08-233-0/+29
| | |\ \
| | | * | wait for flush to finish before returning setSurfaceChong Zhang2014-08-223-0/+29
* | | | | Merge "stagefright: SoftwareRenderer support ARGB, RGB888"David Smith2014-08-231-28/+67
|\ \ \ \ \
| * | | | | stagefright: SoftwareRenderer support ARGB, RGB888David Smith2014-08-221-28/+67
* | | | | | stagefright: MediaFilter and SimpleFilter(s)David Smith2014-08-2215-2/+1363
|/ / / / /
* | | | | am 44945f04: am 43febe72: Merge "add buffering update to GenericSource" into ...Chong Zhang2014-08-224-6/+112
|\ \ \ \ \ | |/ / / /
| * | | | am 43febe72: Merge "add buffering update to GenericSource" into lmp-devChong Zhang2014-08-224-6/+112
| |\ \ \ \ | | |/ / /
| | * | | Merge "add buffering update to GenericSource" into lmp-devChong Zhang2014-08-224-6/+112
| | |\ \ \ | | | |/ / | | |/| |
| | | * | add buffering update to GenericSourceChong Zhang2014-08-224-6/+112
* | | | | am c3c107ca: am d1de9bb3: Merge "ACodec: handle errors related to native wind...Wei Jia2014-08-222-6/+13
|\ \ \ \ \ | |/ / / /
| * | | | am d1de9bb3: Merge "ACodec: handle errors related to native window." into lmp...Wei Jia2014-08-222-6/+13
| |\ \ \ \ | | |/ / /
| | * | | Merge "ACodec: handle errors related to native window." into lmp-devWei Jia2014-08-222-6/+13
| | |\ \ \
| | | * | | ACodec: handle errors related to native window.Wei Jia2014-08-222-6/+13
* | | | | | am 3672da6f: am 7992a5d0: Merge "NuPlayerDriver: fix current position for sto...Wei Jia2014-08-222-17/+44
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 7992a5d0: Merge "NuPlayerDriver: fix current position for stop and pause."...Wei Jia2014-08-222-17/+44
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "NuPlayerDriver: fix current position for stop and pause." into lmp-devWei Jia2014-08-222-17/+44
| | |\ \ \ \
| | | * | | | NuPlayerDriver: fix current position for stop and pause.Wei Jia2014-08-222-17/+44
| | | | |_|/ | | | |/| |
* | | | | | am e6198959: am b534f461: Merge "move cache prefill to GenericSource\'s messa...Chong Zhang2014-08-223-98/+142
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b534f461: Merge "move cache prefill to GenericSource\'s message handler" i...Chong Zhang2014-08-223-98/+142
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "move cache prefill to GenericSource's message handler" into lmp-devChong Zhang2014-08-223-98/+142
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | move cache prefill to GenericSource's message handlerChong Zhang2014-08-213-98/+142
* | | | | | am 687ee2d4: am 89c4ab2f: Merge "print warning if offset != buffer size" into...Chong Zhang2014-08-221-0/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 89c4ab2f: Merge "print warning if offset != buffer size" into lmp-devChong Zhang2014-08-221-0/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "print warning if offset != buffer size" into lmp-devChong Zhang2014-08-221-0/+5
| | |\ \ \ \
| | | * | | | print warning if offset != buffer sizeChong Zhang2014-08-191-0/+5
| | | | |_|/ | | | |/| |
* | | | | | am af385b13: am 5f42113f: stagefright: allow to resubmit CSDs for SoftAAC2Lajos Molnar2014-08-221-208/+201
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5f42113f: stagefright: allow to resubmit CSDs for SoftAAC2Lajos Molnar2014-08-221-208/+201
| |\ \ \ \ \ | | |/ / / /
| | * | | | stagefright: allow to resubmit CSDs for SoftAAC2Lajos Molnar2014-08-221-208/+201
* | | | | | am e2f34c14: am 143a951f: SoftAAC2: allow reconfiguring output after multiple...Robert Shih2014-08-221-10/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 143a951f: SoftAAC2: allow reconfiguring output after multiple output buffersRobert Shih2014-08-221-10/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | SoftAAC2: allow reconfiguring output after multiple output buffersRobert Shih2014-08-221-10/+1
* | | | | | am 19d99c52: am ef8ae4cb: Merge "Fix SoundPool and MediaPlayerService buffer ...Andy Hung2014-08-223-13/+57
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ef8ae4cb: Merge "Fix SoundPool and MediaPlayerService buffer overflow" int...Andy Hung2014-08-223-13/+57
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix SoundPool and MediaPlayerService buffer overflow" into lmp-devAndy Hung2014-08-223-13/+57
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Fix SoundPool and MediaPlayerService buffer overflowAndy Hung2014-08-213-13/+57
* | | | | | am 5bf363ae: am 01047680: Merge "NuPlayerDriver: include lapsed time when rep...Wei Jia2014-08-212-1/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 01047680: Merge "NuPlayerDriver: include lapsed time when reporting curren...Wei Jia2014-08-212-1/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "NuPlayerDriver: include lapsed time when reporting current position." ...Wei Jia2014-08-212-1/+12
| | |\ \ \ \
| | | * | | | NuPlayerDriver: include lapsed time when reporting current position.Wei Jia2014-08-202-1/+12
* | | | | | | am 5218daea: am c10b4689: Merge "disable AwesomePlayer for Ogg vorbis" into l...Chong Zhang2014-08-212-12/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c10b4689: Merge "disable AwesomePlayer for Ogg vorbis" into lmp-devChong Zhang2014-08-212-12/+14
| |\ \ \ \ \ \ | | |/ / / / /