summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | am 1a9ac031: Merge "[audio][nuplayer] Aggregate buffers to reduce power." int...Phil Burk2014-09-082-4/+94
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "[audio][nuplayer] Aggregate buffers to reduce power." into lmp-devPhil Burk2014-09-082-4/+94
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | [audio][nuplayer] Aggregate buffers to reduce power.Phil Burk2014-09-082-4/+94
* | | | | | | | | am d3a5ff9a: Merge "Fix potential deadlock between AudioPolicyService and Aud...Andy Hung2014-09-081-1/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Fix potential deadlock between AudioPolicyService and AudioSystem" int...Andy Hung2014-09-081-1/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix potential deadlock between AudioPolicyService and AudioSystemAndy Hung2014-09-081-1/+5
* | | | | | | | | | am 43cbe059: Merge "NuPlayerDriver: put player in paused state when reaching ...Wei Jia2014-09-081-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "NuPlayerDriver: put player in paused state when reaching EOS." into lm...Wei Jia2014-09-081-2/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | NuPlayerDriver: put player in paused state when reaching EOS.Wei Jia2014-09-051-2/+2
* | | | | | | | | | am 62ce2072: Merge "Make IPowerManager native conform to .aidl for oneway" in...Glenn Kasten2014-09-081-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-devGlenn Kasten2014-09-081-2/+2
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Make IPowerManager native conform to .aidl for onewayGlenn Kasten2014-09-051-2/+2
* | | | | | | | | | am 835ae86b: Merge "Revert "Revert "disable AwesomePlayer for Ogg vorbis""" i...Andy Hung2014-09-082-12/+14
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Revert "Revert "disable AwesomePlayer for Ogg vorbis""" into lmp-devAndy Hung2014-09-082-12/+14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Revert "Revert "disable AwesomePlayer for Ogg vorbis""Andy Hung2014-09-032-12/+14
* | | | | | | | | | | am ea477eff: Merge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; worka...Robert Shih2014-09-061-3/+23
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malform...Robert Shih2014-09-061-3/+23
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csdRobert Shih2014-09-061-3/+23
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
* | | | | | | | | | | am 2adb3f32: Merge "Cache audio attributes when player not available" into lm...Jean-Michel Trivi2014-09-051-2/+19
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Cache audio attributes when player not available" into lmp-devJean-Michel Trivi2014-09-051-2/+19
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Cache audio attributes when player not availableJean-Michel Trivi2014-09-051-2/+19
* | | | | | | | | | | am 52c6a355: Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-devLajos Molnar2014-09-052-2/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-devLajos Molnar2014-09-052-2/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | stagefright: allow P-frames spacing of 0 and 1Lajos Molnar2014-09-042-2/+0
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
* | | | | | | | | | | am f17882b3: Merge "GenericSource: refactor track selection for dedicated loo...Robert Shih2014-09-052-16/+189
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "GenericSource: refactor track selection for dedicated looper" into lmp...Robert Shih2014-09-052-16/+189
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | GenericSource: refactor track selection for dedicated looperRobert Shih2014-09-032-16/+189
* | | | | | | | | | | am ade312d5: Merge "NuPlayer: Restrict seek on video texture changes" into lm...Andy Hung2014-09-051-1/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "NuPlayer: Restrict seek on video texture changes" into lmp-devAndy Hung2014-09-051-1/+7
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | NuPlayer: Restrict seek on video texture changesAndy Hung2014-09-051-1/+7
* | | | | | | | | | | am 767fc12e: Merge "NuPlayer: Discard seeks when source and decoders are NULL...Andy Hung2014-09-052-1/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "NuPlayer: Discard seeks when source and decoders are NULL" into lmp-devAndy Hung2014-09-052-1/+9
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | NuPlayer: Discard seeks when source and decoders are NULLAndy Hung2014-09-042-1/+9
* | | | | | | | | | | am 3ec9c3d2: Merge "Split CEA-608 Closed caption into 4 tracks CC1~CC4" into ...Chong Zhang2014-09-053-67/+134
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Split CEA-608 Closed caption into 4 tracks CC1~CC4" into lmp-devChong Zhang2014-09-053-67/+134
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Split CEA-608 Closed caption into 4 tracks CC1~CC4Chong Zhang2014-09-033-67/+134
| | | |_|/ / / / / / | | |/| | | | | | |
* | | | | | | | | | am f2c0ff43: Merge "Fix to parse audio_source_t member of audio_attributes_t"...Eric Laurent2014-09-051-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Fix to parse audio_source_t member of audio_attributes_t" into lmp-devEric Laurent2014-09-051-0/+3
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix to parse audio_source_t member of audio_attributes_tHyejin Kim2014-09-051-0/+3
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | am 6a548e91: Merge "PlaylistFetcher: do not reset mStartTimeUs if we are resu...Robert Shih2014-09-041-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "PlaylistFetcher: do not reset mStartTimeUs if we are resuming" into lm...Robert Shih2014-09-041-2/+2
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | PlaylistFetcher: do not reset mStartTimeUs if we are resumingRobert Shih2014-09-031-2/+2
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | am 13006b9d: am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
| | |\ \ \ \ \ \
| | | * | | | | | Fix in SoftAVCEncoder pluginAshok Bhat2014-07-091-3/+4
| * | | | | | | | am 45d2c7e1: Merge "Move chromium_http/support.cpp off androidGetTid."Elliott Hughes2014-08-181-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Move chromium_http/support.cpp off androidGetTid.Elliott Hughes2014-08-181-1/+1
* | | | | | | | | am 90073050: Merge "Fix the bug that same video frame has been decoded twice ...hkuang2014-09-032-32/+38
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge "Fix the bug that same video frame has been decoded twice during port r...hkuang2014-09-032-32/+38
| |\ \ \ \ \ \ \ \