OSDN Git Service

android-x86/system-media.git
9 years agocamera_metadata: reprocessing spec update
Zhijun He [Fri, 16 Jan 2015 02:17:24 +0000 (18:17 -0800)]
camera_metadata: reprocessing spec update

* Clarify reprocessing capabilities and reprocessing controls
* Update noise reduction and edge sharpening controls for
finer granularity controls.

Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4

9 years agocamera_metadata: add lens facing EXTERNAL enum
Zhijun He [Mon, 12 Jan 2015 23:06:16 +0000 (15:06 -0800)]
camera_metadata: add lens facing EXTERNAL enum

This is for usb camera support

Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b

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

10 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

10 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>
10 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>
10 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

10 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

10 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

10 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

10 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)

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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)

10 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)

10 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)

10 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"

10 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

10 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

10 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"

10 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

10 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."

10 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

10 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"

10 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"

10 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

10 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

10 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

10 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

10 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"

10 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."""

10 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

10 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

10 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.""

10 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

10 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."

10 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

10 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

10 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

10 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

10 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.

10 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

10 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.

10 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

10 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"

10 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

10 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

10 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

10 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."

10 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

10 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

10 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."

10 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

10 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"

10 years agocamera_metadata: Add timestampCalibration tag
Zhijun He [Thu, 12 Jun 2014 17:43:32 +0000 (10:43 -0700)]
camera_metadata: Add timestampCalibration tag

Also update the video/optical stabilization docs.

Change-Id: I444cc8d46c0a460bc4311e58bf6166b5c6dbfd14

10 years agoMerge "camera_metadata: Add rollingShutterSkew tag"
Zhijun He [Fri, 13 Jun 2014 21:40:52 +0000 (21:40 +0000)]
Merge "camera_metadata: Add rollingShutterSkew tag"

10 years agocamera_metadata: Add rollingShutterSkew tag
Zhijun He [Wed, 11 Jun 2014 17:44:53 +0000 (10:44 -0700)]
camera_metadata: Add rollingShutterSkew tag

Change-Id: Icbedaeda9fc64a9dda509493ad9d14569c56cd18

10 years agoam b4329160: camera_metadata: Update docs for enum value definitions
Eino-Ville Talvala [Thu, 12 Jun 2014 16:53:54 +0000 (16:53 +0000)]
am b4329160: camera_metadata: Update docs for enum value definitions

* commit 'b432916043290beb246054a77f8978b3136f4315':
  camera_metadata: Update docs for enum value definitions

10 years agoam 68dbc6f7: camera_metadata: Update docs for acronym usage, other fixes
Eino-Ville Talvala [Wed, 11 Jun 2014 17:03:12 +0000 (17:03 +0000)]
am 68dbc6f7: camera_metadata: Update docs for acronym usage, other fixes

* commit '68dbc6f7051b626f6b8f5127393f4cbed8d8500f':
  camera_metadata: Update docs for acronym usage, other fixes

10 years agocamera_metadata: Update docs for enum value definitions
Eino-Ville Talvala [Mon, 9 Jun 2014 21:23:02 +0000 (14:23 -0700)]
camera_metadata: Update docs for enum value definitions

- Add proper @hide support for enum values
  (previous hack produced bad @see lines)
- Format many enum values properly for javadoc
- Additional updates to various entries

Bug: 15475465
Change-Id: I2b03cac8d478e945c7d93717845a9ae44b97639b

10 years agocamera_metadata: Update docs for acronym usage, other fixes
Eino-Ville Talvala [Fri, 6 Jun 2014 21:35:41 +0000 (14:35 -0700)]
camera_metadata: Update docs for acronym usage, other fixes

- Expand acronyms, improve docs for aeExposureCompensation
- Fix minor formatting issues such as missing periods.
- Rewrite cropRegion, sensitivity docs
- Minor fixes to a few enum value docs, still more to do.

Bug: 15394242
Change-Id: I48de626a33ef9b834578f7bb890de9b98d3122d2

10 years agoBuild camera tests as both 32 and 64 bit binaries.
Narayan Kamath [Mon, 2 Jun 2014 17:23:34 +0000 (18:23 +0100)]
Build camera tests as both 32 and 64 bit binaries.

Also fixes warnings and changes the build rule from
BUILD_EXECUTABLE to BUILD_NATIVE_TEST, so that the binary
doesn't get installed under /system/bin.

(cherry-picked from commit commit 550458b2e2ba280030d1774395f3062a3d9af01)

Change-Id: If653fae98870b77841ec11e26fbcc64656202e18

10 years agoam 4efffd39: (-s ours) am a34e4dfd: Merge "Build camera tests as both 32 and 64 bit...
Narayan Kamath [Fri, 6 Jun 2014 10:25:21 +0000 (10:25 +0000)]
am 4efffd39: (-s ours) am a34e4dfd: Merge "Build camera tests as both 32 and 64 bit binaries."

* commit '4efffd39dc446a91a78ee019f6310e6b7791277e':
  Build camera tests as both 32 and 64 bit binaries.

10 years agoam a34e4dfd: Merge "Build camera tests as both 32 and 64 bit binaries."
Narayan Kamath [Fri, 6 Jun 2014 10:21:09 +0000 (10:21 +0000)]
am a34e4dfd: Merge "Build camera tests as both 32 and 64 bit binaries."

* commit 'a34e4dfd8657b1310f9f7f2e6f3fd71ae6f2214e':
  Build camera tests as both 32 and 64 bit binaries.

10 years agoMerge "Build camera tests as both 32 and 64 bit binaries."
Narayan Kamath [Fri, 6 Jun 2014 10:03:54 +0000 (10:03 +0000)]
Merge "Build camera tests as both 32 and 64 bit binaries."

10 years agoam 59793d75: camera_metadata: Hide input stream related key and enum
Zhijun He [Thu, 5 Jun 2014 23:21:04 +0000 (23:21 +0000)]
am 59793d75: camera_metadata: Hide input stream related key and enum

* commit '59793d75a462bb7a4ac2a7b94da284e3e8516a88':
  camera_metadata: Hide input stream related key and enum

10 years agoam f64074e0: Squashed commit of the following:
Glenn Kasten [Thu, 5 Jun 2014 23:21:04 +0000 (23:21 +0000)]
am f64074e0: Squashed commit of the following:

* commit 'f64074e0dcf0e6bbafea3e2cb0037e0d88aeb0c1':
  Squashed commit of the following: