Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | 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 fb08bd76: (-s ours) am 994cbef7: am 2853e48c: am 6f65db14: am 0e0891f8: am... | Marco Nelissen | 2014-03-20 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | | | | | | Merge "A few fixes in SW VP8 encoder:" | Alex Glaznev | 2014-03-20 | 2 | -17/+77 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | A few fixes in SW VP8 encoder: | Alex Glaznev | 2014-03-19 | 2 | -17/+77 | |
* | | | | | | | | | | | | | | | | | | camera: Fix setParameters for Preview FPS single/range values | Igor Murashkin | 2014-03-20 | 3 | -47/+267 | |
* | | | | | | | | | | | | | | | | | | libstagefright: fix 64-bit warnings | Colin Cross | 2014-03-19 | 19 | -73/+87 | |
* | | | | | | | | | | | | | | | | | | Merge "Add MediaPlayer::getAudioStreamType." | John Spurlock | 2014-03-19 | 2 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Add MediaPlayer::getAudioStreamType. | John Spurlock | 2014-03-19 | 2 | -0/+9 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge commit 'c250980f' into manualmerge | Glenn Kasten | 2014-03-19 | 6 | -11/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | am 24e1bd71: Merge "libstagefright is no longer 32 bit only." | Glenn Kasten | 2014-03-19 | 7 | -13/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Merge "libstagefright is no longer 32 bit only." | Glenn Kasten | 2014-03-19 | 7 | -13/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | libstagefright is no longer 32 bit only. | Narayan Kamath | 2014-03-19 | 7 | -13/+0 | |
* | | | | | | | | | | | | | | | | | | | am 08298357: am bd7bde79: Merge "Use libaudioresampler instead of libaudiofli... | Glenn Kasten | 2014-03-19 | 4 | -11/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | am bd7bde79: Merge "Use libaudioresampler instead of libaudioflinger" | Glenn Kasten | 2014-03-19 | 4 | -11/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Merge "Use libaudioresampler instead of libaudioflinger" | Glenn Kasten | 2014-03-19 | 4 | -11/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | Use libaudioresampler instead of libaudioflinger | Glenn Kasten | 2014-03-19 | 4 | -11/+3 | |
* | | | | | | | | | | | | | | | | | | | Merge "Use more tags to help the ICU detector." | Marco Nelissen | 2014-03-19 | 2 | -20/+99 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Use more tags to help the ICU detector. | Marco Nelissen | 2014-03-19 | 2 | -20/+99 | |
* | | | | | | | | | | | | | | | | | | | | am bd1f8f0a: am fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBu... | Lajos Molnar | 2014-03-19 | 2 | -7/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | am fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBufs to be one ... | Lajos Molnar | 2014-03-19 | 2 | -7/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less | Lajos Molnar | 2014-03-19 | 2 | -7/+10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | stagefright: allow for minUndequeuedBufs to be one less | Lajos Molnar | 2014-03-19 | 2 | -7/+10 | |
* | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of f40c4c56 to master | Glenn Kasten | 2014-03-19 | 1 | -9/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am 36817364: Merge "Add libaudioresampler" | Glenn Kasten | 2014-03-19 | 1 | -11/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge "Add libaudioresampler" | Glenn Kasten | 2014-03-19 | 1 | -11/+18 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | Add libaudioresampler | Glenn Kasten | 2014-03-19 | 1 | -11/+18 | |
| | |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | stagefright: add include support for MediaCodecList xml parser | Lajos Molnar | 2014-03-19 | 2 | -39/+110 | |
| |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | am 129c7653: am 9cde5172: am b635b0e6: mediaplayer: keep more buffers with th... | Lajos Molnar | 2014-03-19 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | am 9cde5172: am b635b0e6: mediaplayer: keep more buffers with the BufferQueue | Lajos Molnar | 2014-03-19 | 3 | -30/+56 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | am b635b0e6: mediaplayer: keep more buffers with the BufferQueue | Lajos Molnar | 2014-03-19 | 3 | -30/+56 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | mediaplayer: keep more buffers with the BufferQueue | Lajos Molnar | 2014-03-19 | 3 | -30/+56 |