Commit Graph

8061 Commits

Author SHA1 Message Date
Vladimir Chtchetkine
55d41f8969 Sets right preview frame properties.
Don't cofuse preview window with preview frames. Preview frames are relevant only
in panoramic mode that receives frames via CAMERA_MSG_PREVIEW_FRAME callback.

Change-Id: Ibecb345e43ba452856b8ca75449264d8d354a9d5
2011-09-23 10:08:28 -07:00
Vladimir Chtchetkine
14985c4312 Merge "Implements camera error reporting." 2011-09-23 08:35:16 -07:00
Vladimir Chtchetkine
b3ea171655 Implements camera error reporting.
Change-Id: I5f4f4cd1baab60053e827e0605a92a123c7a086f
2011-09-23 08:34:08 -07:00
David 'Digit' Turner
944b4f80e5 am 6ddbd156: resolved conflicts for merge of 4e6af749 to gingerbread-plus-aosp
* commit '6ddbd1563d84a7b18607aa67c1f5f5e4095f816f':
  emulator: opengl: Back-port GLES emulation from the master tree.
2011-09-23 01:36:15 -07:00
David 'Digit' Turner
6ddbd1563d resolved conflicts for merge of 4e6af749 to gingerbread-plus-aosp
Change-Id: I3a8d71bd9b359a067c2a250db99e855e59c08854
2011-09-23 10:27:34 +02:00
Xavier Ducrohet
2080734362 am 3a1eb8fc: (-s ours) Cherry-pick 7fb4cc from master. do not merge.
* commit '3a1eb8fc1c389585c18526b03cf6fa153fb9391f':
  Cherry-pick 7fb4cc from master. do not merge.
2011-09-22 23:39:47 -07:00
The Android Open Source Project
8fbf284cc8 Reconcile with ics-factoryrom-release
Change-Id: Id586eed2642eaf5d2e3c21d063c9d13acf83f551
2011-09-22 10:57:16 -07:00
Scott Main
24060d3751 Merge "fix custom view sample to scale text based on screen density" 2011-09-21 18:15:44 -07:00
Scott Main
689a60dd25 fix custom view sample to scale text based on screen density
Change-Id: I2e08e90b7baa73a4e36bad9f6abb9364d7b471d1
2011-09-21 17:57:59 -07:00
Xavier Ducrohet
3a1eb8fc1c Cherry-pick 7fb4cc from master. do not merge.
Build SDK with the new location for the system image.

Change-Id: Ic632d4ef87171fd4ed3e1a5bed9693fb402065c0
2011-09-21 16:04:26 -07:00
Scott Main
194d14155c Merge "small HC Gallery updates to put alternative values in appropriate config and update manifest" 2011-09-21 15:58:21 -07:00
Scott Main
a0038f1170 remove LOW_PROFILE flag when setting HIDE_NAVIGATION, because it's not needed in order to work
Change-Id: I4eb6aee12f00bc98d14e7f42476acaf75340ac26
2011-09-21 15:56:47 -07:00
Xavier Ducrohet
bec04f14fa Merge "Build SDK with the new location for the system image." 2011-09-21 15:54:57 -07:00
Scott Main
c05bf09001 small HC Gallery updates to put alternative values in appropriate config and update manifest
Change-Id: If55961ef28b1be5e500618f0a485328f9433e443
2011-09-21 15:39:15 -07:00
Vladimir Chtchetkine
4d7f7de700 Use actual JPEG quality when compressing picture
Sometimes framework chooses to override the default JPEG quality value (90), so we need to
respect that when compressing frame during picture taking.

Change-Id: Ic7ad8938d33d94d34ecd0b979e5c8c3e8246fd53
2011-09-21 15:33:18 -07:00
Xavier Ducrohet
7fb4cc5359 Build SDK with the new location for the system image.
Change-Id: I7e3e176d82e444989cd5501c009ea767e1446199
2011-09-21 15:30:00 -07:00
Vladimir Chtchetkine
68ec4ac828 Fix video format
Apparently, video pixel format expected by the camera framework is YU12, and not YV12
as it was implemented.

Change-Id: Id33d8aa7f62f6e68276774ca2a7d25c04acd71cc
2011-09-21 14:55:29 -07:00
Vladimir Chtchetkine
1f37cd45f6 Fix callback sequence on picture taking
Also fixes a bug in JPEG converter.

Change-Id: I5bbeec96ec2bb0a9a6a333a3798880bb0b837c65
2011-09-21 14:20:07 -07:00
Vladimir Chtchetkine
318ae8e9fe Merge "Adds media_profiles.xml file that is required for proper framework setup" 2011-09-21 07:19:50 -07:00
Vladimir Chtchetkine
a88e749e29 Adds media_profiles.xml file that is required for proper framework setup
This file must be copied over to /system/etc directory inside the emulated system image.

Change-Id: Ia013ed20e1ce7a6f9a3ce162f86e0fd3c97ded31
2011-09-21 06:58:08 -07:00
The Android Automerger
4ec46e4894 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-21 06:28:37 -07:00
The Android Open Source Project
0849528eda Reconcile with ics-factoryrom-release
Change-Id: Iaebcfef5371506aec5cd6cda25ce0889005018f9
2011-09-21 06:19:09 -07:00
The Android Automerger
078e5d0ad5 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-20 20:43:00 -07:00
Vladimir Chtchetkine
dd63895f1f Fix camera ID validation
Check for id being <0 before checking its upper boundary

Change-Id: I92ed1ac78f35b5d6bbdd24cc041b2cfb4c121c74
2011-09-20 14:16:53 -07:00
Vladimir Chtchetkine
0055deec7e Merge "Hookup to cmdline parameters in emulator" 2011-09-20 13:26:12 -07:00
David 'Digit' Turner
894a63dd6e emulator: opengl: Add custom_write optimization to encoder.
This patch allows an auto-generated GLES encoder function to write
'isLarge' buffers with a custom writer, instead of calling stream->readFully()
directly.

This is intended to allow writing pixel or vertex data that is stored
with a specific stride.

Another patch will introduce the corresponding changes to the .attrib files

Change-Id: I6ca86b968cd3f4db91676bc485ee1e84419e50e0
2011-09-20 15:58:54 +02:00
David 'Digit' Turner
5d7f0875e9 emulator: opengl: 'large' buffer optimization
This patch modifies the guest encoding libraries to avoid
un-necessary copies when sending large buffers (e.g. pixels)
to the host. Instead, the data is sent directly through a
new IOStream method (writeFully()).

On my machine, this improves the NenaMark2 benchmark
(from 50.8 to 57.1 fps). More importantly, this speeds up
the display of non-GL surfaces too, which are sent through
the special rcUpdateColorBuffer() function in gralloc_goldfish.

This is noticeable in many parts of the UI (e.g. when scrolling
through lists).

To tag a given parameter, use the new 'isLarge' variable flag
in the protocol .attrib file.

Implemented for the following encoding functions:

  rcUpdateColorBuffer
  glTexSubImage2D
  glTexImage2Di
  glBufferData
  glBufferSubData
  glCompressedTexImage2D
  glCompressedTexSubImage2D
  glTexImage3DOES
  glTexSubImage3DOES
  glCompressedTexImage3DOES
  glCompressedTexSubImage3DOES

+ Optimize the auto-generated encoder functions to avoid
  repeated function calls (for size computations).

Change-Id: I13a02607b606c40cd05984cd2051b1f3424bc2d0
2011-09-20 15:58:54 +02:00
David 'Digit' Turner
e72ed049a8 emulator: opengl: improve gralloc debug traces
+ shut up the gralloc module for now.

Change-Id: I7d22c63f298c4e50d96655adf4025a65b7405c28
2011-09-20 15:58:54 +02:00
David 'Digit' Turner
9a6c02877a emulator: opengl: fix inccorect delete usage.
Change-Id: I3afc5197d2d13c4698a535ed769a56920e81c94f
2011-09-20 15:58:53 +02:00
David 'Digit' Turner
6aca3d9f7c emulator: opengl: add missing EGLDisplay destructor
Change-Id: I788904a597b7929a7fc7a5db3cf5baa79b9f1936
2011-09-20 15:58:53 +02:00
David 'Digit' Turner
8abfab1baf emulator: opengl: make internal tables const.
+ fix a typo.

Change-Id: I4c290d673de5eff24998b97cfb996d9da17dd006
2011-09-20 15:58:53 +02:00
David 'Digit' Turner
4e6af749d5 emulator: opengl: Back-port GLES emulation from the master tree.
The modules here are only built when BUILD_EMULATOR_OPENGL is defined to true
in your environment or your BoardConfig.mk (see tools/emulator/opengl/Android.mk)

Change-Id: I5f32c35b4452fb5a7b4d5f9fc5870ec1da6032e6
2011-09-20 15:58:41 +02:00
Raphael Moll
88171be01e am 3acd4823: SDK: use XSD v5 props when generating repository packages.
* commit '3acd4823bb53ebcb5bdc50782b9675b6e4b5bb30':
  SDK: use XSD v5 props when generating repository packages.
2011-09-19 15:56:30 -07:00
Raphael Moll
c1ec5c2663 am ec48ca3d: Win SDK: fix missing platforms-tools/dx.bat
* commit 'ec48ca3dff7f5f377e35949a15492a70d0a8c2f8':
  Win SDK: fix missing platforms-tools/dx.bat
2011-09-19 15:54:15 -07:00
Raphael
7c0bb37c6a am 5dc10d55: (-s ours) Specify the full path to atree for the windows.atree. DO NOT MERGE.
* commit '5dc10d55a4af3008f820388b9ce775a7e8205a09':
  Specify the full path to atree for the windows.atree. DO NOT MERGE.
2011-09-19 15:49:27 -07:00
Xavier Ducrohet
fbd21dc203 am 405c0940: (-s ours) Rename Compatibility into support and move it to rev 4. DO NOT MERGE.
* commit '405c094032146ab589818e66764db4a90511ba05':
  Rename Compatibility into support and move it to rev 4. DO NOT MERGE.
2011-09-19 15:49:05 -07:00
Raphael
743d309ce0 am bc162207: (-s ours) Use atree for the Windows SDK. Strip binaries. DO NOT MERGE.
* commit 'bc162207564c655fbd78a9cbaf933c62efee16b8':
  Use atree for the Windows SDK. Strip binaries. DO NOT MERGE.
2011-09-19 15:49:03 -07:00
Xavier Ducrohet
6eb6ee71ac am dda48a45: (-s ours) Move sdk components to API 14. DO NOT MERGE.
* commit 'dda48a45e0ced88c478c0d3c0becdd29458f555f':
  Move sdk components to API 14. DO NOT MERGE.
2011-09-19 15:49:00 -07:00
Xavier Ducrohet
16d37746c7 am ca4d7f2f: (-s ours) Remove llvm/api file matching. DO NOT MERGE
* commit 'ca4d7f2f74100e6bee906efe563efb65545187e5':
  Remove llvm/api file matching. DO NOT MERGE
2011-09-19 15:48:57 -07:00
Raphael Moll
3acd4823bb SDK: use XSD v5 props when generating repository packages.
This requires sdk.git Change-Id I6993d6c4 to build
(to enable the use of XSD v5).

Change-Id: If3beb09ae4eef3990caf661b2d4cfbdfd8a6f86a
2011-09-17 22:50:43 -07:00
Raphael Moll
ec48ca3dff Win SDK: fix missing platforms-tools/dx.bat
In the new windows.atree, the batch file was missing the .bat extension.
This prevents the SDK Manager from recognizing platform-tools.

Change-Id: I885b748f9ce7f6ceeb9f7b9c35ca38f7b8029f55
2011-09-17 21:52:14 -07:00
Vladimir Chtchetkine
4bc3b1f3b5 Hookup to cmdline parameters in emulator
Use boot properties, and webcam facing parameters set up by the emulator's cmdline.

Change-Id: I2189e5f67b9d79ad330b5ee275ff30d8851fc326
2011-09-17 11:28:09 -07:00
Raphael
5dc10d55a4 Specify the full path to atree for the windows.atree. DO NOT MERGE.
Somehow the build server doesn't automatically find atree.
In a future CL this should be amended to pass the proper
OUT_HOST_EXECUTABLE, being careful that it points to the
host/linux dir, not the current Windows one.

Cherry-pick from master b2b5921

Change-Id: I13e532cdc4c0839b6fd7f2a3a149725940a02734
2011-09-16 21:38:13 -07:00
Xavier Ducrohet
405c094032 Rename Compatibility into support and move it to rev 4. DO NOT MERGE.
Cherry-pick from master e98f22d

Change-Id: I165a7aeb429a4288d6f693a7613a4a102e21dd5b
2011-09-16 21:38:08 -07:00
Raphael
bc16220756 Use atree for the Windows SDK. Strip binaries. DO NOT MERGE.
This moves the copy/strip/rm logic for the Windows SDK
from the patch_windows_sdk.sh to a regular sdk-windows-x86.atree.

The bash script is still here to invoke atree and do whatever
cleanup we might want to do later.

This should make it easier to maintain the Windows SDK
by providing a structure similar to tools.atree.

This change requires build.git Change-Id: I22aae7a8 to
have rm/strip support in atree.

Cherry-pick from master e07f59a

Change-Id: Ia71fc69717eaee6e4d8d062144347db3326e4127
2011-09-16 21:38:03 -07:00
Xavier Ducrohet
dda48a45e0 Move sdk components to API 14. DO NOT MERGE.
Cherry-pick from master 71be098

Change-Id: I9dc0245fdd19660a4b08d454892df02a02810749
2011-09-16 21:37:54 -07:00
Xavier Ducrohet
ca4d7f2f74 Remove llvm/api file matching. DO NOT MERGE
We are moving to a single llvm executable able to handle all
API levels so this file (helping select the llvm exe depending
on target API is not needed anymore).

Cherry-pick from master 73aa4b5

Change-Id: Icc9b035740679eacfa59d452f71e71355816f7be
2011-09-16 21:37:49 -07:00
Eric Fischer
d392797ecf am 43249f5d: (-s ours) Import revised translations. DO NOT MERGE
* commit '43249f5d3c8a5938d6ffd7018e382a1c76b04128':
  Import revised translations.  DO NOT MERGE
2011-09-16 16:19:17 -07:00
Raphael
3473f6b295 Merge "Specify the full path to atree for the windows.atree" 2011-09-16 15:53:10 -07:00
Raphael
b2b5921d1b Specify the full path to atree for the windows.atree
Somehow the build server doesn't automatically find atree.
In a future CL this should be amended to pass the proper
OUT_HOST_EXECUTABLE, being careful that it points to the
host/linux dir, not the current Windows one.

Change-Id: I53379dedc34fcce83773178add0ebadfcdc04b01
2011-09-16 15:30:27 -07:00