summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* set AAC MPEG version to MPEG-2Chong Zhang2014-02-071-1/+1
* Merge "Change StagefrightRecorder to use MediaCodec"Chong Zhang2014-02-0614-197/+1290
|\
| * Change StagefrightRecorder to use MediaCodecChong Zhang2014-02-0514-197/+1290
* | Merge "Fix restart after EOS for mp3"Marco Nelissen2014-02-061-0/+3
|\ \
| * | Fix restart after EOS for mp3Marco Nelissen2014-02-051-0/+3
* | | Merge "Remove no longer needed http proxy handling code, it's obsolete now"Andreas Huber2014-02-0630-1666/+14
|\ \ \
| * | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-0530-1666/+14
| | |/ | |/|
* | | Merge "Add AudioRecord::mReqFrameCount similar to AudioTrack"Glenn Kasten2014-02-052-8/+21
|\ \ \ | |/ / |/| |
| * | Add AudioRecord::mReqFrameCount similar to AudioTrackGlenn Kasten2014-02-052-8/+21
* | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...Andreas Huber2014-02-0580-130/+1065
|\ \ \
| * | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-0480-130/+1065
* | | | am 5ef74dce: am d66cd743: Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-02-051-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | am d66cd743: Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-02-051-2/+2
| |\ \ \
| | * \ \ Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-02-051-2/+2
| | |\ \ \
| | | * | | audioflinger: conform inline ASM to UALsynergy dev2014-02-041-2/+2
| | |/ / /
* | | | | Merge "audioflinger: Fix for a deadlock in track creation"Glenn Kasten2014-02-052-4/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-01-302-4/+4
* | | | | Merge "Fix unused parameter warnings in audio"Glenn Kasten2014-02-0412-48/+52
|\ \ \ \ \
| * | | | | Fix unused parameter warnings in audioGlenn Kasten2014-02-0312-48/+52
* | | | | | Merge "Change Format_Invalid from enum to global const"Glenn Kasten2014-02-042-3/+4
|\ \ \ \ \ \
| * | | | | | Change Format_Invalid from enum to global constGlenn Kasten2014-02-032-3/+4
* | | | | | | Merge "camera3: Update maxRegions tag."Ruben Brunk2014-02-042-9/+38
|\ \ \ \ \ \ \
| * | | | | | | camera3: Update maxRegions tag.Ruben Brunk2014-02-042-9/+38
* | | | | | | | am 10d68aab: (-s ours) am dd432ce0: [DO NOT MERGE] Support TS + AC3 for ATSC ...Changwan Ryu2014-02-040-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | am dd432ce0: [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-046-0/+255
| |\ \ \ \ \ \ \
| | * | | | | | | [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-036-0/+255
* | | | | | | | | am aae8d29f: (-s ours) am 90903383: [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-040-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | |
| * | | | | | | am 90903383: [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-044-1/+74
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-034-1/+74
* | | | | | | | Merge "Allow for larger codec private data"Marco Nelissen2014-02-041-30/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow for larger codec private dataMarco Nelissen2014-02-031-30/+50
* | | | | | | | | Merge "Fix dynamic resampling for non-NEON devices"Andy Hung2014-02-041-6/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix dynamic resampling for non-NEON devicesAndy Hung2014-02-031-6/+2
* | | | | | | | | Merge "Use const NBAIO_Format& in parameter lists"Glenn Kasten2014-02-038-18/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use const NBAIO_Format& in parameter listsGlenn Kasten2014-01-318-18/+18
| |/ / / / / / / /
* | | | | | | | | Merge "MPEG4Writer: use "mp42" as major/minor brand in ftyp box."Robert Shih2014-02-031-3/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | MPEG4Writer: use "mp42" as major/minor brand in ftyp box.Robert Shih2014-01-301-3/+6
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge "Enable new dynamic audio resampler as default"Andy Hung2014-02-032-3/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Enable new dynamic audio resampler as defaultAndy Hung2014-01-302-3/+11
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Added support to query ACodec whether adaptive playback is enabled."Robert Shih2014-02-032-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added support to query ACodec whether adaptive playback is enabled.Robert Shih2014-01-292-0/+8
* | | | | | | | | | Merge "Fixed misplaced bracket for switch-case block."Robert Shih2014-02-031-4/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fixed misplaced bracket for switch-case block.Robert Shih2014-01-241-4/+4
* | | | | | | | | | am 324d9157: am 5db1e3a6: Merge "correct one logic error in decide whether sh...Lajos Molnar2014-02-032-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | am 5db1e3a6: Merge "correct one logic error in decide whether should render o...Lajos Molnar2014-02-032-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Merge "correct one logic error in decide whether should render or not"Lajos Molnar2014-02-032-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | correct one logic error in decide whether should render or notJianzheng Zhou2014-02-032-2/+2
| | |/ / / / / / / /
* | | | | | | | | | am af1aa00e: am c4eef29a: Merge "fix deadlock issues that arise when there ar...Eric Laurent2014-02-036-55/+88
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am c4eef29a: Merge "fix deadlock issues that arise when there are simultaneou...Eric Laurent2014-02-036-55/+88
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "fix deadlock issues that arise when there are simultaneous effect cont...Eric Laurent2014-01-316-55/+88
| | |\ \ \ \ \ \ \ \