summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "media: use ResourceManagerService with MediaCodec"Ronghua Wu2015-04-155-31/+380
|\
| * media: use ResourceManagerService with MediaCodecRonghua Wu2015-04-145-31/+380
* | Merge "HLS: parse stream resolution and set maxWidth/maxHeight"Chong Zhang2015-04-155-0/+66
|\ \
| * | HLS: parse stream resolution and set maxWidth/maxHeightChong Zhang2015-04-145-0/+66
* | | Merge "stagefright: metadata retriever changes for capture fps"Chong Zhang2015-04-145-20/+163
|\ \ \
| * | | stagefright: metadata retriever changes for capture fpsChong Zhang2015-04-135-20/+163
| |/ /
* | | Merge "mpeg2ts: Set SAMPLE_FLAG_SYNC for mpeg2ts stream"Jinsuk Kim2015-04-142-0/+34
|\ \ \
| * | | mpeg2ts: Set SAMPLE_FLAG_SYNC for mpeg2ts streamTerry Heo2015-04-142-0/+34
* | | | Merge "camera2: add reprocess support"Chien-Yu Chen2015-04-1417-37/+393
|\ \ \ \
| * | | | camera2: add reprocess supportChien-Yu Chen2015-04-1317-37/+393
* | | | | Merge "AudioRecord::obtainBuffer() can return nonContig like AudioTrack"Glenn Kasten2015-04-143-4/+27
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | AudioRecord::obtainBuffer() can return nonContig like AudioTrackGlenn Kasten2015-04-133-4/+27
* | | | | media: handle overrides and measure max codec instance.Ronghua Wu2015-04-1311-33/+1018
* | | | | Merge "libstagefright: parse global settings from codec xml file."Ronghua Wu2015-04-142-10/+86
|\ \ \ \ \
| * | | | | libstagefright: parse global settings from codec xml file.Ronghua Wu2015-04-132-10/+86
* | | | | | Merge "camera: Fix client eviction/disconnect race."Ruben Brunk2015-04-143-4/+75
|\ \ \ \ \ \
| * | | | | | camera: Fix client eviction/disconnect race.Ruben Brunk2015-04-133-4/+75
* | | | | | | Merge "TimestretchBufferProvider integration with Sonic Library"Ricardo Garcia2015-04-145-15/+38
|\ \ \ \ \ \ \
| * | | | | | | TimestretchBufferProvider integration with Sonic LibraryRicardo Garcia2015-04-135-15/+38
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Remove deprecated image defines"Lajos Molnar2015-04-141-7/+7
|\ \ \ \ \ \ \
| * | | | | | | Remove deprecated image definesJohann2015-04-101-7/+7
* | | | | | | | Merge "audio polciy: remove FM audio capture permission."Eric Laurent2015-04-134-12/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | audio polciy: remove FM audio capture permission.Eric Laurent2015-04-134-12/+2
* | | | | | | | Merge "MediaCodec: add DeathNotifier to BatteryNotifier"Chong Zhang2015-04-131-10/+74
|\ \ \ \ \ \ \ \
| * | | | | | | | MediaCodec: add DeathNotifier to BatteryNotifierChong Zhang2015-04-101-10/+74
* | | | | | | | | Merge "NuPlayerRenderer: adjust delay of posting drain audio message based on...Wei Jia2015-04-131-0/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | NuPlayerRenderer: adjust delay of posting drain audio message based on playba...Wei Jia2015-04-101-0/+3
* | | | | | | | | am 52806313: am e1650d00: am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53:...Nick Kralevich2015-04-110-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am e1650d00: am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82:...Nick Kralevich2015-04-111-0/+6
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3:...Nick Kralevich2015-04-111-0/+6
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3: am 64290793:...Nick Kralevich2015-04-111-0/+6
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix i...Nick Kralevich2015-04-111-0/+6
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underf...Nick Kralevich2015-04-111-0/+6
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS p...Nick Kralevich2015-04-101-0/+6
| | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" in...Nick Kralevich2015-04-101-0/+6
| | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-devNick Kralevich2015-04-101-0/+6
| | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ Merge "Fix integer underflow in ESDS processing" into klp-devNick Kralevich2015-04-101-0/+6
| | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | | | Fix integer underflow in ESDS processingJoshua J. Drake2015-04-091-0/+6
* | | | | | | | | | | | | | | | | | | am 0dc95be5: am 17b6f9b0: am 3b042ea5: am 7d62a918: am 14c686c0: am 940189d9:...Nick Kralevich2015-04-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 17b6f9b0: am 3b042ea5: am 7d62a918: am 14c686c0: am 940189d9: am 475de998:...Nick Kralevich2015-04-111-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | am 3b042ea5: am 7d62a918: am 14c686c0: am 940189d9: am 475de998: am 47759307:...Nick Kralevich2015-04-111-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | am 7d62a918: am 14c686c0: am 940189d9: am 475de998: am 47759307: am 17b625b7:...Nick Kralevich2015-04-111-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | am 14c686c0: am 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix i...Nick Kralevich2015-04-111-0/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | am 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overfl...Nick Kralevich2015-04-111-0/+3
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4...Nick Kralevich2015-04-101-0/+3
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / /
| | | | | | | * | | | | | | | | | | | am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom process...Nick Kralevich2015-04-101-0/+3
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / /
| | | | | | | | * | | | | | | | | | | am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp...Nick Kralevich2015-04-101-0/+3
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / /
| | | | | | | | | * | | | | | | | | | Merge "Fix integer overflow during MP4 atom processing" into klp-devNick Kralevich2015-04-101-0/+3
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | | | | Fix integer overflow during MP4 atom processingJoshua J. Drake2015-04-091-0/+3
| | | | | | | | | | |/ / / / / / / / /
* | | | | | | | | | | | | | | | | | | am ef6a1a21: am 892e06d1: am 86fb9185: am 75a8776e: am 3cff4324: am 520434cd:...Joshua J. Drake2015-04-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /