summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* NuPlayer: check mSource before deferencing it.Wei Jia2014-09-091-1/+2
* Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-devGlenn Kasten2014-09-082-6/+10
|\
| * Make IPowerManager native conform to .aidl for onewayGlenn Kasten2014-09-052-6/+10
* | Merge "audiopolicy: fix direct output profile probing" into lmp-devEric Laurent2014-09-081-7/+39
|\ \
| * | audiopolicy: fix direct output profile probingEric Laurent2014-09-071-7/+39
* | | 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
* | | | Merge "Fix "invalid device combination" in system audio mode." into lmp-devJungshik Jang2014-09-061-0/+7
|\ \ \ \
| * | | | Fix "invalid device combination" in system audio mode.Jungshik Jang2014-09-051-0/+7
* | | | | 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
* | | | | Merge "Cache audio attributes when player not available" into lmp-devJean-Michel Trivi2014-09-052-2/+20
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Cache audio attributes when player not availableJean-Michel Trivi2014-09-052-2/+20
* | | | | 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
* | | | | | 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
* | | | | | | Merge "Camera API1: fix AE state check in precapture state" into lmp-devZhijun He2014-09-051-5/+12
|\ \ \ \ \ \ \
| * | | | | | | Camera API1: fix AE state check in precapture stateZhijun He2014-09-031-5/+12
* | | | | | | | 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
* | | | | | | | 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
| | |_|_|_|/ / | |/| | | | |
* | | | | | | 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
| | |_|_|/ / | |/| | | |
* | | | | | Merge "audio policy service: filter out delayed audio patch commands if neede...Eric Laurent2014-09-051-1/+35
|\ \ \ \ \ \
| * | | | | | audio policy service: filter out delayed audio patch commands if needed.Eric Laurent2014-09-051-1/+35
| | |_|_|/ / | |/| | | |
* | | | | | 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
| |/ / / /
* | | | | 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
* | | | | Merge "Fix the bug that same video frame has been decoded twice during port r...hkuang2014-09-032-32/+38
|\ \ \ \ \
| * | | | | Fix the bug that same video frame has been decoded twice during port reconfig.hkuang2014-09-032-32/+38
| | |/ / / | |/| | |
* | | | | Merge "NuPlayer: add seek operation when change video texture surface." into ...Wei Jia2014-09-032-0/+5
|\ \ \ \ \
| * | | | | NuPlayer: add seek operation when change video texture surface.Wei Jia2014-09-032-0/+5
* | | | | | Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-devMarco Nelissen2014-09-038-55/+98
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Use CharacterEncodingDetector in metadataretrieverMarco Nelissen2014-09-028-55/+98
* | | | | | Merge "Move stale handler cleanup to constructor" into lmp-devMarco Nelissen2014-09-031-4/+4
|\ \ \ \ \ \
| * | | | | | Move stale handler cleanup to constructorMarco Nelissen2014-08-281-4/+4
* | | | | | | Merge "Fix more potential deadlocks in ALooperRoster" into lmp-devMarco Nelissen2014-09-032-31/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix more potential deadlocks in ALooperRosterMarco Nelissen2014-08-282-31/+12
* | | | | | | Merge "Restore the ability to build tee sink for debugging" into lmp-devGlenn Kasten2014-09-033-12/+16
|\ \ \ \ \ \ \
| * | | | | | | Restore the ability to build tee sink for debuggingGlenn Kasten2014-09-023-12/+16
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "render one video frame after flush even when we're paused" into lmp-devChong Zhang2014-09-032-15/+29
|\ \ \ \ \ \ \
| * | | | | | | render one video frame after flush even when we're pausedChong Zhang2014-09-032-15/+29
* | | | | | | | audio flinger: fix use of global effect bufferEric Laurent2014-09-021-0/+4
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge "camera1: Ensure MemoryHeap buffers are mmapped before copying." into l...Ruben Brunk2014-09-021-1/+14
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | camera1: Ensure MemoryHeap buffers are mmapped before copying.Ruben Brunk2014-08-291-1/+14
* | | | | | | Merge "Add adaptive playback support to VPX decoder." into lmp-devRonghua Wu2014-09-027-35/+87
|\ \ \ \ \ \ \
| * | | | | | | Add adaptive playback support to VPX decoder.Ronghua Wu2014-08-287-35/+87