Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 68d9d71a: Support CAST V2 Authentication in MediaDrm | Jeff Tinker | 2014-04-01 | 6 | -19/+154 |
|\ | |||||
| * | Support CAST V2 Authentication in MediaDrm | Jeff Tinker | 2014-03-29 | 6 | -19/+154 |
* | | am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more... | Lajos Molnar | 2014-03-28 | 3 | -56/+30 |
|\ \ | |/ | |||||
| * | am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with... | Lajos Molnar | 2014-03-28 | 3 | -56/+30 |
| |\ | |||||
| | * | Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQu... | Lajos Molnar | 2014-03-28 | 3 | -56/+30 |
| | |\ | |||||
| | | * | DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue" | Lajos Molnar | 2014-03-27 | 3 | -56/+30 |
* | | | | am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for... | Lajos Molnar | 2014-03-28 | 2 | -10/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeue... | Lajos Molnar | 2014-03-28 | 2 | -10/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be o... | Lajos Molnar | 2014-03-28 | 2 | -10/+7 |
| | |\ \ | | | |/ | |||||
| | | * | DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less" | Lajos Molnar | 2014-03-27 | 2 | -10/+7 |
* | | | | am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview... | Igor Murashkin | 2014-03-25 | 5 | -44/+706 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r... | Igor Murashkin | 2014-03-25 | 5 | -44/+706 |
| |\ \ \ | | |/ / | |||||
| | * | | DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values | Igor Murashkin | 2014-03-25 | 5 | -44/+706 |
* | | | | am 4f53fe74: Merge "CameraService: deadlock fix" | Eino-Ville Talvala | 2014-03-25 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge "CameraService: deadlock fix" | Eino-Ville Talvala | 2014-03-25 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| | * | | | | CameraService: deadlock fix | Kalle Lampila | 2014-03-25 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp | Colin Cross | 2014-03-21 | 20 | -70/+80 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge changes I9f28bc42,I135620e0 | Colin Cross | 2014-03-22 | 20 | -70/+80 |
| |\ \ \ \ | |||||
| | * | | | | libcameraservice: build 64-bit | Colin Cross | 2014-03-21 | 1 | -1/+0 |
| | * | | | | libcameraservice: fix 64-bit print format warnings | Colin Cross | 2014-03-21 | 19 | -69/+80 |
| |/ / / / | |||||
* | | | | | am 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite ... | Lajos Molnar | 2014-03-21 | 1 | -0/+12 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when par... | Lajos Molnar | 2014-03-21 | 1 | -0/+12 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." i... | Lajos Molnar | 2014-03-21 | 1 | -0/+12 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS. | Robert Shih | 2014-03-21 | 1 | -0/+12 |
* | | | | | am 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB (more p... | Rachad | 2014-03-21 | 1 | -3/+5 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32... | Rachad | 2014-03-21 | 1 | -3/+5 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Increased recorded MP4 max file size to 4GB | Rachad | 2014-03-21 | 1 | -3/+5 |
| | |/ / | |||||
* | | | | am 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061:... | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806:... | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628:... | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | |\ \ | |||||
| | | * \ | am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830:... | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | |\ \ | |||||
| | | | * \ | am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | | |\ \ | |||||
| | | | | * \ | am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | | | |\ \ | |||||
| | | | | | * \ | am 42ba5806: am 72499628: am 25bab830: Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | | | | |\ \ | |||||
| | | | | | | * \ | am 72499628: am 25bab830: Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | | | | | |\ \ | |||||
| | | | | | | | * \ | am 25bab830: Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | | | | | | |\ \ | |||||
| | | | | | | | | * | | Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
* | | | | | | | | | | | am 994cbef7: am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473:... | Marco Nelissen | 2014-03-20 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba:... | Marco Nelissen | 2014-03-20 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80:... | Marco Nelissen | 2014-03-20 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | * | | | | | | | | am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b:... | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | |||||
| | | | * | | | | | | | am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea:... | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | |||||
| | | | | * | | | | | | am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75:... | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | |||||
| | | | | | * | | | | | am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certi... | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | |||||
| | | | | | | * | | | | am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | |||||
| | | | | | | | * | | | am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | |||||
| | | | | | | | | * | | am 3bc4f7ea: am 0c271b75: Verify certificates | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | | | | | |\ \ | |||||
| | | | | | | | | | * \ | am 0c271b75: Verify certificates | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | * | | Verify certificates | Marco Nelissen | 2014-03-19 | 1 | -2/+102 |
* | | | | | | | | | | | | | am 24e1bd71: Merge "libstagefright is no longer 32 bit only." | Glenn Kasten | 2014-03-19 | 7 | -13/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |