Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "media: use ResourceManagerService with MediaCodec" | Ronghua Wu | 2015-04-15 | 5 | -31/+380 |
|\ | |||||
| * | media: use ResourceManagerService with MediaCodec | Ronghua Wu | 2015-04-14 | 5 | -31/+380 |
* | | Merge "HLS: parse stream resolution and set maxWidth/maxHeight" | Chong Zhang | 2015-04-15 | 5 | -0/+66 |
|\ \ | |||||
| * | | HLS: parse stream resolution and set maxWidth/maxHeight | Chong Zhang | 2015-04-14 | 5 | -0/+66 |
* | | | Merge "stagefright: metadata retriever changes for capture fps" | Chong Zhang | 2015-04-14 | 5 | -20/+163 |
|\ \ \ | |||||
| * | | | stagefright: metadata retriever changes for capture fps | Chong Zhang | 2015-04-13 | 5 | -20/+163 |
| |/ / | |||||
* | | | Merge "mpeg2ts: Set SAMPLE_FLAG_SYNC for mpeg2ts stream" | Jinsuk Kim | 2015-04-14 | 2 | -0/+34 |
|\ \ \ | |||||
| * | | | mpeg2ts: Set SAMPLE_FLAG_SYNC for mpeg2ts stream | Terry Heo | 2015-04-14 | 2 | -0/+34 |
* | | | | Merge "camera2: add reprocess support" | Chien-Yu Chen | 2015-04-14 | 17 | -37/+393 |
|\ \ \ \ | |||||
| * | | | | camera2: add reprocess support | Chien-Yu Chen | 2015-04-13 | 17 | -37/+393 |
* | | | | | Merge "AudioRecord::obtainBuffer() can return nonContig like AudioTrack" | Glenn Kasten | 2015-04-14 | 3 | -4/+27 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | AudioRecord::obtainBuffer() can return nonContig like AudioTrack | Glenn Kasten | 2015-04-13 | 3 | -4/+27 |
* | | | | | media: handle overrides and measure max codec instance. | Ronghua Wu | 2015-04-13 | 11 | -33/+1018 |
* | | | | | Merge "libstagefright: parse global settings from codec xml file." | Ronghua Wu | 2015-04-14 | 2 | -10/+86 |
|\ \ \ \ \ | |||||
| * | | | | | libstagefright: parse global settings from codec xml file. | Ronghua Wu | 2015-04-13 | 2 | -10/+86 |
* | | | | | | Merge "camera: Fix client eviction/disconnect race." | Ruben Brunk | 2015-04-14 | 3 | -4/+75 |
|\ \ \ \ \ \ | |||||
| * | | | | | | camera: Fix client eviction/disconnect race. | Ruben Brunk | 2015-04-13 | 3 | -4/+75 |
* | | | | | | | Merge "TimestretchBufferProvider integration with Sonic Library" | Ricardo Garcia | 2015-04-14 | 5 | -15/+38 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | TimestretchBufferProvider integration with Sonic Library | Ricardo Garcia | 2015-04-13 | 5 | -15/+38 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge "Remove deprecated image defines" | Lajos Molnar | 2015-04-14 | 1 | -7/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove deprecated image defines | Johann | 2015-04-10 | 1 | -7/+7 |
* | | | | | | | | Merge "audio polciy: remove FM audio capture permission." | Eric Laurent | 2015-04-13 | 4 | -12/+2 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | audio polciy: remove FM audio capture permission. | Eric Laurent | 2015-04-13 | 4 | -12/+2 |
* | | | | | | | | Merge "MediaCodec: add DeathNotifier to BatteryNotifier" | Chong Zhang | 2015-04-13 | 1 | -10/+74 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | MediaCodec: add DeathNotifier to BatteryNotifier | Chong Zhang | 2015-04-10 | 1 | -10/+74 |
* | | | | | | | | | Merge "NuPlayerRenderer: adjust delay of posting drain audio message based on... | Wei Jia | 2015-04-13 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | NuPlayerRenderer: adjust delay of posting drain audio message based on playba... | Wei Jia | 2015-04-10 | 1 | -0/+3 |
* | | | | | | | | | am 52806313: am e1650d00: am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53:... | Nick Kralevich | 2015-04-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | am e1650d00: am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82:... | Nick Kralevich | 2015-04-11 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3:... | Nick Kralevich | 2015-04-11 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3: am 64290793:... | Nick Kralevich | 2015-04-11 | 1 | -0/+6 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix i... | Nick Kralevich | 2015-04-11 | 1 | -0/+6 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ | am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underf... | Nick Kralevich | 2015-04-11 | 1 | -0/+6 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ | am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS p... | Nick Kralevich | 2015-04-10 | 1 | -0/+6 |
| | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ \ \ | am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" in... | Nick Kralevich | 2015-04-10 | 1 | -0/+6 |
| | | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ \ \ \ \ | am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev | Nick Kralevich | 2015-04-10 | 1 | -0/+6 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ \ \ | Merge "Fix integer underflow in ESDS processing" into klp-dev | Nick Kralevich | 2015-04-10 | 1 | -0/+6 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | | * | | | | | | | | | Fix integer underflow in ESDS processing | Joshua J. Drake | 2015-04-09 | 1 | -0/+6 |
* | | | | | | | | | | | | | | | | | | | am 0dc95be5: am 17b6f9b0: am 3b042ea5: am 7d62a918: am 14c686c0: am 940189d9:... | Nick Kralevich | 2015-04-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | am 17b6f9b0: am 3b042ea5: am 7d62a918: am 14c686c0: am 940189d9: am 475de998:... | Nick Kralevich | 2015-04-11 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | am 3b042ea5: am 7d62a918: am 14c686c0: am 940189d9: am 475de998: am 47759307:... | Nick Kralevich | 2015-04-11 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | | | am 7d62a918: am 14c686c0: am 940189d9: am 475de998: am 47759307: am 17b625b7:... | Nick Kralevich | 2015-04-11 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | | | | am 14c686c0: am 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix i... | Nick Kralevich | 2015-04-11 | 1 | -0/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / | |||||
| | | | | * | | | | | | | | | | | | | | am 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overfl... | Nick Kralevich | 2015-04-11 | 1 | -0/+3 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / | |||||
| | | | | | * | | | | | | | | | | | | | am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4... | Nick Kralevich | 2015-04-10 | 1 | -0/+3 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / | |||||
| | | | | | | * | | | | | | | | | | | | am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom process... | Nick Kralevich | 2015-04-10 | 1 | -0/+3 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / | |||||
| | | | | | | | * | | | | | | | | | | | am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp... | Nick Kralevich | 2015-04-10 | 1 | -0/+3 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / | |||||
| | | | | | | | | * | | | | | | | | | | Merge "Fix integer overflow during MP4 atom processing" into klp-dev | Nick Kralevich | 2015-04-10 | 1 | -0/+3 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | | * | | | | | | | | | | Fix integer overflow during MP4 atom processing | Joshua J. Drake | 2015-04-09 | 1 | -0/+3 |
| | | | | | | | | | |/ / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | am ef6a1a21: am 892e06d1: am 86fb9185: am 75a8776e: am 3cff4324: am 520434cd:... | Joshua J. Drake | 2015-04-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |