summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am aaa527fb: Merge "send available codec buffer count with codec notification...Chong Zhang2014-10-032-6/+27
|\
| * Merge "send available codec buffer count with codec notification" into lmp-devChong Zhang2014-10-032-6/+27
| |\
| | * send available codec buffer count with codec notificationChong Zhang2014-10-022-6/+27
* | | am fc93499e: Merge "mediarecorder: set level if setting default profile" into...Lajos Molnar2014-10-023-2/+66
|\ \ \ | |/ /
| * | Merge "mediarecorder: set level if setting default profile" into lmp-devLajos Molnar2014-10-023-2/+66
| |\ \
| | * | mediarecorder: set level if setting default profileLajos Molnar2014-10-023-2/+66
* | | | am 6eff943c: Merge "NuPlayerDecoder: postpone input message processing when i...Wei Jia2014-10-022-8/+31
|\ \ \ \ | |/ / /
| * | | Merge "NuPlayerDecoder: postpone input message processing when it's not deque...Wei Jia2014-10-022-8/+31
| |\ \ \
| | * | | NuPlayerDecoder: postpone input message processing when it's not dequeued.Wei Jia2014-10-022-8/+31
* | | | | resolved conflicts for merge of 8b76b592 to lmp-dev-plus-aospLajos Molnar2014-10-024-31/+195
|\ \ \ \ \ | |/ / / /
| * | | | Merge "stagefright: move math templates into AUtils.h" into lmp-devLajos Molnar2014-10-024-35/+207
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | stagefright: move math templates into AUtils.hLajos Molnar2014-10-014-35/+207
* | | | resolved conflicts for merge of c51e512a to lmp-dev-plus-aospChih-Hung Hsieh2014-10-022-2/+2
|\ \ \ \
| * \ \ \ am c8871d2c: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-10-023-3/+3
| |\ \ \ \
| | * \ \ \ Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-10-023-3/+3
| | |\ \ \ \
| | | * | | | Fix struct vs. class mismatchesBernhard Rosenkraenzer2014-10-023-3/+3
| | |/ / / /
* | | | | | am d8b03abf: Merge "NuPlayer: Fix flush mode decoder error handling" into lmp...Andy Hung2014-10-026-28/+103
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "NuPlayer: Fix flush mode decoder error handling" into lmp-devAndy Hung2014-10-026-28/+103
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | NuPlayer: Fix flush mode decoder error handlingAndy Hung2014-10-016-28/+103
* | | | | | am f916667a: Merge "camera2: Force DNG previews to render with LSC map." into...Ruben Brunk2014-10-021-1/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "camera2: Force DNG previews to render with LSC map." into lmp-devRuben Brunk2014-10-021-1/+3
| |\ \ \ \ \
| | * | | | | camera2: Force DNG previews to render with LSC map.Ruben Brunk2014-10-011-1/+3
| | |/ / / /
* | | | | | am cb4b6e9f: audioflinger: fix failure to indicate volume to effectEric Laurent2014-10-022-10/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | audioflinger: fix failure to indicate volume to effectEric Laurent2014-10-012-10/+23
* | | | | | am a49c94ea: Merge "Revert "Fix uncertainty of one normal mix buffer in Audio...Glenn Kasten2014-10-013-23/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTim...Glenn Kasten2014-10-013-23/+1
| |\ \ \ \ \
| | * | | | | Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"Glenn Kasten2014-10-013-23/+1
* | | | | | | am d0b9efe7: Merge "add AAC audio decoder params for PCM limiter enable" into...Chong Zhang2014-10-013-3/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "add AAC audio decoder params for PCM limiter enable" into lmp-devChong Zhang2014-10-013-3/+16
| |\ \ \ \ \ \
| | * | | | | | add AAC audio decoder params for PCM limiter enableChong Zhang2014-10-013-3/+16
* | | | | | | | am 3af67d03: Merge "GenericSource: support disconnect before NuCachedSource2 ...Robert Shih2014-10-014-10/+48
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "GenericSource: support disconnect before NuCachedSource2 is created" i...Robert Shih2014-10-014-10/+48
| |\ \ \ \ \ \ \
| | * | | | | | | GenericSource: support disconnect before NuCachedSource2 is createdRobert Shih2014-10-014-10/+48
| | * | | | | | | merge in lmp-release history after reset to 955e24d3a8e218d4711cabc6558781e09...The Android Automerger2014-09-300-0/+0
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | merge in lmp-release history after reset to dc2e6ddc933e40632e79a866d9ece870d...The Android Automerger2014-09-290-0/+0
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | | * | | | | merge in lmp-release history after reset to a67ced9746e6f0d4e03ff8007682091af...The Android Automerger2014-09-280-0/+0
| | | | |\ \ \ \ \
| | | | | * | | | | Camera1 shim: If there's no flash, the keys need to be null.Eino-Ville Talvala2014-09-261-10/+13
| | | | | * | | | | merge in lmp-release history after reset to c0d17e349901c3ccf6d15b7dcdf7fa301...The Android Automerger2014-09-250-0/+0
| | | | | |\ \ \ \ \
| | | | | | * | | | | NuCachedSource2: more fixes for source read hangChong Zhang2014-09-241-2/+14
| | | | | | * | | | | merge in lmp-release history after reset to fc55783d0886d5dbaa234f85a4313796d...The Android Automerger2014-09-240-0/+0
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | NuPlayer: change assert to conditional check.Wei Jia2014-09-231-6/+20
| | | | | | | * | | | | Camera2Client: log an error when autoFocus is called in wrong stateZhijun He2014-09-231-0/+2
| | | | | | | * | | | | NuPlayer: use generation to filter out stale message from renderer.Wei Jia2014-09-232-7/+20
| | | | | | | * | | | | merge in lmp-release history after reset to 5110d6a00db5973881d06c39c60e477fb...The Android Automerger2014-09-230-0/+0
| | | | | | | |\ \ \ \ \
| | | | | | | | * | | | | MediaBuffer: ABuffer will release MediaBuffer when it's destructed.Wei Jia2014-09-2211-99/+99
| | | | | | | | * | | | | merge in lmp-release history after reset to 8d6ae6d9e9f2740f88928fae52e811ca6...The Android Automerger2014-09-220-0/+0
| | | | | | | | |\ \ \ \ \
| | | | | | | | | * \ \ \ \ merge in lmp-release history after reset to 8d6ae6d9e9f2740f88928fae52e811ca6...The Android Automerger2014-09-210-0/+0
| | | | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / / / /
| | | | | | | | | * | | | | merge in lmp-release history after reset to a7326b42c42f5014e8dabf18d69a8376b...The Android Automerger2014-09-200-0/+0
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | | * \ \ \ \ merge in lmp-release history after reset to 8d6ae6d9e9f2740f88928fae52e811ca6...The Android Automerger2014-09-200-0/+0
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | |/ / / / / / | | | | | | | | |/| / / / / / | | | | | | | | | |/ / / / /
| | | | | | | | | * | | | | AudioEffect acquires sessionJean-Michel Trivi2014-09-182-3/+11