summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-016-19/+154
|\
| * Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-296-19/+154
* | am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more...Lajos Molnar2014-03-283-56/+30
|\ \ | |/
| * am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with...Lajos Molnar2014-03-283-56/+30
| |\
| | * Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQu...Lajos Molnar2014-03-283-56/+30
| | |\
| | | * DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"Lajos Molnar2014-03-273-56/+30
* | | | am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for...Lajos Molnar2014-03-282-10/+7
|\ \ \ \ | |/ / /
| * | | am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeue...Lajos Molnar2014-03-282-10/+7
| |\ \ \ | | |/ /
| | * | Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be o...Lajos Molnar2014-03-282-10/+7
| | |\ \ | | | |/
| | | * DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"Lajos Molnar2014-03-272-10/+7
* | | | am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview...Igor Murashkin2014-03-255-44/+706
|\ \ \ \ | |/ / /
| * | | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r...Igor Murashkin2014-03-255-44/+706
| |\ \ \ | | |/ /
| | * | DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-255-44/+706
* | | | am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
|\ \ \ \
| * \ \ \ Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| |\ \ \ \
| | * | | | CameraService: deadlock fixKalle Lampila2014-03-251-0/+1
| |/ / / /
* | | | | resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aospColin Cross2014-03-2120-70/+80
|\ \ \ \ \ | |/ / / /
| * | | | Merge changes I9f28bc42,I135620e0Colin Cross2014-03-2220-70/+80
| |\ \ \ \
| | * | | | libcameraservice: build 64-bitColin Cross2014-03-211-1/+0
| | * | | | libcameraservice: fix 64-bit print format warningsColin Cross2014-03-2119-69/+80
| |/ / / /
* | | | | am 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite ...Lajos Molnar2014-03-211-0/+12
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when par...Lajos Molnar2014-03-211-0/+12
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." i...Lajos Molnar2014-03-211-0/+12
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.Robert Shih2014-03-211-0/+12
* | | | | am 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB (more p...Rachad2014-03-211-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32...Rachad2014-03-211-3/+5
| |\ \ \ \ | | |/ / /
| | * | | Increased recorded MP4 max file size to 4GBRachad2014-03-211-3/+5
| | |/ /
* | | | am 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061:...Marco Nelissen2014-03-201-0/+1
|\ \ \ \ | |/ / /
| * | | am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806:...Marco Nelissen2014-03-201-0/+1
| |\ \ \ | | |/ /
| | * | am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628:...Marco Nelissen2014-03-201-0/+1
| | |\ \
| | | * \ am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830:...Marco Nelissen2014-03-201-0/+1
| | | |\ \
| | | | * \ am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | |\ \
| | | | | * \ am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | |\ \
| | | | | | * \ am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | | |\ \
| | | | | | | * \ am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | | | |\ \
| | | | | | | | * \ am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | | | | |\ \
| | | | | | | | | * | Fix buildMarco Nelissen2014-03-201-0/+1
* | | | | | | | | | | am 994cbef7: am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473:...Marco Nelissen2014-03-201-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba:...Marco Nelissen2014-03-201-1/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80:...Marco Nelissen2014-03-201-1/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b:...Marco Nelissen2014-03-201-2/+102
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea:...Marco Nelissen2014-03-201-2/+102
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75:...Marco Nelissen2014-03-201-2/+102
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certi...Marco Nelissen2014-03-201-2/+102
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | |\ \ \ \ | | | | | | | | |/ / /
| | | | | | | | * | | am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | | |\ \ \ | | | | | | | | | |/ /
| | | | | | | | | * | am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | | | |\ \
| | | | | | | | | | * \ am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | | | | |\ \
| | | | | | | | | | | * | Verify certificatesMarco Nelissen2014-03-191-2/+102
* | | | | | | | | | | | | am 24e1bd71: Merge "libstagefright is no longer 32 bit only."Glenn Kasten2014-03-197-13/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |