aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge from 33f89d0 on master. Do not merge.Vladimir Chtchetkine2011-09-282-1/+12
| | | | | | Fix CPU architecture reported in HW config Change-Id: I2d31168ca05e1214df708fd107143fa4908e2889
* Merge from 491e6d on master. Do not merge.Vladimir Chtchetkine2011-09-271-3/+3
| | | | | | Use different macro for KVM Change-Id: I6d53aac7de92d8991f7cf0cf34484a0083f642a5
* 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
* CherryPick from 3d3fea0 in master. Do not merge.Vladimir Chtchetkine2011-09-232-2/+2
| | | | | | Fix windows build Change-Id: I6b82dd84860a5b634fb5215a0ef250e9e13bc2a2
* 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 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
* Merge from e3b840cf on master. Do not merge.Vladimir Chtchetkine2011-09-221-9/+40
| | | | | | Properly reset camera device between capture requests Change-Id: I1f283b90d08b59cd4dd94f569a8c31c1ab574d37
* 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 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 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
* Merge "Add -gpu <mode> option to force GPU emulation"David Turner2011-09-133-0/+44
|\
| * Add -gpu <mode> option to force GPU emulationDavid Turner2011-09-133-0/+44
| | | | | | | | | | | | | | | | | | By default, GPU emulation is still disabled. You can still try to force it with '-gpu on' for experimentation purpose (alternatively, you can define hw.gpu.enabled to 'true' in your AVD config.ini) Change-Id: I87efdf45337a80aeadd94b3922312b3f564c1608
* | Merge "Fix x86 qemu pipe initialization"David Turner2011-09-131-0/+2
|\ \
| * | Fix x86 qemu pipe initializationDavid 'Digit' Turner2011-09-131-0/+2
| |/ | | | | | | | | | | | | | | This is necessary ot initialize qemu pipes when running an emulated x86 system. Required to try OpenGLES emulation for x86. Change-Id: I4fa38648dcdd4e85d1794b131238b27b4dd4b91e
* | Restricting processor features in KVM modeMaciek Molerus2011-09-131-1/+8
|/ | | | | | | | | Some processors don't have full features set as in 'qemu32', eg. AMD doesn't have SSSE3 extensions yet. Added code which restricts CPU features set in KVM mode to those it actually has. Change-Id: I37c2d44a03e4445a607b723b0f63c91989c251dc
* Fix -ramdisk option handling.David 'Digit' Turner2011-09-131-2/+9
| | | | | | | For some reason, there was a bug, where the option was being ignored if set from the command-line. Change-Id: I61c6e3127b469f4ec661b834b15c4da0841551af
* Merge "Accelerate nand device in virtualization environment"David Turner2011-09-132-2/+50
|\
| * Accelerate nand device in virtualization environmentJiang Yunhong2011-09-132-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently NAND device driver need 8 MMIO access for goldfish nand device access. MMIO access is expensive in virtualization environment because each MMIO access will cause a context switch from in-kernel module to qemu user space process. Through introducing a new batch command, these multiple MMIO access can be combined into one, thus improve virtualization perofrmance. The booting time in KVM environment is reduced from 25~26 seconds to 20~21 seconds. A kernel patch is required to utilize this new batch command. The patched kernel will detect the batch support through a new flags in goldfish nand device, while current kernel is not impacted. Change-Id: Ia460b1ba3c6fde5b1fc6101bb66f8f58e46e6a78 Signed-off-by: Xin Xiaohui <xiaohui.xin@intel.com> Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com> Signed-off-by: Jiang Yunhong <yunhong.jiang@intel.com> Signed-off-by: Nakajima Jun <jun.nakajima@intel.com>
* | emulator: fix Win32 runtime crashDavid 'Digit' Turner2011-09-131-2/+2
|/ | | | Change-Id: I5ca4b1393211c1d8a5caba332c3f6164afb4661b
* Fix Mac buildVladimir Chtchetkine2011-09-121-1/+0
| | | | | | Remove Windows artifact Change-Id: I2ffd5979674619786742f14995edbf10edfff23a
* Fix Mac buildVladimir Chtchetkine2011-09-122-0/+91
| | | | | | Add dummy rutines implementing public camera API on Mac Change-Id: Id3c9d99d863785b0e00d1bdf6deb0a1af49ce91c
* Implements camera service in emulatorVladimir Chtchetkine2011-09-128-461/+2867
| | | | | | | | | | | | This is fully functional camera service implementation, that works (tested) on both, Linux and Windows. Fixed little/big endian bugs in the coverter code. Moved preview frames to use RGB32 instead of RGB565: RGB32 conversions are simpler and faster in the guest. Made "payload size send" a separate routine Change-Id: I96954f4c2cb4e4ef4dd6a20e41897d79c5037bae
* Camera service skeletonVladimir Chtchetkine2011-09-074-1/+353
| | | | | | | | | | Skeleton that implements camera emulation service over QEMU pipe. More meat will be added as the guest camera emulation develops. This is a patch taken from approved AOSP commit that didn't go through because of a merge conflict. Change-Id: I6f0a2e42be4f5f0bd86d3dbf0c2a609e74b200c2
* Fix for a _qemudPipe_recvBuffers bugVladimir Chtchetkine2011-09-071-3/+7
| | | | | | | | | | | | | When filling in qemud buffers in the loop, current offset in the current qemud buffer (off_in_buff variable) has not been accounted for when calculating number of bytes to copy from the message to qemud buffer. This caused data corruption, because number of bytes copied has exceeded the capacity of qemud buffer. Also, off_in_buff has not been reset when switching to the next qemud buffer. Also fixed _qemud_char_service_connect routine to accept a client parameter string Change-Id: I2f5a7ca5924c0b79d8755f4777145044567f3e8d
* Merge changes I1fa3512b,I47df0caeDavid 'Digit' Turner2011-08-2911-13/+358
|\ | | | | | | | | | | * changes: Add hw.gpu.enabled hardware property Fix a crash when GPU emulation doesn't work.
| * Add hw.gpu.enabled hardware propertyDavid 'Digit' Turner2011-08-2911-3/+346
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a new hardware property to enable GPU emulation (named hw.gpu.enabled). It is currently disabled by default. It also modifies the UI code to display the GL output properly inside the UI window. And sets the kernel parameter qemu.gles to either 0 or 1 to indicate to the guest system's GLES libraries whether to use GPU emulation or fallback to the software renderer. A future patch will also add auto-detection of desktop GL capabilities. For example, if the emulator is started on a headless server without an X11/GL display, hw.gpu.enabled will be forced to 'no', forcing the guest to use the software renderer. Another patch will allow to change the property from the command-line for debugging purpose. NOTE: If you want to test GPU emulation, change the default value of the property in android/avd/hardware-properties.ini from 'no' to 'yes'. You will need to run a ToT master AOSP tree with the following pending patches applied: https://review.source.android.com/25797 https://review.source.android.com/25154 https://review.source.android.com/25759 Change-Id: I1fa3512be24395244fd5068f2bf59ad54db5c7d5
| * Fix a crash when GPU emulation doesn't work.David 'Digit' Turner2011-08-291-10/+12
|/ | | | | | | This patch fixes a simple segmentation fault in the case where we can't connect to the GPU emulation rendering library. Change-Id: I47df0cae9029aee4738fd89083750e3baca5f032
* Merge "Fix premature boot-properties service disconnect."Vladimir Chtchetkine2011-08-281-1/+0
|\
| * Fix premature boot-properties service disconnect.Vladimir Chtchetkine2011-08-271-1/+0
|/ | | | Change-Id: I746147ab0c441a05055f7fc878eda3e035c0da14
* Merge "Enable qemud clients to pass connection parameters to emulator."Vladimir Chtchetkine2011-08-255-20/+83
|\
| * Enable qemud clients to pass connection parameters to emulator.Vladimir Chtchetkine2011-08-255-20/+83
|/ | | | | | | | | | | | This is useful for qemud pipe clients to be able to pass parameters to the emulator service when connecting. In particular, this would be extremely useful for camera emulation clients, which can pass name of the camera device, and other parameters that may be required to connect to the camera. Parameters are passed when opening the qemud pipe in form: /dev/qemu_pipe/camera:/dev/video0 I.e. parameters follow the service name, separated from it by ':' Change-Id: I67f0ef0ff27008e2b52652e58d72d5216b244646
* Merge "Fix qemu pipe's 'poll' callbacks"Vladimir Chtchetkine2011-08-254-11/+11
|\
| * Fix qemu pipe's 'poll' callbacksVladimir Chtchetkine2011-08-254-11/+11
|/ | | | | | | | | Throughout emulator's code pipe's 'poll' callback was returning PIPE_WAKE_XXX, instead of PIPE_POLL_XXX flags. This created whole sort of issues with the qemu pipe service <-> client communications. This is also a fix for http://b/issue?id=5196348 Change-Id: I92202cf4ef4554559eb022c4410ee93923edec1b
* Merge "Fix the darwin build"Vladimir Chtchetkine2011-08-242-2/+5
|\
| * Fix the darwin buildVladimir Chtchetkine2011-08-242-2/+5
| | | | | | | | Change-Id: I87bd356f7673bdbcc8e5f196f4a89182b3a36cbe
* | Merge "Fix build break: make sure darwin build picks up on required ↵Vladimir Chtchetkine2011-08-242-3/+3
|\ \ | |/ | | | | declarations"
| * Fix build break: make sure darwin build picks up on required declarationsVladimir Chtchetkine2011-08-242-3/+3
| | | | | | | | Change-Id: I801d56668d8591e599994c65fb47b9c3ea77ff73
* | Merge "Fix the build by #ifdefing linux-only includes"Vladimir Chtchetkine2011-08-241-2/+4
|\ \ | |/
| * Fix the build by #ifdefing linux-only includesVladimir Chtchetkine2011-08-241-2/+4
| | | | | | | | Change-Id: Ia4b6b45ad305307f28858f834f284b07be7d134d
generated by cgit v1.1 at 2025-05-03 18:35:00 +0000