aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "ANDROID-KERNEL.TXT: Update document"David 'Digit' Turner2011-10-041-3/+8
|\
| * ANDROID-KERNEL.TXT: Update documentDavid 'Digit' Turner2011-10-041-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | This patch renames docs/KERNEL.TXT to docs/ANDROID-KERNEL.TXT and also updates the content with: - the new git repository and branch to use to get the kernel sources (android.git.kernel.org/kernel/qemu.git android-goldfish-2.6.29) - how to rebuild the ARMv7 kernel image (just use the --armv7 flag) Change-Id: I87cbbcbcbdfa2b9b0efaac6d3410a68ad336e5b3
* | am a2f29cb6: (-s ours) Cherrypick fa0c8e from master. do not merge.Xavier Ducrohet2011-10-040-0/+0
|\ \ | |/ |/| | | | | * commit 'a2f29cb6efc83df073e66a3cf2c7ba02709b4257': Cherrypick fa0c8e from master. do not merge.
| * Cherrypick fa0c8e from master. do not merge.Xavier Ducrohet2011-10-042-4/+12
| | | | | | | | | | | | | | | | | | | | New AVD property to control presence of hw main keys. This allows injecting a new runtime property into the system running on the emulator to control whether to display the new software back/home keys. Change-Id: I7d3a7ae681d1152f86a8bc7a036fd3ccf5be2e2a
* | New AVD property to control presence of hw main keys.Xavier Ducrohet2011-10-042-4/+12
| | | | | | | | | | | | | | | | This allows injecting a new runtime property into the system running on the emulator to control whether to display the new software back/home keys. Change-Id: I2bf7cc5c291752090187463332219638e883d052
* | am 0fd262f1: (-s ours) CherryPicked from d0b482e on master. Do not merge.Vladimir Chtchetkine2011-09-290-0/+0
|\ \ | |/ | | | | | | * commit '0fd262f1b4682a6d2dae0f61f6ea394d14f33c08': CherryPicked from d0b482e on master. Do not merge.
| * CherryPicked from d0b482e on master. Do not merge.Vladimir Chtchetkine2011-09-295-4/+32
| | | | | | | | | | | | | | | | | | | | | | Fix IRQ allocation for goldfish devices. There were two issues fixed here: 1. IRQ allocation (for a device) has never been checked on going out of bounds. 2. In x86 platform some IRQs were reserved (for kbd, mouse, and exception), but IRQ allocation for goldfish devices didn't check for those reserved IRQs being assigned to a device. Change-Id: I9abec0c093a43e1683539c96c9149f9bc6f4b051
* | Fix IRQ allocation for goldfish devices.Vladimir Chtchetkine2011-09-295-4/+32
| | | | | | | | | | | | | | | | | | There were two issues fixed here: 1. IRQ allocation (for a device) has never been checked on going out of bounds. 2. In x86 platform some IRQs were reserved (for kbd, mouse, and exception), but IRQ allocation for goldfish devices didn't check for those reserved IRQs being assigned to a device. Change-Id: I9d48485d973bcc8fd8a3dd1b78fbfa6a05aeea22
* | am 7ae4139b: (-s ours) Merge from 33f89d0 on master. Do not merge.Vladimir Chtchetkine2011-09-280-0/+0
|\ \ | |/ | | | | | | * commit '7ae4139bbecc44a9d4210fde9de25f9acc1feff7': Merge from 33f89d0 on master. Do not merge.
| * Merge from 33f89d0 on master. Do not merge.Vladimir Chtchetkine2011-09-282-1/+12
| | | | | | | | | | | | Fix CPU architecture reported in HW config Change-Id: I2d31168ca05e1214df708fd107143fa4908e2889
* | Fix CPU architecture reported in HW configVladimir Chtchetkine2011-09-282-1/+12
| | | | | | | | Change-Id: I9221916514a39435d2710fa9dada92a87bdc4dab
* | am 4990431d: (-s ours) Merge from 491e6d on master. Do not merge.Vladimir Chtchetkine2011-09-270-0/+0
|\ \ | |/ | | | | | | * commit '4990431dfab2f2573ec4ddd97cf656a674ca9d07': Merge from 491e6d on master. Do not merge.
| * Merge from 491e6d on master. Do not merge.Vladimir Chtchetkine2011-09-271-3/+3
| | | | | | | | | | | | Use different macro for KVM Change-Id: I6d53aac7de92d8991f7cf0cf34484a0083f642a5
* | am 40c8d18f: (-s ours) Merge from c3b969ab on master. Do not merge.Vladimir Chtchetkine2011-09-270-0/+0
|\ \ | |/ | | | | | | * commit '40c8d18f4fdbceb63d64520ac7650b4f6ecd52bb': Merge from c3b969ab on master. Do not merge.
| * Merge from c3b969ab on master. Do not merge.Vladimir Chtchetkine2011-09-271-2/+17
| | | | | | | | | | | | | | | | | | | | | | Fix QEMU pipe on KVM The issue was that CPU registers (CR3 in particular) in QEMU were out of sync with KVM at the time when virtual address to physical address translation was performed. This caused translation failure, and the subsequent crash. The fix was to explicitly sync QEMU registers with KVM registers just before calling VA->PA translation. Change-Id: I469da1d95d1e2f10e372b100ba93cd448b4b4551
* | Use different macro for KVMVladimir Chtchetkine2011-09-271-3/+3
| | | | | | | | Change-Id: I62a2d54562ac043a5513585a2e86aa01038fdc29
* | Fix QEMU pipe on KVMVladimir Chtchetkine2011-09-271-2/+17
| | | | | | | | | | | | | | | | | | The issue was that CPU registers (CR3 in particular) in QEMU were out of sync with KVM at the time when virtual address to physical address translation was performed. This caused translation failure, and the subsequent crash. The fix was to explicitly sync QEMU registers with KVM registers just before calling VA->PA translation. Change-Id: I1ff4ed2cfddd77e6889bb645f08db442f119049a
* | am ffb88b0d: (-s ours) CherryPick from 3d3fea0 in master. Do not merge.Vladimir Chtchetkine2011-09-230-0/+0
|\ \ | |/ | | | | | | * commit 'ffb88b0da4df3d6a2db80670a176397db5ff6515': CherryPick from 3d3fea0 in master. Do not merge.
| * CherryPick from 3d3fea0 in master. Do not merge.Vladimir Chtchetkine2011-09-232-2/+2
| | | | | | | | | | | | Fix windows build Change-Id: I6b82dd84860a5b634fb5215a0ef250e9e13bc2a2
* | Merge "Fix windows build"Vladimir Chtchetkine2011-09-232-2/+2
|\ \
| * | Fix windows buildVladimir Chtchetkine2011-09-232-2/+2
| | | | | | | | | | | | Change-Id: I7387eea3639d63b278b702100ee2d4584f87f4e2
* | | am bcc9f5fc: (-s ours) Merge from 5f8faae on master. Do not merge.Vladimir Chtchetkine2011-09-230-0/+0
|\ \ \ | | |/ | |/| | | | | | | * commit 'bcc9f5fc3b08c2eb932d75b21b546e60527c7499': Merge from 5f8faae on master. Do not merge.
| * | Merge from 5f8faae on master. Do not merge.Vladimir Chtchetkine2011-09-232-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | Check that first two cameras are facing in opposite direction. Currently camera app will crash on an attempt to switch cameras if camera 0 and 1 are facing in the same direction. So, user should be warned about that on emulator start. Change-Id: I6211093296806cb03be02e543e21154508693eab
* | | 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
| | | | | | | | | | | | | | | | | | | | | Currently camera app will crash on an attempt to switch cameras if camera 0 and 1 are facing in the same direction. So, user should be warned about that on emulator start. Change-Id: Ic85da614d30295b04d2a318fb1c2015cc52f1140
* | | am bed87f42: (-s ours) Merge from c68dbbe in master. Do not merge.Vladimir Chtchetkine2011-09-230-0/+0
|\ \ \ | |/ / |/| / | |/ | | * commit 'bed87f42f0001a3217ab005e728ef5b2e3a6fe14': Merge from c68dbbe in master. Do not merge.
| * Merge from c68dbbe in master. Do not merge.Vladimir Chtchetkine2011-09-236-24/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | Timeout frame capturing. It has been observed on some of the MS camera devices, that device may got stuck on something that would alwais return EAGAIN when queried for the next video frame. This requires us to timeout the loop that repeats attempts to acquire first frame from the device. Also added detection and reporting of I/O errors occurred during frame capturing. Also, this CL contains some cosmetick changes to error and warning reporting. Change-Id: I90e4c664734e8980f1e2ee5ee5cf43a651503dc7
* | Timeout frame capturing.Vladimir Chtchetkine2011-09-236-24/+64
| | | | | | | | | | | | | | | | | | | | | | It has been observed on some of the MS camera devices, that device may got stuck on something that would alwais return EAGAIN when queried for the next video frame. This requires us to timeout the loop that repeats attempts to acquire first frame from the device. Also added detection and reporting of I/O errors occurred during frame capturing. Also, this CL contains some cosmetick changes to error and warning reporting. Change-Id: I81edaf5ff8bfe147dbe4510e1446e77a87817f37
* | am 16d2d436: (-s ours) Merge from e3b840cf on master. Do not merge.Vladimir Chtchetkine2011-09-220-0/+0
|\ \ | |/ | | | | | | * commit '16d2d4368c404a3a60f92e120ee889d36aaa3ebb': Merge from e3b840cf on master. Do not merge.
| * Merge from e3b840cf on master. Do not merge.Vladimir Chtchetkine2011-09-221-9/+40
| | | | | | | | | | | | Properly reset camera device between capture requests Change-Id: I1f283b90d08b59cd4dd94f569a8c31c1ab574d37
* | am fe757971: (-s ours) Merge a83cf90 from master. Do not merge.Vladimir Chtchetkine2011-09-220-0/+0
|\ \ | |/ | | | | | | * commit 'fe757971b56e30878aeea876bf5d5704b081d4ea': Merge a83cf90 from master. Do not merge.
| * Merge a83cf90 from master. Do not merge.Vladimir Chtchetkine2011-09-221-15/+80
| | | | | | | | | | | | | | | | | | Fix video recording on Windows Reseting capture windows on each "stop capture" + setting capture parameters allow to change video frame dimensions. Change-Id: Ie6f4cdbcd5d2ef9121ca372944bc6c518afac5bf
* | 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
| | | | | | | | | | | | Change-Id: Ia748fe3f38e8366d0507fcee995eac311dd8c72a
* | | am 0ae42fc7: (-s ours) Merge 6ef999d from master. Do not merge.Vladimir Chtchetkine2011-09-220-0/+0
|\ \ \ | |/ / |/| / | |/ | | * commit '0ae42fc7042ab59b2d7a17a59c4ba8470cadb2d6': Merge 6ef999d from master. Do not merge.
| * Merge 6ef999d from master. Do not merge.Vladimir Chtchetkine2011-09-221-2/+2
| | | | | | | | | | | | | | | | | | Fix captured frame pixel format on Windows Apparently, bitmap obtained through the capXxx + clipboard API is formatted with BRG, not RGB format. Change-Id: Id68f705aabd7aa24671df4691bcd3cc2351f5d5e
* | Fix video recording on WindowsVladimir Chtchetkine2011-09-221-15/+80
| | | | | | | | | | | | | | Reseting capture windows on each "stop capture" + setting capture parameters allow to change video frame dimensions. Change-Id: I0ce8ed77dfa9838894acb9e9e84d84692bb3d520
* | Fix captured frame pixel format on WindowsVladimir Chtchetkine2011-09-211-2/+2
|/ | | | | | | Apparently, bitmap obtained through the capXxx + clipboard API is formatted with BRG, not RGB format. Change-Id: Ib161be50d2d3258045a467b152a5a750e1a8fb42
* Fix NV12, and NV21 format descriptorsVladimir Chtchetkine2011-09-213-4/+20
| | | | | | Also adds support for YU12 pixel format that is used in video frames Change-Id: I613beef8b3e2296fd1fab7e2b9d2956fba1ac788
* Print warning on invalid webcam nameVladimir Chtchetkine2011-09-211-0/+4
| | | | Change-Id: I94939964890c4304a47ba86c582baf3a9544b5aa
* Fix win/mac buildVladimir Chtchetkine2011-09-211-4/+4
| | | | Change-Id: I8d074590bb1efd68789e341e37356bc9fb2c9c08
* Fix Mac/Windows buildsVladimir Chtchetkine2011-09-211-0/+14
| | | | Change-Id: I0acc651be93eb9b5bea49280a7dccd18c1386d48
* Implements converters for BAYER pixel formatVladimir Chtchetkine2011-09-212-43/+559
| | | | Change-Id: I68abaa8b89e2b46dc57bff1d7dbd6d9fda213dc8
* Add -webcam commandline option to control webcam emulationVladimir Chtchetkine2011-09-2011-45/+441
| | | | | | -webcam name=<name>[,dir=<direction>] options controls web cameras to use for emulation. Change-Id: I961fd399c7e041541adda040dd24f194cc383cb9
* Refactor the converters to make them more manageableVladimir Chtchetkine2011-09-171-1151/+690
| | | | | | | | | | | | | | | The current conversion implementation was laking flexibility as far as adding support for new formats was concerned. In particular, adding support for each new format meant adding four converter routines: new format <--> RGB, new format <--> YUV. This was not scalable, so had to be rewritten. The new conversion implementation consists of four generic converters between different flavors og RGB/YUV formats, and array of descriptors for each supported format. Each descriptor contains information that is sufficient for the converter routines to perform its job. So, adding new format is just creating a new descriptor for that format, and adding it to the array of supported descriptors. Change-Id: Ica107d14fa03fa8f41eb9192f2c023a97f54b62c
* Add support for NV21, and NV12 formatsVladimir Chtchetkine2011-09-162-0/+584
| | | | Change-Id: I4bea0f3678b2ac21f3c6cf80581e997145e2a58d
* Merge "gles: use fast GLES pipe by default (Unix only)"David Turner2011-09-153-4/+60
|\
| * gles: use fast GLES pipe by default (Unix only)David Turner2011-09-133-4/+60
| | | | | | | | | | | | This improves performance of various benchmarks by 5% Change-Id: If2d2be0e9849429ecffe52b7d482cfbee4008473
* | Fixes "stop device" issue on LinuxVladimir Chtchetkine2011-09-141-0/+19
| | | | | | | | | | | | | | | | Apparently, video driver doesn't allow frame size change, once it has been explicitly set. In order to get around this we need to reset the handle to the camera device by closing, and then reopening it. Change-Id: Icfd37b3c196d2643507218b965c5015884ed455b
* | Add cmdline param to control fake camera emulationVladimir Chtchetkine2011-09-135-6/+49
|/ | | | | | | - Enable / Disable fake camera - Set fake camera facing direction: back, or front Change-Id: Iab741a694daf2bf752e91e23df566a83ac7a97e7
generated by cgit v1.1 at 2024-09-28 22:50:54 +0000