OSDN Git Service

android-x86/system-media.git
7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a
rago [Tue, 20 Sep 2016 00:57:05 +0000 (00:57 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a
am: a5dddadec9

Change-Id: I8fcbe5c0edfab078d4b86b6b6dd08d7c36b4dc91

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f
rago [Tue, 20 Sep 2016 00:46:12 +0000 (00:46 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f
am: 8682da681a

Change-Id: I2393804a8d234f7374a9e65fc358e10b3c2a3a88

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874
rago [Tue, 20 Sep 2016 00:39:51 +0000 (00:39 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874
am: 99589ed96f

Change-Id: I99309d36b1db752ed86d2b3f13456cd4f0cd6be1

7 years agoFix potential overflow in Visualizer effect
rago [Tue, 20 Sep 2016 00:35:06 +0000 (00:35 +0000)]
Fix potential overflow in Visualizer effect
am: 7bbd500874

Change-Id: I88bbbf8cfa578a86a692d75dd5a8cab00be0dcfc

7 years agoFix potential overflow in Visualizer effect
rago [Tue, 23 Aug 2016 18:09:52 +0000 (11:09 -0700)]
Fix potential overflow in Visualizer effect

Bug: 30229821
Change-Id: Ia07041a5a149d7d3e120aa6ea0345fb86da37c9b
(cherry picked from commit b61dd321d08b21a5629044eca7f96e2ecd348e5f)

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev
Eino-Ville Talvala [Wed, 17 Aug 2016 23:06:15 +0000 (23:06 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev
am: 53d55d7834

Change-Id: If95d67bf8169f121f824639c7324f5470169e59e

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev
Eino-Ville Talvala [Wed, 17 Aug 2016 21:30:39 +0000 (14:30 -0700)]
resolve merge conflicts of 28ce9cd to lmp-dev

Change-Id: I52e1077e21545b15a9b568a3c048580de99c8080

7 years agoCamera metadata: Check for inconsistent data count am: 241ff3e1ce
Eino-Ville Talvala [Wed, 17 Aug 2016 21:07:06 +0000 (21:07 +0000)]
Camera metadata: Check for inconsistent data count am: 241ff3e1ce
am: 59bc9e30bd

Change-Id: Ie09a5953eb7e44e45838306b2998f70541081499

7 years agoCamera metadata: Check for inconsistent data count
Eino-Ville Talvala [Wed, 17 Aug 2016 21:04:06 +0000 (21:04 +0000)]
Camera metadata: Check for inconsistent data count
am: 241ff3e1ce

Change-Id: I780f5c31874d12a2d6e16c4658902e271f07ddcf

7 years agoCamera metadata: Check for inconsistent data count
Eino-Ville Talvala [Tue, 16 Aug 2016 22:48:05 +0000 (15:48 -0700)]
Camera metadata: Check for inconsistent data count

Also check for overflow of data/entry count on append.

Bug: 30591838
Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2

7 years agoCamera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3
Chien-Yu Chen [Wed, 17 Aug 2016 00:08:29 +0000 (00:08 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3
am: 6ebb3d2a93

Change-Id: I25af01fd5dd1ccada3105da84893e6ea7bff119b

7 years agoCamera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec
Chien-Yu Chen [Wed, 17 Aug 2016 00:05:22 +0000 (00:05 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec
am: 4d15f88da3

Change-Id: I637b2009b6fb1c985c867ced35f4cadf0b7d21f9

7 years agoCamera: Prevent data size overflow am: 97a9cd6748
Chien-Yu Chen [Wed, 17 Aug 2016 00:02:26 +0000 (00:02 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748
am: 5ccb5b43ec

Change-Id: I3c828a810c29bc5a1f24bac2d6dfd59d9989f8f0

7 years agoCamera: Prevent data size overflow
Chien-Yu Chen [Wed, 17 Aug 2016 00:01:16 +0000 (00:01 +0000)]
Camera: Prevent data size overflow
am: 97a9cd6748

Change-Id: I45dd85c5fb5e8066d4fe66f5f07bdfd8cd0d6789

7 years agoCamera: Prevent data size overflow
Chien-Yu Chen [Fri, 12 Aug 2016 22:40:16 +0000 (15:40 -0700)]
Camera: Prevent data size overflow

Add a function to check overflow when calculating metadata
data size.

Bug: 30741779
Change-Id: I6405fe608567a4f4113674050f826f305ecae030

9 years agocamera-metadata: clarify the AE precapture trigger API spec
Zhijun He [Fri, 6 Feb 2015 21:42:40 +0000 (13:42 -0800)]
camera-metadata: clarify the AE precapture trigger API spec

Doc only change.

Bug: 19301706
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b

9 years agocamera_metadata: relax the EV compensation requirements
Zhijun He [Wed, 4 Feb 2015 21:51:22 +0000 (13:51 -0800)]
camera_metadata: relax the EV compensation requirements

FULL and LIMITED is allowed to advertise [0,0], which indicates that the
exposure compensation is not supported.

Bug: 19219128
Change-Id: I6020a771201d754351f76617f68c06363fac78e8

9 years agoCamera2: update color aberration spec
Yin-Chia Yeh [Tue, 6 Jan 2015 18:30:16 +0000 (10:30 -0800)]
Camera2: update color aberration spec

Clarify color aberration spec a bit and bind it to MANUAL_POSTPROC
capability instead of FULL mode.

Bug: 18915494
Change-Id: Id5692299190f86eebb30742a87cb3211f47496e7

9 years agoCamera: Make HDR scene mode public.
Eino-Ville Talvala [Fri, 5 Dec 2014 18:46:45 +0000 (10:46 -0800)]
Camera: Make HDR scene mode public.

To maximize backwards compatibility, support the HDR scene mode fully,
as it was supported on Camera HAL1 / Camera API1.

Bug: 18639933
Change-Id: I37938c0d655afbfae72514f176a641b01f79738e

9 years agoCamera2: update antibanding spec
Yin-Chia Yeh [Tue, 25 Nov 2014 19:51:48 +0000 (11:51 -0800)]
Camera2: update antibanding spec

Allow camera to not support AUTO mode.

Bug: 18503791
Change-Id: I9124e2869cfa2376984817006e9cb6e11a9f88f0

9 years agoMerge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev
Ruben Brunk [Fri, 21 Nov 2014 17:42:26 +0000 (17:42 +0000)]
Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev

9 years agoMerge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev
Eino-Ville Talvala [Thu, 20 Nov 2014 22:03:07 +0000 (22:03 +0000)]
Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev

9 years agoCamera2: Doc updates for aeExposureCompensation.
Ruben Brunk [Thu, 20 Nov 2014 19:44:48 +0000 (11:44 -0800)]
Camera2: Doc updates for aeExposureCompensation.

Bug: 18467471
Change-Id: I3c270c535fa5e7f3eb40bd699898a759c07d986b

9 years agoMerge "[audio][eac3] Support EAC3 with small frames" into lmp-mr1-dev
Phil Burk [Mon, 17 Nov 2014 21:42:13 +0000 (21:42 +0000)]
Merge "[audio][eac3] Support EAC3 with small frames" into lmp-mr1-dev

9 years agoCamera: Add one more requirement to BURST_CAPTURE
Eino-Ville Talvala [Mon, 17 Nov 2014 19:27:21 +0000 (11:27 -0800)]
Camera: Add one more requirement to BURST_CAPTURE

To enable full-AUTO bursts, also need to ensure a fast enough
AE target FPS range is available.

Bug: 18281970
Change-Id: Ib4185657a4b32339ce9da3dc71e05a71613ec50f

9 years agoCamera: Add BURST_CAPTURE capability flag
Eino-Ville Talvala [Fri, 3 Oct 2014 01:27:34 +0000 (18:27 -0700)]
Camera: Add BURST_CAPTURE capability flag

This capability (a subset of FULL) indicates that a camera device can
capture high-rate (>= 20fps) bursts of images at full device
resolution, in at least the YUV_420_888 format.

It also guarantees that the synchronization latency for a device is
relatively small, so that fixed-setting bursts can be captured quickly.

Bug: 18281970
Change-Id: Ib774e1cef8b1924326f505c3595f947ac725e27e

9 years agoMerge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev
Ruben Brunk [Sat, 15 Nov 2014 01:14:07 +0000 (01:14 +0000)]
Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev

9 years ago[audio][eac3] Support EAC3 with small frames
Phil Burk [Thu, 13 Nov 2014 00:56:25 +0000 (16:56 -0800)]
[audio][eac3] Support EAC3 with small frames

EAC3 can have 1,2,3 or 6 audio blocks per sync frame.
The old code only supported 6 audio blocks per sync frame.
So streams with fewer blocks were not aligned correctly
in the SPDIF data burst. See IEC61937-3 spec P5.3.3.

The code now tracks how many blocks have been accumulated
for each possible substream.

Bug: 18315783
Change-Id: I75dbedeb69a597a877b2b68c6be23c831ae119b6
Signed-off-by: Phil Burk <philburk@google.com>
9 years agocamera2: Add READ_SETTINGS capability.
Ruben Brunk [Tue, 11 Nov 2014 19:47:03 +0000 (11:47 -0800)]
camera2: Add READ_SETTINGS capability.

This capability is a subset of the MANUAL_SENSOR capability,
and indicates that the camera device can provide read-only
access to many of the sensor control values, even when these
settings cannot be manually changed.

Bug: 18281970
Change-Id: I28be92a85f0a843c690f9ff49263440cd871e40d

9 years agoCamera: doc update for independent 3A
Yin-Chia Yeh [Wed, 12 Nov 2014 19:38:10 +0000 (11:38 -0800)]
Camera: doc update for independent 3A

Capability not defined yet. Just add warning about independent 3A
might not just work.

Bug: 18281970
Change-Id: I0efbd6bce161ad32c1aa391cad1b295dfddc2486

9 years agoCameraMetadata: Docs cleanup, especially units and range
Eino-Ville Talvala [Fri, 3 Oct 2014 01:27:34 +0000 (18:27 -0700)]
CameraMetadata: Docs cleanup, especially units and range

- Add entries for units and range into javadoc
- Fix up existing units entries and add new ones
- Fix up range entries to be consistent for enums
- Add range entries where it makes sense
- Minor fix to javadoc gen to allow for code indentation
- Lots of edits for consistency, especially to
  available* entries.

Bug: 16525650
Change-Id: I654d86c66e796e87d2cf3b47ffcc72cd26977e43

9 years agocamera: Add a hwlevel attribute, annotate each metadata's hardware level
Igor Murashkin [Thu, 2 Oct 2014 22:27:09 +0000 (15:27 -0700)]
camera: Add a hwlevel attribute, annotate each metadata's hardware level

* Set each metadata key to one of full,legacy,limited.
* All keys present on the lower level must also be present on higher
  levels (i.e. all legacy keys present on limited/full devices, all limited
  keys present on full devices.)
* If a key is not annotated, it is assumed to be optional even on full.
  This is usually the case only for future, deprecated, or system keys.

Bug: 17788234
Change-Id: Ie88f3750cc06d889c6750f2099598d53ccb601b7

9 years agoCamera: Reduce maximum required ISO sensitivity to 800
Eino-Ville Talvala [Thu, 25 Sep 2014 17:27:48 +0000 (10:27 -0700)]
Camera: Reduce maximum required ISO sensitivity to 800

Too many ISPs can't produce 1600 gain.

Bug: 17489253
Change-Id: Id99cb73dc935c145b12129029615ab1159eb4dae

9 years agocamera2: Docs update for available AF modes.
Ruben Brunk [Mon, 22 Sep 2014 23:11:06 +0000 (16:11 -0700)]
camera2: Docs update for available AF modes.

Bug: 17588783
Change-Id: If4010517e79b3a51bd6231424a10be672ff5a252

9 years agoMerge "Special-case handling of MONO to/from Multichannel conversions." into lmp-dev
Paul McLean [Fri, 12 Sep 2014 20:01:19 +0000 (20:01 +0000)]
Merge "Special-case handling of MONO to/from Multichannel conversions." into lmp-dev

9 years agoSpecial-case handling of MONO to/from Multichannel conversions.
Paul McLean [Tue, 9 Sep 2014 16:09:16 +0000 (09:09 -0700)]
Special-case handling of MONO to/from Multichannel conversions.

Bug 17435345

Change-Id: Ib4bb2474c8f024c5fec3e17a3dfac178f2096134

9 years agocamera2: make 3A regions null when not available
Yin-Chia Yeh [Thu, 4 Sep 2014 16:33:34 +0000 (09:33 -0700)]
camera2: make 3A regions null when not available

Bug: 17346456
Change-Id: If8e1611614622e7eef6f77e03ef55375650f1c51

9 years agoMerge "camera2: Add back HDR scenemode." into lmp-dev
Ruben Brunk [Sat, 30 Aug 2014 00:28:09 +0000 (00:28 +0000)]
Merge "camera2: Add back HDR scenemode." into lmp-dev

9 years agocamera2: Add back HDR scenemode.
Ruben Brunk [Fri, 29 Aug 2014 00:16:38 +0000 (17:16 -0700)]
camera2: Add back HDR scenemode.

Bug: 17072609

Change-Id: Iebb97d12fc62986ad389460c253cfc504a68ad7f

9 years agocamera: Remove obsolete CameraCharacteristicsTest
Igor Murashkin [Thu, 28 Aug 2014 20:47:56 +0000 (13:47 -0700)]
camera: Remove obsolete CameraCharacteristicsTest

This test has now been fully superceded by
ExtendedCameraCharacteristicsTest

Bug: 17282060
Change-Id: Ic421d0712c78129f0c72251119654856db86a7cf

9 years agoMerge "camera_metadata: Update the aberration correction related tag names" into...
Zhijun He [Thu, 21 Aug 2014 16:17:48 +0000 (16:17 +0000)]
Merge "camera_metadata: Update the aberration correction related tag names" into lmp-dev

9 years agoCamera2: update focusDistanceCalibration doc
Yin-Chia Yeh [Mon, 18 Aug 2014 17:44:21 +0000 (10:44 -0700)]
Camera2: update focusDistanceCalibration doc

Require infinity focus to work for devices advertise
APPROXIMATE or higher quality.

bug 13933979

Change-Id: I4b3e13be657f1643c398930860f0a174a4497a97

9 years agocamera_metadata: Update the aberration correction related tag names
Zhijun He [Mon, 18 Aug 2014 17:55:33 +0000 (10:55 -0700)]
camera_metadata: Update the aberration correction related tag names

Bug: 17008587
Change-Id: I9e635198f150de1f079c17b27c83c7e9c85f018f

9 years ago[audio][spdif] Add spdif AC3 make to audio_utils make
Phil Burk [Mon, 11 Aug 2014 18:46:45 +0000 (11:46 -0700)]
[audio][spdif] Add spdif AC3 make to audio_utils make

Recursively build libraries under audio_utils to resolve
dependencies properly for HAL.

This is part of support for AC3 passthrough over HDMI.

Bug: 9428304
Change-Id: I2e3067dbe9b28dc5ea9eb0e9faebe31f8d9e4135
Signed-off-by: Phil Burk <philburk@google.com>
9 years ago[audio][spdif] Move AC3/SPDIF wrapper from Molly HAL
Phil Burk [Tue, 5 Aug 2014 22:15:29 +0000 (15:15 -0700)]
[audio][spdif] Move AC3/SPDIF wrapper from Molly HAL

Wrap encoded AC3 data in a PCM data burst according
to the IEC61937 spec.

Change-Id: I59b81cafffb36cc430ee2d0776b511576643069f
Signed-off-by: Phil Burk <philburk@google.com>
9 years agoCamera: Rename timestampCalibration -> timestampSource
Eino-Ville Talvala [Mon, 28 Jul 2014 19:49:25 +0000 (12:49 -0700)]
Camera: Rename timestampCalibration -> timestampSource

Improves clarity.

Bug: 16402755
Change-Id: I181186427ce3eb5e2b4a609fbbc0643fca3acce8

9 years agoMerge "camera2: @hide android.request.frameCount" into lmp-dev
Igor Murashkin [Tue, 29 Jul 2014 22:03:29 +0000 (22:03 +0000)]
Merge "camera2: @hide android.request.frameCount" into lmp-dev

9 years agoMerge "Update channel conversion to handle 1 and 3 byte samples" into lmp-dev
Andy Hung [Tue, 29 Jul 2014 14:05:50 +0000 (14:05 +0000)]
Merge "Update channel conversion to handle 1 and 3 byte samples" into lmp-dev

9 years agoUpdate channel conversion to handle 1 and 3 byte samples
Andy Hung [Mon, 28 Jul 2014 03:11:31 +0000 (20:11 -0700)]
Update channel conversion to handle 1 and 3 byte samples

Change-Id: I274def198e0d4d307dd3cffb1fd8c7662d0bb15b

9 years agoDO NOT MERGE: camera2: Move noise model to dynamic metadata.
Ruben Brunk [Wed, 23 Jul 2014 22:13:16 +0000 (15:13 -0700)]
DO NOT MERGE: camera2: Move noise model to dynamic metadata.

Bug: 16369384

Change-Id: I7a540705176c7be68431a977e2b7218ffa1bddd0
(cherry picked from commit 2569725e938810d592a57160770a310f176adb81)

9 years agocamera2: @hide android.request.frameCount
Igor Murashkin [Fri, 25 Jul 2014 23:55:18 +0000 (16:55 -0700)]
camera2: @hide android.request.frameCount

API users should be using exclusively CaptureResult#getFrameNumber()

HAL3 users should be exclusively using camera3_request_t::frame_count

Change-Id: I164011c97a57fb9fb9c504ae4c5f394dcb36a4bc

9 years agoMerge "camera: Annotate public/synthetic keys in the java code" into lmp-dev
Igor Murashkin [Tue, 22 Jul 2014 20:11:14 +0000 (20:11 +0000)]
Merge "camera: Annotate public/synthetic keys in the java code" into lmp-dev

9 years agoCamera2: replace int[] by HighSpeedVideoConfiguration
Yin-Chia Yeh [Tue, 15 Jul 2014 17:42:05 +0000 (10:42 -0700)]
Camera2: replace int[] by HighSpeedVideoConfiguration

Use the new wrapper class to replace int[] representation.
Also update the metadata description to disallow multiple streams
to use different high speed video configurations.

Change-Id: I192e57f6ab5dfbba6d958571352f067a9eaec7b2

9 years agoMerge "Move channel expansion/contraction functions out of USB audio HAL." into lmp-dev
Paul McLean [Fri, 18 Jul 2014 19:26:52 +0000 (19:26 +0000)]
Merge "Move channel expansion/contraction functions out of USB audio HAL." into lmp-dev

9 years agoMove channel expansion/contraction functions out of USB audio HAL.
Paul McLean [Wed, 16 Jul 2014 20:35:52 +0000 (13:35 -0700)]
Move channel expansion/contraction functions out of USB audio HAL.

Change-Id: I551bdf90315488791a7c05ebc70039ccebee209f

9 years agocamera_metadata: partialResultCount should be optional
Zhijun He [Fri, 18 Jul 2014 00:42:56 +0000 (17:42 -0700)]
camera_metadata: partialResultCount should be optional

Change-Id: Iacd2b5e8f388c18cbff0f1cefdb5c10812ae751e

9 years agocamera_metadata: Rename DNG capability to RAW.
Eino-Ville Talvala [Tue, 15 Jul 2014 17:43:01 +0000 (10:43 -0700)]
camera_metadata: Rename DNG capability to RAW.

While this capability allows for saving DNG files, it's
really about the camera device producing usable RAW data, either
for application processing or saving as a DNG.

Leave in the DNG name as an alias to ease transition; it
will be removed when the next metadata update is made.

Bug: 15415688
Change-Id: I1ea9f65b03c4fa06a5004f9d1d485935742001c8

9 years agocamera: Annotate public/synthetic keys in the java code
Igor Murashkin [Wed, 16 Jul 2014 23:54:57 +0000 (16:54 -0700)]
camera: Annotate public/synthetic keys in the java code

Change-Id: Ifc89153136a9be502b7b88addbd16a5de68a7bfc

9 years agoMerge "DO NOT MERGE Virtualizer effect: add parameter to query virtualization mode...
Jean-Michel Trivi [Tue, 15 Jul 2014 15:52:48 +0000 (15:52 +0000)]
Merge "DO NOT MERGE Virtualizer effect: add parameter to query virtualization mode" into lmp-dev

9 years agoDO NOT MERGE Virtualizer effect: add parameter to query virtualization mode
Jean-Michel Trivi [Tue, 15 Jul 2014 00:19:22 +0000 (17:19 -0700)]
DO NOT MERGE Virtualizer effect: add parameter to query virtualization mode

Change-Id: Ie3be4b20e9c7f1a1427b5ae21e6f6ea07c8e2886
(cherry picked from commit 2044f5c00fe126e9faaf03790478944222a353d6)

9 years agoDO NOT MERGE Update virtualizer effect interface for elevation angle
Jean-Michel Trivi [Mon, 14 Jul 2014 22:55:50 +0000 (15:55 -0700)]
DO NOT MERGE Update virtualizer effect interface for elevation angle

Update the comments in the virtualization effect parameters to
  reflect how elevation angles are part of the virtual speaker
  angle query.

Change-Id: Ic942cac40eea954a4f123729b92143a54518453c
(cherry picked from commit 046dddfb4fbdbd8eda6f4f8ad0218cfde2b9a09e)

9 years agoDO NOT MERGE Audio virtualizer effect: define new parameters for capability query
Jean-Michel Trivi [Wed, 9 Jul 2014 16:14:46 +0000 (09:14 -0700)]
DO NOT MERGE Audio virtualizer effect: define new parameters for capability query

Change-Id: I8882e528047a74b425cfa10a1b10c4fef0286bc0
(cherry picked from commit 4f57d02bf3de631f88de1318f0e7e5258c50e0e2)

9 years agoMerge "Fix const in memcpy_by_audio_format parameter"
Andy Hung [Fri, 11 Jul 2014 22:32:56 +0000 (22:32 +0000)]
Merge "Fix const in memcpy_by_audio_format parameter"

9 years agoFix const in memcpy_by_audio_format parameter
Andy Hung [Thu, 10 Jul 2014 21:21:42 +0000 (14:21 -0700)]
Fix const in memcpy_by_audio_format parameter

Change-Id: I7bdeb587e45695e6a914918ba75f102048b2e0eb

9 years agocamera2: Update medadata for BlackLevelPattern.
Ruben Brunk [Thu, 5 Jun 2014 20:20:47 +0000 (13:20 -0700)]
camera2: Update medadata for BlackLevelPattern.

Bug: 15448889

Change-Id: I5d3393f4a1695664bc5315eb592fb0a4e154d22e

9 years agoMerge "camera_metadata: Update capabilities enums"
Eino-Ville Talvala [Thu, 10 Jul 2014 17:12:58 +0000 (17:12 +0000)]
Merge "camera_metadata: Update capabilities enums"

9 years agocamera_metadata: Update capabilities enums
Eino-Ville Talvala [Wed, 9 Jul 2014 16:34:05 +0000 (09:34 -0700)]
camera_metadata: Update capabilities enums

A developer shouldn't see a device advertise a capability that's not
documented.

Leave in ZSL to enable in the future, but move it to the end.

Change-Id: I78d888516880d5ce1371e8b6d3ff24e2f6e20685

9 years agoMerge "camera2: Add NoiseProfile HAL tag."
Ruben Brunk [Wed, 9 Jul 2014 22:48:10 +0000 (22:48 +0000)]
Merge "camera2: Add NoiseProfile HAL tag."

9 years agocamera2: Add NoiseProfile HAL tag.
Ruben Brunk [Wed, 9 Jul 2014 18:28:16 +0000 (11:28 -0700)]
camera2: Add NoiseProfile HAL tag.

Change-Id: Iac1b5b7708222b00a9eb1fb1adc85f0d0a7912cb

9 years agoMerge "camera_metadata: Add aberration correction control"
Zhijun He [Wed, 9 Jul 2014 01:38:55 +0000 (01:38 +0000)]
Merge "camera_metadata: Add aberration correction control"

9 years agoMerge "Add float to uint volume conversion primitives"
Andy Hung [Tue, 8 Jul 2014 17:31:44 +0000 (17:31 +0000)]
Merge "Add float to uint volume conversion primitives"

9 years agoAdd float to uint volume conversion primitives
Andy Hung [Mon, 7 Jul 2014 18:29:50 +0000 (11:29 -0700)]
Add float to uint volume conversion primitives

Change-Id: I8e4ee7caae4703642952ca9b6ac948560aa1f7ba

9 years agocamera_metadata: Add aberration correction control
Zhijun He [Wed, 2 Jul 2014 01:27:42 +0000 (18:27 -0700)]
camera_metadata: Add aberration correction control

Change-Id: I0a3530ee8d5550f0f2a58c4d7af284821d87cb4d

9 years agocamera_metadata: update spec for RAW10
Zhijun He [Tue, 1 Jul 2014 11:43:52 +0000 (04:43 -0700)]
camera_metadata: update spec for RAW10

Bug: 15989722
Change-Id: Ic38ae596d5a472e990389d1fa221a82bea97b715

9 years agoAdd memcpy_by_channel_mask and memcpy_by_index_array
Andy Hung [Fri, 23 May 2014 01:40:30 +0000 (18:40 -0700)]
Add memcpy_by_channel_mask and memcpy_by_index_array

These functions are used for multichannel conversion.
Another function memcpy_by_index_array_initialization()
is provided to help set index arrays.

Change-Id: Ib12f0f83d5892158c5d1681bb4fdf608ee05d20d

9 years agoMerge "Add memcpy_by_channel_mask and memcpy_by_index_array"
Andy Hung [Wed, 2 Jul 2014 20:47:21 +0000 (20:47 +0000)]
Merge "Add memcpy_by_channel_mask and memcpy_by_index_array"

9 years agoMerge "Revert "Revert "camera2: Add legacy mode enum to supported hardware level."""
Ruben Brunk [Wed, 2 Jul 2014 00:13:55 +0000 (00:13 +0000)]
Merge "Revert "Revert "camera2: Add legacy mode enum to supported hardware level."""

9 years agoRevert "Revert "camera2: Add legacy mode enum to supported hardware level.""
Ruben Brunk [Wed, 2 Jul 2014 00:13:46 +0000 (00:13 +0000)]
Revert "Revert "camera2: Add legacy mode enum to supported hardware level.""

This reverts commit ae137c1786f3f3b30c3e4000da8c033477b1b343.

Change-Id: I19483d6964ee219fa4d33cd297e2d217cf0f230f

9 years agoRevert "camera2: Add legacy mode enum to supported hardware level."
Ruben Brunk [Tue, 1 Jul 2014 23:55:06 +0000 (23:55 +0000)]
Revert "camera2: Add legacy mode enum to supported hardware level."

This reverts commit 101aa5ec543f0aecd147399dc085fc9355d0ddae.

Change-Id: I03585a885312558a136dfced4d6f54c40fa0dab8

9 years agoMerge "Revert "camera2: Add legacy mode enum to supported hardware level.""
Ruben Brunk [Tue, 1 Jul 2014 23:55:23 +0000 (23:55 +0000)]
Merge "Revert "camera2: Add legacy mode enum to supported hardware level.""

9 years agocamera2: Add legacy mode enum to supported hardware level.
Ruben Brunk [Tue, 1 Jul 2014 22:56:45 +0000 (15:56 -0700)]
camera2: Add legacy mode enum to supported hardware level.

Bug: 15116722

- Adds enum for a device running in compatibility mode.  When running
  in compatibility mode, the Camera2 API is emulated using the
  deprecated Camera API, and many capabilities will not be supported.

Change-Id: I94f31775699447a82d53b7f2a6f9fbdc0a5afb3f

9 years agoMerge "camera2: Add legacy mode enum to supported hardware level."
Ruben Brunk [Tue, 1 Jul 2014 23:54:08 +0000 (23:54 +0000)]
Merge "camera2: Add legacy mode enum to supported hardware level."

9 years agosystem: media: extended audio_effects.conf for post-processing based upon stream...
bryant_liu [Wed, 11 Jun 2014 09:17:40 +0000 (17:17 +0800)]
system: media: extended audio_effects.conf for post-processing based upon stream types

Change-Id: I1e692731eaa0c1c3ae8e1f5713e1e8e3e3af28c6

9 years agocamera_metadata: Add high speed video support
Zhijun He [Wed, 11 Jun 2014 01:21:34 +0000 (18:21 -0700)]
camera_metadata: Add high speed video support

Below tags are added/updated:
- Add HIGH_SPEED_VIDEO in android.control.sceneMode
- android.control.availableHighSpeedVideoConfigurations

Change-Id: Ice2497c81d9feead7519f5d11f2bd5598093b4bc

9 years agocamera_metadata: update supportedHardwareLevel
Zhijun He [Wed, 25 Jun 2014 15:35:53 +0000 (08:35 -0700)]
camera_metadata: update supportedHardwareLevel

Make the full hardware supportedHardwareLevel more accurately reflect the
spec requirement. Also fixed some other minor spec issues.

Change-Id: I7b55be03dcdeface15e73eff098f690f4f99a23f

9 years agoam 35a7543a: am 77f0f32b: Merge "camera_metadata: update metadata type in metadata...
Narayan Kamath [Mon, 23 Jun 2014 10:40:05 +0000 (10:40 +0000)]
am 35a7543a: am 77f0f32b: Merge "camera_metadata: update metadata type in metadata test"

* commit '35a7543aa4bc843e7d25dbbdb28920d82719ea21':
  camera_metadata: update metadata type in metadata test

9 years agoam a1cb1d5c: (-s ours) am 5a301aee: Merge "LP64 fixes for camera_metadata."
Narayan Kamath [Mon, 23 Jun 2014 10:40:04 +0000 (10:40 +0000)]
am a1cb1d5c: (-s ours) am 5a301aee: Merge "LP64 fixes for camera_metadata."

* commit 'a1cb1d5cde420ef4169a4a76c9c72ad30803e4ad':
  LP64 fixes for camera_metadata.

9 years agoam 77f0f32b: Merge "camera_metadata: update metadata type in metadata test"
Narayan Kamath [Mon, 23 Jun 2014 09:53:13 +0000 (09:53 +0000)]
am 77f0f32b: Merge "camera_metadata: update metadata type in metadata test"

* commit '77f0f32b32adc5ba1134e7a68e4d907c4f695eb6':
  camera_metadata: update metadata type in metadata test

9 years agoam 5a301aee: Merge "LP64 fixes for camera_metadata."
Narayan Kamath [Mon, 23 Jun 2014 09:53:12 +0000 (09:53 +0000)]
am 5a301aee: Merge "LP64 fixes for camera_metadata."

* commit '5a301aee08ee10feb8064c511e0f561b3eb7c945':
  LP64 fixes for camera_metadata.

9 years agocamera2: Make minimum focus distance optional on LIMITED devices
Igor Murashkin [Thu, 19 Jun 2014 22:45:58 +0000 (15:45 -0700)]
camera2: Make minimum focus distance optional on LIMITED devices

* It's still required for MANUAL_SENSOR capable devices

Change-Id: Ie4ab330a738ac4c8e465eacade1bbc39bdb776fe

9 years agoMerge "camera_metadata: update metadata type in metadata test"
Narayan Kamath [Mon, 23 Jun 2014 09:46:28 +0000 (09:46 +0000)]
Merge "camera_metadata: update metadata type in metadata test"

9 years agocamera_metadata: update metadata type in metadata test
Zhijun He [Thu, 14 Nov 2013 22:19:02 +0000 (14:19 -0800)]
camera_metadata: update metadata type in metadata test

android.colorCorrection.transform was updated to rational type in metadata
change.

Also cleanup the code a little bit.

Bug: 11691467

(cherry picked from commit 7e59ded046175c20258be150cbc94be085924d28)

Change-Id: I2e029651117db809bacd7a3a566975db8eb7168b

9 years agoLP64 fixes for camera_metadata.
Narayan Kamath [Fri, 30 May 2014 14:25:18 +0000 (15:25 +0100)]
LP64 fixes for camera_metadata.

camera_metadata packets are transferred across process
boundaries with Parcel::readBlob / Parcel::writeBlob calls
so we should make sure they have a consistent layout across
32 and 64 bit processes. In this change :

- Replace size_t members with uint32_t members.
- Remove the "void*" user pointer which is no longer required

(cherry picked from commit 21532655a531cf1168f10b8b974e2cef3061dd91)

Change-Id: Iae8d169c8ab4e708128531e09dbe140c3f3b395a

9 years agoLP64 fixes for camera_metadata.
Narayan Kamath [Fri, 30 May 2014 14:25:18 +0000 (15:25 +0100)]
LP64 fixes for camera_metadata.

camera_metadata packets are transferred across process
boundaries with Parcel::readBlob / Parcel::writeBlob calls
so we should make sure they have a consistent layout across
32 and 64 bit processes. In this change :

- Replace size_t members with uint32_t members.
- Remove the "void*" user pointer which is no longer required

Change-Id: Ia0eada5d8358be21d725c05d6105705186b3d9c8

9 years agoMerge "LP64 fixes for camera_metadata."
Narayan Kamath [Mon, 23 Jun 2014 09:46:26 +0000 (09:46 +0000)]
Merge "LP64 fixes for camera_metadata."

9 years agocamera2: Update docs for min frame duration.
Ruben Brunk [Thu, 19 Jun 2014 00:13:19 +0000 (17:13 -0700)]
camera2: Update docs for min frame duration.

Bug: 15116722
Change-Id: Ief8b05d46fa12f63cf6a5d41e312c94d5a033553

9 years agoFix shortened floating point WAV file write
Andy Hung [Tue, 17 Jun 2014 21:18:08 +0000 (14:18 -0700)]
Fix shortened floating point WAV file write

Also fix minor robustness issue in sf_open_write in case
the target WAV file is opened in a protected directory.

Change-Id: I4f9a0e2ba92b9e851bd034e40169513e7e08a92b

9 years agoMerge "cts: Assertion fix for camera characteristics."
Ruben Brunk [Tue, 17 Jun 2014 00:27:33 +0000 (00:27 +0000)]
Merge "cts: Assertion fix for camera characteristics."

9 years agocts: Assertion fix for camera characteristics.
Ruben Brunk [Sat, 14 Jun 2014 01:29:33 +0000 (18:29 -0700)]
cts: Assertion fix for camera characteristics.

Change-Id: Ia5f833ec8deabf7c1a2e1cfdbc80f1b0d415ac4f

9 years agoMerge "camera_metadata: Add timestampCalibration tag"
Zhijun He [Sat, 14 Jun 2014 01:38:29 +0000 (01:38 +0000)]
Merge "camera_metadata: Add timestampCalibration tag"