Commit Graph

23342 Commits

Author SHA1 Message Date
James Dong
f09cab8cb0 am 6c537e53: Merge "Properly handle start code in H264/AVC encoder output" into kraken 2010-05-24 10:55:28 -07:00
James Dong
6c537e53ce Merge "Properly handle start code in H264/AVC encoder output" into kraken 2010-05-24 10:54:25 -07:00
Dirk Dougherty
1586f7133e am b59fbafe: am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc. 2010-05-24 10:03:29 -07:00
Dirk Dougherty
b59fbafe5d am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
Merge commit '3cffe1ababdb09f4a90274e25c2f66feee299835' into kraken

* commit '3cffe1ababdb09f4a90274e25c2f66feee299835':
  Doc change: Fix incorrect adt version reference etc.
2010-05-24 10:01:49 -07:00
Andreas Huber
ec5f8241ec am cbcf8f63: Interestingly, a call to fseek with a NULL file handle now blocks forever... 2010-05-24 09:58:02 -07:00
Dirk Dougherty
3cffe1abab am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
Merge commit 'c7c7afd7a1af36e787266815487f4600196406b8' into froyo-plus-aosp

* commit 'c7c7afd7a1af36e787266815487f4600196406b8':
  Doc change: Fix incorrect adt version reference etc.
2010-05-24 09:56:47 -07:00
Andreas Huber
cbcf8f6311 Interestingly, a call to fseek with a NULL file handle now blocks forever...
Change-Id: Ic80c579abcf2bdb73f7fd1da713649b7c7f25f56
2010-05-24 09:24:02 -07:00
Dirk Dougherty
c7c7afd7a1 Doc change: Fix incorrect adt version reference etc.
Change-Id: I79b3f43c64f3c0cd98b245dac001fca4a1008bda
2010-05-24 09:07:14 -07:00
Daniel Sandler
c8a041f13d am 450da449: Merge "New shadowy status bar, direct from Z\'ha\'dum." into kraken 2010-05-24 05:47:03 -07:00
Daniel Sandler
450da449ff Merge "New shadowy status bar, direct from Z'ha'dum." into kraken 2010-05-24 05:45:56 -07:00
Wu-cheng Li
bcf5032537 am bd329ddb: Improve GPS EXIF parameters comments. 2010-05-24 02:32:55 -07:00
Wu-cheng Li
bd329ddbea Improve GPS EXIF parameters comments.
Change-Id: I33f7487821b283fe746baa09a71a703ae763d66d
2010-05-24 17:31:17 +08:00
Chih-Chung Chang
f1c81c5156 am e12a2a47: Merge "Disable CameraServiceTest in a normal build." into kraken 2010-05-23 21:06:39 -07:00
Chih-Chung Chang
e12a2a4705 Merge "Disable CameraServiceTest in a normal build." into kraken 2010-05-23 21:04:01 -07:00
Mathias Agopian
6099e141df am 25f0bdae: added native_window_set_buffer_count() 2010-05-21 14:37:31 -07:00
Mathias Agopian
25f0bdaea6 added native_window_set_buffer_count()
this method can be used to change the number of buffers
associated to a native window. the default is two.

Change-Id: I608b959e6b29d77f95edb23c31dc9b099a758f2f
2010-05-21 14:34:32 -07:00
Mathias Agopian
9840fe2567 am 4f5f2786: Merge "fix the threading issue for setBuffercount()" into kraken 2010-05-21 13:55:18 -07:00
Mathias Agopian
4f5f2786b2 Merge "fix the threading issue for setBuffercount()" into kraken 2010-05-21 13:53:28 -07:00
Daniel Sandler
2c195f77a1 New shadowy status bar, direct from Z'ha'dum.
Artwork is FPO but serviceable enough. Many hardcoded font
colors & styles were moved to styles.xml where they belong.
AM/PM finally given the old heave-ho (but configurable in
StatusBarPolicy.java).

Notification content remains on a light-gray background for
now (so as not to screw up custom RemoteViews) but status
icons will definitely need across-the-board rework to look
better against a dark background.

Change-Id: Id9d5a699532f9336563cd6f9699bff3893735e4f
2010-05-21 15:46:54 -04:00
Mike Lockwood
f1de96d406 am 8e55e88f: Merge "Fix broken Javadoc links" into kraken 2010-05-21 12:29:26 -07:00
Mike Lockwood
8e55e88ff5 Merge "Fix broken Javadoc links" into kraken 2010-05-21 12:28:11 -07:00
Mike Lockwood
965b3d2b84 Fix broken Javadoc links
Change-Id: I6896d6ec16b522e9e63776c0992ef55a6db82d50
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-21 15:19:42 -04:00
Mike Lockwood
41285a71a7 am 5d12d197: Merge "Report number of satellites used in fix instead of total for GPS Location extra" into kraken 2010-05-21 12:17:28 -07:00
Mike Lockwood
5d12d19731 Merge "Report number of satellites used in fix instead of total for GPS Location extra" into kraken 2010-05-21 12:16:19 -07:00
Kevin.KY Tsai
0881f4f933 Report number of satellites used in fix instead of total for GPS Location extra
Change-Id: Ibffc8d21b31b02a91c8506733002e4a778556978
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-21 15:10:39 -04:00
Mike Lockwood
23025ffd10 am 11c6847d: Merge "Unhide new location manager APIs:" into kraken 2010-05-21 11:17:53 -07:00
Mike Lockwood
11c6847d59 Merge "Unhide new location manager APIs:" into kraken 2010-05-21 11:16:51 -07:00
Mike Lockwood
71677f84e7 Unhide new location manager APIs:
Criteria.java
LocationManager.java
New APIs for criteria based location requests and single shot support.

GeocoderParams.java
GeocodeProvider.java
LocationProvider.java
APIs for network location unbundling.

Change-Id: I3311fa01ce76fe4cba3537617e5b1c8d1f1d42b7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-21 14:03:45 -04:00
Mike Lockwood
dc0ca1d52d am 88262733: Merge "New Location Manager APIs for Criteria based requests and single shot mode." into kraken 2010-05-21 10:38:52 -07:00
Mike Lockwood
88262733a7 Merge "New Location Manager APIs for Criteria based requests and single shot mode." into kraken 2010-05-21 10:37:42 -07:00
Mike Lockwood
03ca216ac1 New Location Manager APIs for Criteria based requests and single shot mode.
Use MS-Assisted mode for single shot GPS fixes if it is supported.

Add finer grained control over accuracy to the android.location.Criteria class
and location criteria logic from LocationManager to LocationManagerService

Change-Id: I156b1f6c6a45d255c87ff917cf3e9726a6d7a75b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-21 11:47:19 -04:00
Andreas Huber
132f46ff76 am df17b084: Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken 2010-05-21 08:11:14 -07:00
Andreas Huber
df17b084bc Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken 2010-05-21 08:09:53 -07:00
James Dong
c6161722ad Properly handle start code in H264/AVC encoder output
- Some H264/AVC encoder output start code in each output buffer, and others don't.
  This patch always strips the start code first so that the sample contains the correct size.
- Also properly initialize the interleave duration.

Change-Id: I692043ce7e38f0215e1097aad9e847a57907b6e4
2010-05-20 18:02:52 -07:00
Mathias Agopian
898c4c91be fix the threading issue for setBuffercount()
this change introduces R/W locks in the right places.
on the server-side, it guarantees that setBufferCount()
is synchronized with "retire" and "resize".
on the client-side, it guarantees that setBufferCount()
is synchronized with "dequeue", "lockbuffer" and "queue"
2010-05-20 18:00:42 -07:00
Andreas Huber
5e03fd5d83 am 4979601f: Make the -o option actually terminate. 2010-05-20 16:34:25 -07:00
Andreas Huber
4979601f88 Make the -o option actually terminate.
Change-Id: I91b70ee5c3e1fc9b8bb645e219af296867692e65
2010-05-20 16:32:29 -07:00
Andreas Huber
e932ea5d22 am c05ab485: Merge "Update software AVC decoder to no longer require the kWantsNALFragments hack." into kraken 2010-05-20 15:02:16 -07:00
Andreas Huber
c05ab485e4 Merge "Update software AVC decoder to no longer require the kWantsNALFragments hack." into kraken 2010-05-20 15:01:07 -07:00
Andreas Huber
072f5247ef Support for media extraction from .mkv/.mka Matroska files in stagefright.
Change-Id: I4c26579828ad575523ccf58b0b5cb144046c04ca
related-to-bug: 2483739
2010-05-20 14:56:53 -07:00
Andreas Huber
9402038095 Update software AVC decoder to no longer require the kWantsNALFragments hack.
Change-Id: I7f1882530a891a57d0cd76cbbd7084ee31c59bd1
2010-05-20 14:44:10 -07:00
James Dong
91b9e5fb71 am 85bc1192: Merge "Workaround for preview frame rate setting and encoder profile and level settings on passion 1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282 2. QCOM video encoder has lots of 0-length output buffers if the def 2010-05-20 12:19:44 -07:00
James Dong
85bc1192ce Merge "Workaround for preview frame rate setting and encoder profile and level settings on passion 1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282 2. QCOM video encoder has lots of 0-length output buffers if the default level setting is changed. see bug - 2660974" into kraken 2010-05-20 12:18:39 -07:00
James Dong
ec9e76f921 Workaround for preview frame rate setting and encoder profile and level settings on passion
1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282
2. QCOM video encoder has lots of 0-length output buffers if the default level setting is changed. see bug - 2660974

Change-Id: Id01d94bb77dc242c4712d56a91b0d69a96ba6c2f
2010-05-20 12:01:29 -07:00
Andreas Huber
2130fc82c7 am c6a16327: am 3c16154a: am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo 2010-05-20 11:16:28 -07:00
Andreas Huber
c6a1632732 am 3c16154a: am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
Merge commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3' into kraken

* commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3':
  Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
2010-05-20 11:14:37 -07:00
Andreas Huber
3c16154a33 am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
Merge commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e' into froyo-plus-aosp

* commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e':
  Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
2010-05-20 11:13:20 -07:00
Andreas Huber
2723e09229 Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo 2010-05-20 11:11:39 -07:00
Xia Wang
1753050811 am cf7d2d50: am 3716ea04: am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks. 2010-05-20 11:00:22 -07:00
Xia Wang
cf7d2d50a4 am 3716ea04: am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit '3716ea04d9fd59ff95bacdf6efac4ab5583e13fc' into kraken

* commit '3716ea04d9fd59ff95bacdf6efac4ab5583e13fc':
  If the network SSID is a string, it should be enclosed in double quotation marks.
2010-05-20 10:58:18 -07:00