summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am f5e63398: am 65b351c9: am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error...Marco Nelissen2015-04-091-0/+10
|\
| * am 65b351c9: am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error in corrupted...Marco Nelissen2015-04-091-0/+10
| |\
| | * am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error in corrupted media file"Marco Nelissen2015-04-091-0/+10
| | |\
| | | * am 1c4eddb1: Merge "Fix div zero error in corrupted media file"Marco Nelissen2015-04-091-0/+10
| | | |\
| | | | * Merge "Fix div zero error in corrupted media file"Marco Nelissen2015-04-091-0/+10
| | | | |\
| | | | | * Fix div zero error in corrupted media fileDan Liang2015-04-081-0/+10
| | | | |/
* | | | | Merge "Fix AudioPolicyManager dynamic policy initialization"Jean-Michel Trivi2015-04-093-31/+31
|\ \ \ \ \
| * | | | | Fix AudioPolicyManager dynamic policy initializationJean-Michel Trivi2015-04-083-31/+31
* | | | | | Merge "audio policy: volume in dBs"Eric Laurent2015-04-0910-40/+77
|\ \ \ \ \ \
| * | | | | | audio policy: volume in dBsEric Laurent2015-04-0810-40/+77
* | | | | | | Merge "audio policy: volume control reorganization"Eric Laurent2015-04-099-376/+571
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | audio policy: volume control reorganizationEric Laurent2015-04-089-376/+571
* | | | | | | Merge "Enable 8 bit and float pcm record formats for AudioFlinger"Andy Hung2015-04-094-21/+77
|\ \ \ \ \ \ \
| * | | | | | | Enable 8 bit and float pcm record formats for AudioFlingerAndy Hung2015-04-084-21/+77
* | | | | | | | Merge "Improve ResamplerBufferProvider"Andy Hung2015-04-084-40/+88
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Improve ResamplerBufferProviderAndy Hung2015-04-084-40/+88
* | | | | | | | Merge "Add RecordBufferConverter for RecordThread data processing"Andy Hung2015-04-084-136/+305
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add RecordBufferConverter for RecordThread data processingAndy Hung2015-04-084-136/+305
* | | | | | | | Merge "Return number of frames output from resample method"Andy Hung2015-04-089-41/+59
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | Return number of frames output from resample methodAndy Hung2015-04-089-41/+59
* | | | | | | Merge "audio flinger: improve device to device audio patches"Eric Laurent2015-04-084-24/+29
|\ \ \ \ \ \ \
| * | | | | | | audio flinger: improve device to device audio patchesEric Laurent2015-04-084-24/+29
* | | | | | | | Merge "audio policy: fix unique audio port ID."Eric Laurent2015-04-0816-79/+180
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | audio policy: fix unique audio port ID.Eric Laurent2015-04-0816-79/+180
* | | | | | | HLS: traces in LiveSession and PlaylistFetcher for easier debuggingChong Zhang2015-04-085-58/+172
|/ / / / / /
* | | | | | Merge "Adding explicit routing API to AudioTrack"Paul McLean2015-04-0818-28/+251
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Adding explicit routing API to AudioTrackPaul McLean2015-04-0818-28/+251
* | | | | | am e5eda367: (-s ours) am afc7b857: am e849af87: Cherry-pick two BufferItem c...Dan Stoza2015-04-070-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am afc7b857: am e849af87: Cherry-pick two BufferItem changesDan Stoza2015-04-0712-27/+28
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am e849af87: Cherry-pick two BufferItem changesDan Stoza2015-04-0712-27/+28
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Cherry-pick two BufferItem changesDan Stoza2015-04-0712-27/+28
* | | | | | Merge "Camera2Client: support HAL version 3.3"Zhijun He2015-04-071-1/+2
|\ \ \ \ \ \
| * | | | | | Camera2Client: support HAL version 3.3Zhijun He2015-04-071-1/+2
* | | | | | | Merge "stagefright: add new MediaCodec callback CB_RESOURCE_RECLAIMED."Ronghua Wu2015-04-071-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | stagefright: add new MediaCodec callback CB_RESOURCE_RECLAIMED.Ronghua Wu2015-03-191-0/+1
* | | | | | | am 514c8ffc: (-s ours) am 0ffe8f97: am 39a8a377: (-s ours) am ddd1c72b: (-s o...Lajos Molnar2015-04-070-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 0ffe8f97: am 39a8a377: (-s ours) am ddd1c72b: (-s ours) Merge "DO NOT MERG...Lajos Molnar2015-04-070-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am 39a8a377: (-s ours) am ddd1c72b: (-s ours) Merge "DO NOT MERGE: mediaplaye...Lajos Molnar2015-04-060-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | am ddd1c72b: (-s ours) Merge "DO NOT MERGE: mediaplayer: ensure secure decode...Lajos Molnar2015-04-060-0/+0
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Merge "DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated bef...Lajos Molnar2015-04-065-14/+111
| | | | |\ \ \
| | | | | * | | DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before sta...Lajos Molnar2015-04-035-14/+111
* | | | | | | | audiopolicy: add support for parsing AUDIO_FORMAT_DTSPhil Burk2015-04-061-0/+2
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | am 3248cb7d: (-s ours) am af69e818: am 4ea8ecf7: (-s ours) am f7f62b7e: (-s o...Chong Zhang2015-04-030-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am af69e818: am 4ea8ecf7: (-s ours) am f7f62b7e: (-s ours) Merge "nuplayer: d...Chong Zhang2015-04-030-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 4ea8ecf7: (-s ours) am f7f62b7e: (-s ours) Merge "nuplayer: do not use cac...Chong Zhang2015-04-030-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am f7f62b7e: (-s ours) Merge "nuplayer: do not use cached source for wvm cont...Chong Zhang2015-04-030-0/+0
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge "nuplayer: do not use cached source for wvm content -- DO NOT MERGE"Chong Zhang2015-04-031-23/+32
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | nuplayer: do not use cached source for wvm content -- DO NOT MERGEChong Zhang2015-04-031-23/+32
| | | | |/ /
* | | | | | Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_V...Robert Shih2015-04-031-2/+2
|\ \ \ \ \ \
| * | | | | | ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEORobert Shih2015-04-011-2/+2