1317 Commits

Author SHA1 Message Date
Wu-cheng Li
e339c5edbe Add camera focus distances API.
Applications can use this API to estimate the distance
between the subject and the camera.

bug:1955650
Change-Id: Ie6c8ea4971759cab6c9bcdda2c5ceb5925791c27
2010-05-15 12:40:54 +08:00
Mathias Agopian
4606d5dd95 Merge "fix uninitialized variable in DisplayHardware" into kraken 2010-05-14 18:35:34 -07:00
Mathias Agopian
51c66aa4ce fix uninitialized variable in DisplayHardware
this fixes the issue where the display is all messed-up sometimes.

Change-Id: I20be91b5166bfff0c6d353a777351842c9df8e95
2010-05-14 18:33:30 -07:00
Jason Sams
a250f20b02 Merge "Delete legacy setDefine API." 2010-05-14 16:53:05 -07:00
Jason Sams
ec67275e5f Delete legacy setDefine API.
Change-Id: I1bae13533ab9efea3d3b0ebb6a3711343e922f8a
2010-05-14 16:51:22 -07:00
Jason Sams
c3ae11271d Merge "Delete old createFromClass methods. It no longer makes sense to create type info from Java since this cannot be exported to scripts. The new flow is in the opposite direction." 2010-05-14 16:30:50 -07:00
Jason Sams
b42315d37a Delete old createFromClass methods.
It no longer makes sense to create type info from Java since this
cannot be exported to scripts.  The new flow is in the opposite direction.

Change-Id: I9b46e3f57abf84c01326bd9b9b834f3ff0f7c504
2010-05-14 16:29:20 -07:00
Nick Kralevich
71491ab245 Merge "resolved conflicts for merge of cbf26fd3 to master" 2010-05-14 16:11:43 -07:00
Jason Sams
ca4d143146 Merge "Change RS to use the passed surface size rather than EGL size. Its possible that during a resize the EGL information could be stale so caching this is bad. The surface size should always be correct." 2010-05-14 16:00:04 -07:00
Nick Kralevich
963b0cdbaf resolved conflicts for merge of cbf26fd3 to master
Change-Id: I1feb7266c1d5cdebbfb8b8fa0d87d986953a20b6
2010-05-14 15:49:42 -07:00
Jason Sams
f603d21255 Change RS to use the passed surface size rather than EGL size.
Its possible that during a resize the EGL information could be stale so
caching this is bad.  The surface size should always be correct.

Change-Id: Ifd479e1ea70b1cada1a8690c7c82e91aa391b685

Conflicts:

	libs/rs/rsProgramStore.cpp
	libs/rs/rsProgramStore.h
2010-05-14 15:30:29 -07:00
Nick Kralevich
bfb776acf2 Merge "Get rid of warnings when compiled with -Wformat-security" into kraken 2010-05-14 15:28:09 -07:00
The Android Open Source Project
aa8da3dc40 am a8e0f75b: am 7450c02a: am 900b6157: merge from open-source master 2010-05-14 15:15:36 -07:00
The Android Open Source Project
7450c02a35 am 900b6157: merge from open-source master
Merge commit '900b6157f5dee2ed7b2c73cf320b2baf293230ff' into kraken

* commit '900b6157f5dee2ed7b2c73cf320b2baf293230ff':
  Only hold a weak pointer on SurfaceComposerClients
2010-05-14 15:12:17 -07:00
The Android Open Source Project
900b6157f5 merge from open-source master
Change-Id: I0249c6d796b35af9ba08cbccd463a1f5cf779ecd
2010-05-14 15:04:52 -07:00
Chih-Chung Chang
84498a7ab5 am 9c192e44: am 29f5d9b6: Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken 2010-05-14 12:08:24 -07:00
Chih-Chung Chang
29f5d9b61d Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken 2010-05-14 12:05:06 -07:00
Eric Laurent
03bb2b9651 am 10fde074: am 9f0810e8: Merge "AudioFlinger: rename variables to clarify reference to track channel count or channel mask" into kraken 2010-05-14 09:42:57 -07:00
Eric Laurent
b0a0147f34 AudioFlinger: rename variables to clarify reference to track channel count or channel mask
Some variables and structure members should be renamed to reflect the fact that they contain the
number of channels in a track (channel count) or the actual channels used by a track (channel mask).
Especially member "channels" of track control block (struct audio_track_cblk_t) is actually the
number of channels (channels count).

Change-Id: I220c8dede9fc00c8a5693389e790073b6ed307b8
2010-05-14 05:45:46 -07:00
Chih-Chung Chang
553447b8ff Fix deadlock if the last reference of ICameraClient is removed in
ICamera::connect()

Change-Id: I34ab3e4f07435c62168175e9bb159022c8fb99f4
2010-05-14 11:34:20 +08:00
Jason Sams
54db59c359 Rename ProgramFragmentStore to ProgramStore.
Change-Id: Ia8ad9ac856944838ced38a2f1e8f07387050bdfd
2010-05-13 18:35:01 -07:00
Nick Kralevich
ce2cbe4c96 Get rid of warnings when compiled with -Wformat-security
Change-Id: I63c3bf786bbe7a0276624e71a4ba80c4a9aaa4bb
2010-05-13 14:46:27 -07:00
Jason Sams
f6860f1979 Merge "Add missing bindProgramRaster to scriptC_lib." 2010-05-13 12:19:28 -07:00
Eric Laurent
6dd5f73e8c am 06a237b0: am ca20104a: Merge "Fix issue 2678048: binder death detection in AudioFlinger is broken." into kraken 2010-05-13 09:19:09 -07:00
Eric Laurent
bd62a9eb6e am 76a95619: am c247328d: Merge "Several fixes in AudioDumpInterface:" into kraken 2010-05-13 09:19:05 -07:00
Eric Laurent
ca20104a3a Merge "Fix issue 2678048: binder death detection in AudioFlinger is broken." into kraken 2010-05-12 23:40:28 -07:00
Eric Laurent
c247328dfd Merge "Several fixes in AudioDumpInterface:" into kraken 2010-05-12 23:21:42 -07:00
Jason Sams
0c677318b5 Add missing bindProgramRaster to scriptC_lib.
Change-Id: I06a7075a94ef907478f986b59ded4ff3e2766585
2010-05-12 18:26:52 -07:00
Mathias Agopian
b81f6c4c3f am 19f64314: am 2f0e6753: Merge "SharedBufferStack now can grow up to 16 buffers." into kraken 2010-05-12 18:04:39 -07:00
Mathias Agopian
55c97878c0 am e0630ae3: am 6a70cb8a: Merge "Refactor some code in surfaceflinger in preparation of upcoming changes" into kraken 2010-05-12 18:04:33 -07:00
Mathias Agopian
74c932d973 am 32286409: am ca64ed6a: Merge "remove the "memcpy" hack" into kraken 2010-05-12 18:04:28 -07:00
Mathias Agopian
2f0e6753d6 Merge "SharedBufferStack now can grow up to 16 buffers." into kraken 2010-05-12 17:36:46 -07:00
Mathias Agopian
6a70cb8a38 Merge "Refactor some code in surfaceflinger in preparation of upcoming changes" into kraken 2010-05-12 17:35:24 -07:00
Mathias Agopian
ca64ed6a81 Merge "remove the "memcpy" hack" into kraken 2010-05-12 17:35:12 -07:00
Mathias Agopian
59751dbf7d SharedBufferStack now can grow up to 16 buffers.
there is a new resize() api, which currently only allows growing.

Change-Id: Ia37b81b73be466d2491ffed7f3a23cd8e113c6fe
2010-05-12 17:28:20 -07:00
Mathias Agopian
9f2c4fd9a1 Refactor some code in surfaceflinger in preparation of upcoming changes
the new TextureMagager class now handle texture creation and upload
as well as EGL image creation and binding to GraphicBuffers. This is
used indirectly by Layer and directly by LayerBuffer

the new BufferManager class handles the set of buffers used for a
Layer (Surface), it abstracts how many buffer there is as well as
the use of EGLimage vs. regular texture ops (glTexImage2D).

Change-Id: I2da1ddcf27758e6731400f6cc4e20bef35c0a39a
2010-05-12 17:26:22 -07:00
Mathias Agopian
aca2ee8a70 remove the "memcpy" hack
this hack was used for gpus that don't support cached buffers
for s/w clients. currently we have no gpu with this issue.
this removes quite a bit of complexity.

Change-Id: I72564669f124f92805030e61983711f61c76b6d9
2010-05-12 15:44:26 -07:00
Kenny Root
cdcc6a0061 am d6effb06: am e8621534: Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken 2010-05-12 15:25:03 -07:00
Kenny Root
e8621534db Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken 2010-05-12 14:54:42 -07:00
Wu-cheng Li
f355b34014 am 9813a3a2: am b3390135: am d8c33747: am 78624e41: Add remove method in CameraParameters class. 2010-05-12 09:14:11 -07:00
Eric Laurent
fc1246640f Several fixes in AudioDumpInterface:
- forward setMode() and getInputBufferSize() calls to underlying audio hardware interface.
- Allow capture of more than one output stream (previous implementation was only capturing
the first output opened, namely the hardware output).
- Allow capture of input streams: previous implementation was only simulating input streams
when more than one was open at a time by reading from a file on SD card). Now the default
behavior is to capture PCM data read from input stream if it was successfully opened or
simulate capture otherwise.

Change-Id: I7e2892b25e295fc3c19c7eb0f71bfaea5816b73a
2010-05-12 08:31:04 -07:00
Wu-cheng Li
b339013589 am d8c33747: am 78624e41: Add remove method in CameraParameters class.
Merge commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728' into kraken

* commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728':
  Add remove method in CameraParameters class.
2010-05-12 07:55:00 -07:00
Eric Laurent
4f0f17d2f1 Fix issue 2678048: binder death detection in AudioFlinger is broken.
There is a bug in the way notification client list is managed when the client binder
interface dies that makes that the dead client is not removed from the list: the week
reference passed by binderDied() cannot be promoted and compared to the strong
references in the list.

The fix consists in creating a new NotificationClient class that implements the
binder DeathRecipient and holds a strong reference to the IAudioFlingerClient interface.
A new instance of this class is created for each cient and a strong reference to this
object is added to the notification client list maintained by AudioFlinger.
When binderDied() is called on this object, it is removed from the list preventing
AudioFlinger to notify this client for further io changes.

Also added code to disable LifeVibes effects when the client that has enabled the
enhancements dies.

Change-Id: Icedc4af171759e9ae9a575d82d44784b4e8267e8
2010-05-12 06:29:16 -07:00
Kenny Root
68246dcec1 ZipUtilsRO rewrite based on Dalvik Zip rewrite
Change the way zip archives are handled.  This is necessary to deal with
very large (~1GB) APK files, for which our current approach of mapping
the entire file falls over.

We now do the classic scavenger hunt for the End Of Central Directory
magic on a buffer of data read from the file, instead of a memory-mapped
section.  We use what we find to create a map that covers the Central
Directory only.

If the caller is interested in unpacking the file contents, we have to
do an additional file read to discover the size of the Local File Header
section so we can skip past it.

This is based on Change I745fb15abb in the dalvik tree. Both
implementations share a common ancestry, but the cost of unifying them
outweighs the benefits of wrapping C calls.

Change-Id: Iddacb50fe913917c2845708a530872d65fdbe620
2010-05-12 05:07:48 -07:00
Jason Sams
4d3399337d Convert renderscript from using ACC to LLVM for its compiler.
This will also require application to be updated to support
the new compiler and data passing models.

Change-Id: If078e3a5148af395ba1b936169a407d8c3ad727f
2010-05-11 14:03:58 -07:00
Wu-cheng Li
78624e41da Add remove method in CameraParameters class.
bug:2672651
Change-Id: I537c817b5ca6a3d925f22febe9a5769156354d00
2010-05-11 12:54:14 +08:00
Wu-cheng Li
f0b8679b5d am 0c3bba3e: am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken 2010-05-10 20:07:54 -07:00
Wu-cheng Li
e1b2b3b0d2 Merge "Add continuous focus mode constant." into kraken 2010-05-10 20:04:14 -07:00
Mathias Agopian
5705a886c6 am ef474f3f: am 4cfc21ec: am 56aed6bd: am c69775d6: Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo 2010-05-10 09:56:00 -07:00
Mathias Agopian
4cfc21ecd9 am 56aed6bd: am c69775d6: Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
Merge commit '56aed6bde0c52658d2cb1207c0cfe8ba0a764c59' into kraken

* commit '56aed6bde0c52658d2cb1207c0cfe8ba0a764c59':
  fix [2664345] Flash: Bad flicker at the end of a pinch zoom.
2010-05-10 09:49:19 -07:00