summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | Remove dead AudioTrack::setAttributesFromStreamType()Glenn Kasten2015-03-231-2/+0
* | | | | | | | | | | | | | | | Merge "Deprecate AudioRecord::getInput() and AudioTrack::getOutput()"Glenn Kasten2015-03-233-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Deprecate AudioRecord::getInput() and AudioTrack::getOutput()Glenn Kasten2015-03-233-3/+10
* | | | | | | | | | | | | | | | Merge "namespace does not need a closing semicolon"Glenn Kasten2015-03-2331-31/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | namespace does not need a closing semicolonGlenn Kasten2015-03-2331-31/+31
* | | | | | | | | | | | | | | | Merge "Declare and initialize in one statement"Glenn Kasten2015-03-232-8/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Declare and initialize in one statementGlenn Kasten2015-03-232-8/+5
* | | | | | | | | | | | | | | | Merge "Move AudioTrack::isOffloaded() and isDirect() variants"Glenn Kasten2015-03-231-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Move AudioTrack::isOffloaded() and isDirect() variantsGlenn Kasten2015-03-231-4/+4
* | | | | | | | | | | | | | | | Merge "Whitespace"Glenn Kasten2015-03-234-9/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | WhitespaceGlenn Kasten2015-03-234-9/+7
* | | | | | | | | | | | | | | | Merge "Add FIXME to deprecate AudioTrack::getMinFrameCount()"Glenn Kasten2015-03-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Add FIXME to deprecate AudioTrack::getMinFrameCount()Glenn Kasten2015-03-231-0/+1
* | | | | | | | | | | | | | | | Merge "Update AudioRecord comments to match AudioTrack"Glenn Kasten2015-03-232-14/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Update AudioRecord comments to match AudioTrackGlenn Kasten2015-03-232-14/+22
* | | | | | | | | | | | | | | | Merge "Fix typos"Glenn Kasten2015-03-233-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Fix typosGlenn Kasten2015-03-233-4/+4
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | am de68ef61: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ME...Qiwen Zhao2015-03-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | reset to lmp-mr1-dev-plus-aosp with history.Qiwen Zhao2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 1830c701: am 90073050: Merge "Fix the bug that same video frame has been d...hkuang2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 6e2ced09: am d3db0bfa: Merge "NuPlayer: add seek operation when change vid...Wei Jia2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e866880a: am d71233a8: Merge "Use CharacterEncodingDetector in metadataret...Marco Nelissen2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e8d39b9d: am acdae5d7: Merge "Move stale handler cleanup to constructor" i...Marco Nelissen2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ba19ee84: am ea8462cc: Merge "Fix more potential deadlocks in ALooperRoste...Marco Nelissen2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 955d8f90: am 23c8cf95: Merge "Restore the ability to build tee sink for de...Glenn Kasten2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 85b41b0f: am 453d633b: Merge "render one video frame after flush even when...Chong Zhang2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3d640e0a: am 97d547da: audio flinger: fix use of global effect bufferEric Laurent2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b3b4f875: am b72726ba: Merge "camera1: Ensure MemoryHeap buffers are mmapp...Ruben Brunk2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0b9a8c06: am e4478feb: Merge "Add adaptive playback support to VPX decoder...Ronghua Wu2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 18e24608: am e7494680: Merge "NuPlayerRenderer: stop feeding AudioSink whe...Wei Jia2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d4fece27: am 64a385d5: Merge "GenericSource: set DRM playback status." int...Ronghua Wu2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f910a3df: am c9d62de7: Merge "MediaCodec: set state to UNINITIALIZED when ...Wei Jia2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 760cfc90: am b6b927fc: Merge "Tunneled Video Playback: Changed AudioHwSync...Rachad2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 42174336: am 3049c672: Merge "stagefright: add codec capability info for g...Lajos Molnar2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 50ae18d3: am 4030b561: Merge "sound trigger: fix cross deadlock between se...Eric Laurent2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8b747c28: am 9a63396f: Merge "audio policy: fix input source passed to ope...Eric Laurent2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f6de317d: am 7fa42078: Merge "audiopolicy: Indicate output device change t...Dmitry Shmidt2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ea765de0: am c2aa6971: Merge "[AU]Sync libmedia/Android.mk modification fr...Bart Sears2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2725169a: am 890a5637: frameworks: av: AudioPolicyEffect: Add refCount for...bryant_liu2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d6c3c431: am 8b250cb6: Merge "CameraService: Create a dummy stream when 0 ...Eino-Ville Talvala2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7f7510ff: am 6868628c: Merge "PlaylistFetcher: add lower bound check when ...Robert Shih2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 131ff148: am 8962e08c: Merge "Fix audio dropouts with multiple playback st...Paul McLean2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am dca12b44: am 47f64f2e: Merge "audio policy: remove audio patch when closin...Eric Laurent2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1c1688e5: am 01b9256a: Merge "cameraservice: decrease zsl metadata queue s...Yin-Chia Yeh2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 19f0e163: am 13d98f41: Merge "Camera API1: Fix ZSLProcessor3 deadlock" int...Zhijun He2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 02d67d52: am 277090f1: Merge "Fix potential deadlock in unregisterStaleHan...Marco Nelissen2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1b6d6789: am d362ea17: Merge "AudioPlayback: delay the post of EOS based o...Ronghua Wu2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 599e09a0: am 1754351d: CameraService: Correct API2 error handlingEino-Ville Talvala2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am dd801765: am 60ffbe05: Merge "Fix memory leak in getConnectionState" into ...Marco Nelissen2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \