Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ANDROID-KERNEL.TXT: Update document" | David 'Digit' Turner | 2011-10-04 | 1 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ANDROID-KERNEL.TXT: Update document | David 'Digit' Turner | 2011-10-04 | 1 | -3/+8 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am a2f29cb6: (-s ours) Cherrypick fa0c8e from master. do not merge. | Xavier Ducrohet | 2011-10-04 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Cherrypick fa0c8e from master. do not merge. | Xavier Ducrohet | 2011-10-04 | 2 | -4/+12 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | New AVD property to control presence of hw main keys. | Xavier Ducrohet | 2011-10-04 | 2 | -4/+12 | |
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | am 0fd262f1: (-s ours) CherryPicked from d0b482e on master. Do not merge. | Vladimir Chtchetkine | 2011-09-29 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | CherryPicked from d0b482e on master. Do not merge. | Vladimir Chtchetkine | 2011-09-29 | 5 | -4/+32 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Fix IRQ allocation for goldfish devices. | Vladimir Chtchetkine | 2011-09-29 | 5 | -4/+32 | |
| |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | am 7ae4139b: (-s ours) Merge from 33f89d0 on master. Do not merge. | Vladimir Chtchetkine | 2011-09-28 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge from 33f89d0 on master. Do not merge. | Vladimir Chtchetkine | 2011-09-28 | 2 | -1/+12 | |
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Fix CPU architecture reported in HW config | Vladimir Chtchetkine | 2011-09-28 | 2 | -1/+12 | |
| |_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | am 4990431d: (-s ours) Merge from 491e6d on master. Do not merge. | Vladimir Chtchetkine | 2011-09-27 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge from 491e6d on master. Do not merge. | Vladimir Chtchetkine | 2011-09-27 | 1 | -3/+3 | |
| | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | am 40c8d18f: (-s ours) Merge from c3b969ab on master. Do not merge. | Vladimir Chtchetkine | 2011-09-27 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | Merge from c3b969ab on master. Do not merge. | Vladimir Chtchetkine | 2011-09-27 | 1 | -2/+17 | |
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Use different macro for KVM | Vladimir Chtchetkine | 2011-09-27 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | | | | Fix QEMU pipe on KVM | Vladimir Chtchetkine | 2011-09-27 | 1 | -2/+17 | |
| |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | am ffb88b0d: (-s ours) CherryPick from 3d3fea0 in master. Do not merge. | Vladimir Chtchetkine | 2011-09-23 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | CherryPick from 3d3fea0 in master. Do not merge. | Vladimir Chtchetkine | 2011-09-23 | 2 | -2/+2 | |
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge "Fix windows build" | Vladimir Chtchetkine | 2011-09-23 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Fix windows build | Vladimir Chtchetkine | 2011-09-23 | 2 | -2/+2 | |
* | | | | | | | | | | | | | | | | | am bcc9f5fc: (-s ours) Merge from 5f8faae on master. Do not merge. | Vladimir Chtchetkine | 2011-09-23 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge from 5f8faae on master. Do not merge. | Vladimir Chtchetkine | 2011-09-23 | 2 | -13/+32 | |
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge "Check that first two cameras are facing in opposite direction." | Vladimir Chtchetkine | 2011-09-23 | 2 | -13/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Check that first two cameras are facing in opposite direction. | Vladimir Chtchetkine | 2011-09-23 | 2 | -13/+32 | |
* | | | | | | | | | | | | | | | | am bed87f42: (-s ours) Merge from c68dbbe in master. Do not merge. | Vladimir Chtchetkine | 2011-09-23 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge from c68dbbe in master. Do not merge. | Vladimir Chtchetkine | 2011-09-23 | 6 | -24/+64 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Timeout frame capturing. | Vladimir Chtchetkine | 2011-09-23 | 6 | -24/+64 | |
* | | | | | | | | | | | | | | am 16d2d436: (-s ours) Merge from e3b840cf on master. Do not merge. | Vladimir Chtchetkine | 2011-09-22 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge from e3b840cf on master. Do not merge. | Vladimir Chtchetkine | 2011-09-22 | 1 | -9/+40 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | am fe757971: (-s ours) Merge a83cf90 from master. Do not merge. | Vladimir Chtchetkine | 2011-09-22 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge a83cf90 from master. Do not merge. | Vladimir Chtchetkine | 2011-09-22 | 1 | -15/+80 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge "Properly reset camera device between capture requests" | Vladimir Chtchetkine | 2011-09-22 | 1 | -9/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Properly reset camera device between capture requests | Vladimir Chtchetkine | 2011-09-22 | 1 | -9/+40 | |
* | | | | | | | | | | | | | am 0ae42fc7: (-s ours) Merge 6ef999d from master. Do not merge. | Vladimir Chtchetkine | 2011-09-22 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge 6ef999d from master. Do not merge. | Vladimir Chtchetkine | 2011-09-22 | 1 | -2/+2 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Fix video recording on Windows | Vladimir Chtchetkine | 2011-09-22 | 1 | -15/+80 | |
* | | | | | | | | | | | Fix captured frame pixel format on Windows | Vladimir Chtchetkine | 2011-09-21 | 1 | -2/+2 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Fix NV12, and NV21 format descriptors | Vladimir Chtchetkine | 2011-09-21 | 3 | -4/+20 | |
* | | | | | | | | | | Print warning on invalid webcam name | Vladimir Chtchetkine | 2011-09-21 | 1 | -0/+4 | |
* | | | | | | | | | | Fix win/mac build | Vladimir Chtchetkine | 2011-09-21 | 1 | -4/+4 | |
* | | | | | | | | | | Fix Mac/Windows builds | Vladimir Chtchetkine | 2011-09-21 | 1 | -0/+14 | |
* | | | | | | | | | | Implements converters for BAYER pixel format | Vladimir Chtchetkine | 2011-09-21 | 2 | -43/+559 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Add -webcam commandline option to control webcam emulation | Vladimir Chtchetkine | 2011-09-20 | 11 | -45/+441 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Refactor the converters to make them more manageable | Vladimir Chtchetkine | 2011-09-17 | 1 | -1151/+690 | |
|/ / / / / / / | ||||||
* | | | | | | | Add support for NV21, and NV12 formats | Vladimir Chtchetkine | 2011-09-16 | 2 | -0/+584 | |
* | | | | | | | Merge "gles: use fast GLES pipe by default (Unix only)" | David Turner | 2011-09-15 | 3 | -4/+60 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | gles: use fast GLES pipe by default (Unix only) | David Turner | 2011-09-13 | 3 | -4/+60 | |
| |/ / / / / | ||||||
* | | | | | | Fixes "stop device" issue on Linux | Vladimir Chtchetkine | 2011-09-14 | 1 | -0/+19 | |
* | | | | | | Add cmdline param to control fake camera emulation | Vladimir Chtchetkine | 2011-09-13 | 5 | -6/+49 | |
|/ / / / / |