Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am fed1594d: am 9916dcb6: am 0d64fcb4: Merge "Clean up some makefiles." | Dan Albert | 2014-09-12 | 2 | -6/+1 |
|\ | |||||
| * | am 9916dcb6: am 0d64fcb4: Merge "Clean up some makefiles." | Dan Albert | 2014-09-12 | 2 | -6/+1 |
| |\ | |||||
| | * | am 0d64fcb4: Merge "Clean up some makefiles." | Dan Albert | 2014-09-12 | 2 | -6/+1 |
| | |\ | |||||
| | | * | Merge "Clean up some makefiles." | Dan Albert | 2014-09-11 | 2 | -6/+1 |
| | | |\ | |||||
| | | | * | Clean up some makefiles. | Dan Albert | 2014-09-11 | 2 | -6/+1 |
* | | | | | am bd014b81: am fe80b7ee: am 6bf7c5cf: Merge "Clean up test makefiles." | Dan Albert | 2014-09-12 | 1 | -14/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am fe80b7ee: am 6bf7c5cf: Merge "Clean up test makefiles." | Dan Albert | 2014-09-12 | 1 | -14/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | am 6bf7c5cf: Merge "Clean up test makefiles." | Dan Albert | 2014-09-12 | 1 | -14/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge "Clean up test makefiles." | Dan Albert | 2014-09-11 | 1 | -14/+2 |
| | | |\ \ | | | | |/ | | | |/| | |||||
| | | | * | Clean up test makefiles. | Dan Albert | 2014-09-11 | 1 | -14/+2 |
* | | | | | am 236688e8: am 97187317: Merge "stagefright: add adaptive playback support t... | Ronghua Wu | 2014-09-12 | 5 | -107/+130 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 97187317: Merge "stagefright: add adaptive playback support to SoftAVC dec... | Ronghua Wu | 2014-09-11 | 5 | -107/+130 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge "stagefright: add adaptive playback support to SoftAVC decoder." into l... | Ronghua Wu | 2014-09-11 | 5 | -107/+130 |
| | |\ \ \ \ | |||||
| | | * | | | | stagefright: add adaptive playback support to SoftAVC decoder. | Ronghua Wu | 2014-09-10 | 5 | -107/+130 |
* | | | | | | | am 75a39a7e: am 951c2197: am 2b16391d: Merge "Add test for AMR-NB decoder" | Glenn Kasten | 2014-09-12 | 2 | -0/+170 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 951c2197: am 2b16391d: Merge "Add test for AMR-NB decoder" | Glenn Kasten | 2014-09-11 | 2 | -0/+170 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | am 2b16391d: Merge "Add test for AMR-NB decoder" | Glenn Kasten | 2014-09-11 | 2 | -0/+170 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Merge "Add test for AMR-NB decoder" | Glenn Kasten | 2014-09-11 | 2 | -0/+170 |
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | | * | | | Add test for AMR-NB decoder | Ashok Bhat | 2014-06-16 | 2 | -0/+170 |
* | | | | | | | Merge "stagefright: finish implementing MediaFilter flush" | David Smith | 2014-09-11 | 1 | -3/+20 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | stagefright: finish implementing MediaFilter flush | David Smith | 2014-09-09 | 1 | -3/+20 |
* | | | | | | | | am 87088150: am fd732779: Merge "stagefright: don\'t use AAtomizer in AMessag... | Lajos Molnar | 2014-09-11 | 1 | -30/+93 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am fd732779: Merge "stagefright: don\'t use AAtomizer in AMessage" into lmp-dev | Lajos Molnar | 2014-09-11 | 1 | -30/+93 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | Merge "stagefright: don't use AAtomizer in AMessage" into lmp-dev | Lajos Molnar | 2014-09-11 | 1 | -30/+93 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | stagefright: don't use AAtomizer in AMessage | Lajos Molnar | 2014-09-10 | 1 | -30/+93 |
* | | | | | | | | | am ebea445f: am b9b87fe9: mediaplayer: release MediaBuffer in stale input buf... | Lajos Molnar | 2014-09-11 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am b9b87fe9: mediaplayer: release MediaBuffer in stale input buffers | Lajos Molnar | 2014-09-11 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | mediaplayer: release MediaBuffer in stale input buffers | Lajos Molnar | 2014-09-10 | 1 | -0/+11 |
* | | | | | | | | | resolved conflicts for merge of 42db212e to master | Wei Jia | 2014-09-11 | 1 | -6/+7 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am e4c8b32f: Merge "NuPlayerDriver: do not set to paused state when receiving... | Wei Jia | 2014-09-10 | 1 | -5/+8 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge "NuPlayerDriver: do not set to paused state when receiving playback com... | Wei Jia | 2014-09-10 | 1 | -5/+8 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | NuPlayerDriver: do not set to paused state when receiving playback complete a... | Wei Jia | 2014-09-10 | 1 | -5/+8 |
* | | | | | | | | | | am 3eef436c: am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac ... | Marco Nelissen | 2014-09-11 | 2 | -194/+128 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac frames per in... | Marco Nelissen | 2014-09-10 | 2 | -194/+128 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" ... | Marco Nelissen | 2014-09-10 | 2 | -194/+128 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Revert "Fix AAC timestamps for multiple aac frames per input buffer" | Marco Nelissen | 2014-09-10 | 2 | -194/+128 |
* | | | | | | | | | | | am f2745669: am 74848665: Merge "fix failure in MediaCodecTest#testException"... | Chong Zhang | 2014-09-11 | 1 | -1/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 74848665: Merge "fix failure in MediaCodecTest#testException" into lmp-dev | Chong Zhang | 2014-09-10 | 1 | -1/+14 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "fix failure in MediaCodecTest#testException" into lmp-dev | Chong Zhang | 2014-09-10 | 1 | -1/+14 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | fix failure in MediaCodecTest#testException | Chong Zhang | 2014-09-10 | 1 | -1/+14 |
* | | | | | | | | | | | am 55e9e267: am b606de81: Merge "mediaplayer: limit number of outstanding buf... | Lajos Molnar | 2014-09-11 | 1 | -6/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am b606de81: Merge "mediaplayer: limit number of outstanding buffer requests"... | Lajos Molnar | 2014-09-10 | 1 | -6/+7 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "mediaplayer: limit number of outstanding buffer requests" into lmp-dev | Lajos Molnar | 2014-09-10 | 1 | -6/+7 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | mediaplayer: limit number of outstanding buffer requests | Lajos Molnar | 2014-09-09 | 1 | -6/+7 |
| | | | |/ / / / / / | | | |/| | | | | | | |||||
* | | | | | | | | | | am ef2e3619: am 83ee5564: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_216... | Zhijun He | 2014-09-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 83ee5564: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev | Zhijun He | 2014-09-10 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev | Zhijun He | 2014-09-10 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P | Zhijun He | 2014-09-09 | 1 | -0/+1 |
* | | | | | | | | | | am 59424ee1: am 8716e3f3: Merge "NuPlayer: make previous decoders obsolete wh... | Wei Jia | 2014-09-10 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 8716e3f3: Merge "NuPlayer: make previous decoders obsolete when reset is d... | Wei Jia | 2014-09-10 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / |