aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Implemented Mac camera emulationVladimir Chtchetkine2011-10-124-88/+551
* am 9f3c0c76: (-s ours) Cherry-pick d0e2872 from master: Fix snapshots. do not...Vladimir Chtchetkine2011-10-050-0/+0
|\
| * Cherry-pick d0e2872 from master: Fix snapshots. do not merge.Vladimir Chtchetkine2011-10-055-22/+27
* | Fix snapshotsVladimir Chtchetkine2011-10-055-22/+27
* | Merge "ANDROID-KERNEL.TXT: Update document"David 'Digit' Turner2011-10-041-3/+8
|\ \
| * | ANDROID-KERNEL.TXT: Update documentDavid 'Digit' Turner2011-10-041-3/+8
* | | am a2f29cb6: (-s ours) Cherrypick fa0c8e from master. do not merge.Xavier Ducrohet2011-10-040-0/+0
|\ \ \ | |/ / |/| / | |/
| * Cherrypick fa0c8e from master. do not merge.Xavier Ducrohet2011-10-042-4/+12
* | New AVD property to control presence of hw main keys.Xavier Ducrohet2011-10-042-4/+12
* | am 0fd262f1: (-s ours) CherryPicked from d0b482e on master. Do not merge.Vladimir Chtchetkine2011-09-290-0/+0
|\ \ | |/
| * CherryPicked from d0b482e on master. Do not merge.Vladimir Chtchetkine2011-09-295-4/+32
* | Fix IRQ allocation for goldfish devices.Vladimir Chtchetkine2011-09-295-4/+32
* | am 7ae4139b: (-s ours) Merge from 33f89d0 on master. Do not merge.Vladimir Chtchetkine2011-09-280-0/+0
|\ \ | |/
| * Merge from 33f89d0 on master. Do not merge.Vladimir Chtchetkine2011-09-282-1/+12
* | Fix CPU architecture reported in HW configVladimir Chtchetkine2011-09-282-1/+12
* | am 4990431d: (-s ours) Merge from 491e6d on master. Do not merge.Vladimir Chtchetkine2011-09-270-0/+0
|\ \ | |/
| * Merge from 491e6d on master. Do not merge.Vladimir Chtchetkine2011-09-271-3/+3
* | am 40c8d18f: (-s ours) Merge from c3b969ab on master. Do not merge.Vladimir Chtchetkine2011-09-270-0/+0
|\ \ | |/
| * Merge from c3b969ab on master. Do not merge.Vladimir Chtchetkine2011-09-271-2/+17
* | Use different macro for KVMVladimir Chtchetkine2011-09-271-3/+3
* | Fix QEMU pipe on KVMVladimir Chtchetkine2011-09-271-2/+17
* | am ffb88b0d: (-s ours) CherryPick from 3d3fea0 in master. Do not merge.Vladimir Chtchetkine2011-09-230-0/+0
|\ \ | |/
| * CherryPick from 3d3fea0 in master. Do not merge.Vladimir Chtchetkine2011-09-232-2/+2
* | Merge "Fix windows build"Vladimir Chtchetkine2011-09-232-2/+2
|\ \
| * | Fix windows buildVladimir Chtchetkine2011-09-232-2/+2
* | | am bcc9f5fc: (-s ours) Merge from 5f8faae on master. Do not merge.Vladimir Chtchetkine2011-09-230-0/+0
|\ \ \ | | |/ | |/|
| * | Merge from 5f8faae on master. Do not merge.Vladimir Chtchetkine2011-09-232-13/+32
* | | Merge "Check that first two cameras are facing in opposite direction."Vladimir Chtchetkine2011-09-232-13/+32
|\ \ \ | | |/ | |/|
| * | Check that first two cameras are facing in opposite direction.Vladimir Chtchetkine2011-09-232-13/+32
* | | am bed87f42: (-s ours) Merge from c68dbbe in master. Do not merge.Vladimir Chtchetkine2011-09-230-0/+0
|\ \ \ | |/ / |/| / | |/
| * Merge from c68dbbe in master. Do not merge.Vladimir Chtchetkine2011-09-236-24/+64
* | Timeout frame capturing.Vladimir Chtchetkine2011-09-236-24/+64
* | am 16d2d436: (-s ours) Merge from e3b840cf on master. Do not merge.Vladimir Chtchetkine2011-09-220-0/+0
|\ \ | |/
| * Merge from e3b840cf on master. Do not merge.Vladimir Chtchetkine2011-09-221-9/+40
* | am fe757971: (-s ours) Merge a83cf90 from master. Do not merge.Vladimir Chtchetkine2011-09-220-0/+0
|\ \ | |/
| * Merge a83cf90 from master. Do not merge.Vladimir Chtchetkine2011-09-221-15/+80
* | Merge "Properly reset camera device between capture requests"Vladimir Chtchetkine2011-09-221-9/+40
|\ \
| * | Properly reset camera device between capture requestsVladimir Chtchetkine2011-09-221-9/+40
* | | am 0ae42fc7: (-s ours) Merge 6ef999d from master. Do not merge.Vladimir Chtchetkine2011-09-220-0/+0
|\ \ \ | |/ / |/| / | |/
| * Merge 6ef999d from master. Do not merge.Vladimir Chtchetkine2011-09-221-2/+2
* | Fix video recording on WindowsVladimir Chtchetkine2011-09-221-15/+80
* | Fix captured frame pixel format on WindowsVladimir Chtchetkine2011-09-211-2/+2
|/
* Fix NV12, and NV21 format descriptorsVladimir Chtchetkine2011-09-213-4/+20
* Print warning on invalid webcam nameVladimir Chtchetkine2011-09-211-0/+4
* Fix win/mac buildVladimir Chtchetkine2011-09-211-4/+4
* Fix Mac/Windows buildsVladimir Chtchetkine2011-09-211-0/+14
* Implements converters for BAYER pixel formatVladimir Chtchetkine2011-09-212-43/+559
* Add -webcam commandline option to control webcam emulationVladimir Chtchetkine2011-09-2011-45/+441
* Refactor the converters to make them more manageableVladimir Chtchetkine2011-09-171-1151/+690
* Add support for NV21, and NV12 formatsVladimir Chtchetkine2011-09-162-0/+584