Vladimir Chtchetkine
fbb67dd652
am 55d41f89: Sets right preview frame properties.
...
* commit '55d41f896988d1159a999aaacf12fe4077757d22':
Sets right preview frame properties.
2011-09-23 10:12:10 -07:00
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
2500d177fd
am 14985c43: Merge "Implements camera error reporting."
...
* commit '14985c43126c7a3f3012e38d97ed2fc158c38194':
Implements camera error reporting.
2011-09-23 08:37:22 -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
0bfd488eb7
am 20807343: (-s ours) am 3a1eb8fc: (-s ours) Cherry-pick 7fb4cc from master. do not merge.
...
* commit '2080734362f7b6e361e9dff825464ccf56b492f6':
Cherry-pick 7fb4cc from master. do not merge.
2011-09-22 23:42:37 -07: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
23dbed96d6
am 8fbf284c: Reconcile with ics-factoryrom-release
...
* commit '8fbf284cc83263a6b5ce37afe9a14e8f06d8c317':
2011-09-22 10:58:40 -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
a338f8e02e
am 24060d37: Merge "fix custom view sample to scale text based on screen density"
...
* commit '24060d3751fdb5c64afa6dbe07544b334c3ad8a9':
fix custom view sample to scale text based on screen density
2011-09-21 18:17:38 -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
175d60f7f4
am 194d1415: Merge "small HC Gallery updates to put alternative values in appropriate config and update manifest"
...
* commit '194d14155cbc7e1e3e5829068bd4210faaa8694f':
small HC Gallery updates to put alternative values in appropriate config and update manifest
2011-09-21 16:00:01 -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
Xavier Ducrohet
e9efb37374
am bec04f14: Merge "Build SDK with the new location for the system image."
...
* commit 'bec04f14fa6d401358f0830bfcb8bd95d4727df4':
Build SDK with the new location for the system image.
2011-09-21 15:57:11 -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
Vladimir Chtchetkine
7435b03c94
am 4d7f7de7: Use actual JPEG quality when compressing picture
...
* commit '4d7f7de7007c7effd2518e581275fef32536c862':
Use actual JPEG quality when compressing picture
2011-09-21 15:55:25 -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
aee2a8d6e2
am 68ec4ac8: Fix video format
...
* commit '68ec4ac828762745155be9662285d2174a7eff1e':
Fix video format
2011-09-21 15:19:18 -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
c2cd9ae3f6
am 1f37cd45: Fix callback sequence on picture taking
...
* commit '1f37cd45f67c7fab0326d06934fc7d192b1fd7a5':
Fix callback sequence on picture taking
2011-09-21 14:38:40 -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
c175108ae0
am 318ae8e9: Merge "Adds media_profiles.xml file that is required for proper framework setup"
...
* commit '318ae8e9feddb5665a137c1b6f9c911cf50aeea0':
Adds media_profiles.xml file that is required for proper framework setup
2011-09-21 07:21: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
842cd9b1b8
am 0849528e: Reconcile with ics-factoryrom-release
...
* commit '0849528eda0cf3c8a8fad5001b964e73870f3722':
2011-09-21 06:21:05 -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
2ec9af364a
am dd63895f: Fix camera ID validation
...
* commit 'dd63895f1fb79667688219bdb1d4c71fce26fbab':
Fix camera ID validation
2011-09-20 16:25:24 -07:00
Vladimir Chtchetkine
3e61d01e62
am 0055deec: Merge "Hookup to cmdline parameters in emulator"
...
* commit '0055deec7e7658e035e63853469667f5d13c9f26':
Hookup to cmdline parameters in emulator
2011-09-20 16:23:09 -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
c95bc80b62
am 88171be0: am 3acd4823: SDK: use XSD v5 props when generating repository packages.
...
* commit '88171be01e9e66856f6daec12a2f3897dc004755':
SDK: use XSD v5 props when generating repository packages.
2011-09-19 15:58:36 -07:00
Raphael Moll
88d7297e96
am c1ec5c26: am ec48ca3d: Win SDK: fix missing platforms-tools/dx.bat
...
* commit 'c1ec5c266387c358d70583203c8eff2f1be47718':
Win SDK: fix missing platforms-tools/dx.bat
2011-09-19 15:56:45 -07: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