summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 12d0cd1b: am 3a8bad2e: am be9ebd46: Merge "Fix uncertainty of one normal m...Glenn Kasten2014-10-033-2/+29
|\
| * am 3a8bad2e: am be9ebd46: Merge "Fix uncertainty of one normal mix buffer in ...Glenn Kasten2014-10-033-2/+29
| |\
| | * am be9ebd46: Merge "Fix uncertainty of one normal mix buffer in AudioTrack::g...Glenn Kasten2014-10-033-2/+29
| | |\
| | | * Merge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" ...Glenn Kasten2014-10-033-2/+29
| | | |\
| | | | * Fix uncertainty of one normal mix buffer in AudioTrack::getTimestampGlenn Kasten2014-10-023-2/+29
* | | | | am 2cf3340d: resolved conflicts for merge of c51e512a to lmp-mr1-dev-plus-aospChih-Hung Hsieh2014-10-032-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of c51e512a to lmp-mr1-dev-plus-aospChih-Hung Hsieh2014-10-032-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 9b68037c: am f0d98899: am aaa527fb: Merge "send available codec buffer cou...Chong Zhang2014-10-032-6/+27
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f0d98899: am aaa527fb: Merge "send available codec buffer count with codec...Chong Zhang2014-10-032-6/+27
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | 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 9236887a: am 2e74aefd: am fc93499e: Merge "mediarecorder: set level if set...Lajos Molnar2014-10-033-2/+66
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 2e74aefd: am fc93499e: Merge "mediarecorder: set level if setting default ...Lajos Molnar2014-10-033-2/+66
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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 f893459f: am 86c541dc: am 6eff943c: Merge "NuPlayerDecoder: postpone input...Wei Jia2014-10-022-8/+31
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 86c541dc: am 6eff943c: Merge "NuPlayerDecoder: postpone input message proc...Wei Jia2014-10-022-8/+31
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | 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
* | | | | | | | | am f973c881: resolved conflicts for merge of 55fc6a77 to lmp-mr1-dev-plus-aospLajos Molnar2014-10-024-31/+195
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | resolved conflicts for merge of 55fc6a77 to lmp-mr1-dev-plus-aospLajos Molnar2014-10-024-31/+195
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 8b76b592: Merge "stagefright: move math templates into AUtils.h" into lmp-devLajos Molnar2014-10-024-35/+207
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | 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
* | | | | | | | am d7bdfd7d: am cfe3ba6b: am d8b03abf: Merge "NuPlayer: Fix flush mode decode...Andy Hung2014-10-026-28/+103
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am cfe3ba6b: am d8b03abf: Merge "NuPlayer: Fix flush mode decoder error handl...Andy Hung2014-10-026-28/+103
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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 53e5ee8d: am d10ec42c: am f916667a: Merge "camera2: Force DNG previews to ...Ruben Brunk2014-10-021-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am d10ec42c: am f916667a: Merge "camera2: Force DNG previews to render with L...Ruben Brunk2014-10-021-1/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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 b0443283: am 92a69cde: am cb4b6e9f: audioflinger: fix failure to indicate ...Eric Laurent2014-10-022-10/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 92a69cde: am cb4b6e9f: audioflinger: fix failure to indicate volume to effectEric Laurent2014-10-022-10/+23
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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 0e42a880: am e5095be1: am a49c94ea: Merge "Revert "Fix uncertainty of one ...Glenn Kasten2014-10-023-23/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am e5095be1: am a49c94ea: Merge "Revert "Fix uncertainty of one normal mix bu...Glenn Kasten2014-10-023-23/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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 bc6b959b: am 52cb10c4: am d0b9efe7: Merge "add AAC audio decoder params fo...Chong Zhang2014-10-023-3/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /