OSDN Git Service
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)
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)
Andy Hung [Fri, 11 Jul 2014 22:32:56 +0000 (22:32 +0000)]
Merge "Fix 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
Ruben Brunk [Thu, 5 Jun 2014 20:20:47 +0000 (13:20 -0700)]
camera2: Update medadata for BlackLevelPattern.
Bug:
15448889
Change-Id: I5d3393f4a1695664bc5315eb592fb0a4e154d22e
Eino-Ville Talvala [Thu, 10 Jul 2014 17:12:58 +0000 (17:12 +0000)]
Merge "camera_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
Ruben Brunk [Wed, 9 Jul 2014 22:48:10 +0000 (22:48 +0000)]
Merge "camera2: 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
Zhijun He [Wed, 9 Jul 2014 01:38:55 +0000 (01:38 +0000)]
Merge "camera_metadata: Add aberration correction control"
Andy Hung [Tue, 8 Jul 2014 17:31:44 +0000 (17:31 +0000)]
Merge "Add 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
Zhijun He [Wed, 2 Jul 2014 01:27:42 +0000 (18:27 -0700)]
camera_metadata: Add aberration correction control
Change-Id: I0a3530ee8d5550f0f2a58c4d7af284821d87cb4d
Zhijun He [Tue, 1 Jul 2014 11:43:52 +0000 (04:43 -0700)]
camera_metadata: update spec for RAW10
Bug:
15989722
Change-Id: Ic38ae596d5a472e990389d1fa221a82bea97b715
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
Andy Hung [Wed, 2 Jul 2014 20:47:21 +0000 (20:47 +0000)]
Merge "Add memcpy_by_channel_mask and memcpy_by_index_array"
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."""
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
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
Ruben Brunk [Tue, 1 Jul 2014 23:55:23 +0000 (23:55 +0000)]
Merge "Revert "camera2: 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
Ruben Brunk [Tue, 1 Jul 2014 23:54:08 +0000 (23:54 +0000)]
Merge "camera2: Add legacy mode enum to supported hardware level."
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
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
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
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
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.
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
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.
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
Narayan Kamath [Mon, 23 Jun 2014 09:46:28 +0000 (09:46 +0000)]
Merge "camera_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
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
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
Narayan Kamath [Mon, 23 Jun 2014 09:46:26 +0000 (09:46 +0000)]
Merge "LP64 fixes for camera_metadata."
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
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
Ruben Brunk [Tue, 17 Jun 2014 00:27:33 +0000 (00:27 +0000)]
Merge "cts: 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
Zhijun He [Sat, 14 Jun 2014 01:38:29 +0000 (01:38 +0000)]
Merge "camera_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
Zhijun He [Fri, 13 Jun 2014 21:40:52 +0000 (21:40 +0000)]
Merge "camera_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
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
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
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
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
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
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.
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.
Narayan Kamath [Fri, 6 Jun 2014 10:03:54 +0000 (10:03 +0000)]
Merge "Build camera tests as both 32 and 64 bit binaries."
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
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:
Zhijun He [Thu, 5 Jun 2014 18:24:52 +0000 (11:24 -0700)]
camera_metadata: Hide input stream related key and enum
Bug:
14622091
Change-Id: Id8fc20b752da876f00a94d0262cd9468951bb36d
Zhijun He [Thu, 5 Jun 2014 14:43:46 +0000 (14:43 +0000)]
am
5a1276a6: camera_metadata: Update availableStreamConfigurations for JPEG sizes
* commit '
5a1276a68269b5f2959d406d2d7497bd7e8ab591':
camera_metadata: Update availableStreamConfigurations for JPEG sizes
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.
Change-Id: I232bc69613d4defde8389ae42fc6dca0ffde63e0
Glenn Kasten [Thu, 5 Jun 2014 03:30:23 +0000 (20:30 -0700)]
Squashed commit of the following:
commit
b80e690164b152a2fc8ae55c549cf6082c29719a
Author: Andy Hung <hunga@google.com>
Date: Thu May 22 18:26:07 2014 -0700
Add sf_readf_int to read files as 32 bit PCM int
Change-Id: Ic98cca69926309b1a8f77cc702bc54aba20e3996
commit
a0d0fb2d89f5b22cf82dc5a4da52e4bbc3aaffb6
Author: Andy Hung <hunga@google.com>
Date: Thu May 22 18:17:53 2014 -0700
Update sf_readf_float to handle 16 and 32 bit PCM
Change-Id: I0f74ca686f1a86e724057bc483924cea13577ef0
Change-Id: Ie18b611b3025e9b0c566c024b774f2cb2c49ceda
Zhijun He [Mon, 2 Jun 2014 23:46:03 +0000 (16:46 -0700)]
camera_metadata: Update availableStreamConfigurations for JPEG sizes
Also Fix some doc issue in availableCapabilities
Bug:
12035686
Change-Id: Ie517a587f4a9e6cd9731fcca042e24adf832d9e3
Andy Hung [Wed, 4 Jun 2014 02:22:26 +0000 (19:22 -0700)]
Add float to pcm16 writing capability to tinysndfile
Also added pcm16 to float writing capability.
Change-Id: Ic9aef8a3f699ec06d175f0040ee2e5096330a429
Andy Hung [Wed, 4 Jun 2014 02:15:18 +0000 (19:15 -0700)]
Fix tinysndfile write
Wav header incorrectly written in some cases,
resulting in partial data loss and misalignment.
Change-Id: I33d8cd2242e0fc1c6e7b3b36718c4eebb3114ab4
Yin-Chia Yeh [Fri, 30 May 2014 21:43:45 +0000 (21:43 +0000)]
am
ffa121ca: Merge "Camera2: update the spec for 3A region weight" into lmp-preview-dev
* commit '
ffa121ca2e61b40edf56834211f332f4a2cf3055':
Camera2: update the spec for 3A region weight
Yin-Chia Yeh [Fri, 30 May 2014 21:41:22 +0000 (21:41 +0000)]
Merge "Camera2: update the spec for 3A region weight" into lmp-preview-dev
Igor Murashkin [Fri, 30 May 2014 21:33:22 +0000 (21:33 +0000)]
am
b0f18b44: camera_metadata: Change android.lens.focusRange typedef to a float pair
* commit '
b0f18b445eba22a036795fe75c95dd30726c90b6':
camera_metadata: Change android.lens.focusRange typedef to a float pair
Igor Murashkin [Fri, 30 May 2014 17:51:40 +0000 (10:51 -0700)]
camera_metadata: Change android.lens.focusRange typedef to a float pair
Bug:
15335269
Change-Id: If2f3259aeec072438a1c18c1b9728a4c81e92a40
Zhijun He [Thu, 29 May 2014 23:15:35 +0000 (23:15 +0000)]
am
c593aee3: camera_metadata: Fix availableCapabilities incorrect type
* commit '
c593aee3c1184a4a5641c6bec7d6fc305b50d429':
camera_metadata: Fix availableCapabilities incorrect type
Zhijun He [Thu, 29 May 2014 20:31:49 +0000 (13:31 -0700)]
camera_metadata: Fix availableCapabilities incorrect type
Bug:
15168075
Change-Id: I50553d740101b7db1b7695344bf4cdf9c5cd1cf9
Zhijun He [Thu, 29 May 2014 00:42:35 +0000 (00:42 +0000)]
am
a19ede8f: camera_metadata: Doc update for lens locking behavior
* commit '
a19ede8f836c6a924948382ea0677712511bcabf':
camera_metadata: Doc update for lens locking behavior
Zhijun He [Thu, 29 May 2014 00:42:34 +0000 (00:42 +0000)]
am
5fb671c5: camera_metadata: Update spec for thumbnail cropping behavior
* commit '
5fb671c5e2a253246114fab69c6ded5282ccfd4d':
camera_metadata: Update spec for thumbnail cropping behavior
Yin-Chia Yeh [Wed, 14 May 2014 21:05:20 +0000 (14:05 -0700)]
Camera2: update the spec for 3A region weight
Add some details to the 3A region weight spec.
The spec is the same as API1 except now 0 is a valid
setting.
Bug:
15315352
Change-Id: Iceb13b72508cb3c9f758bdcb1b69b6b11ec5aaf8
Zhijun He [Tue, 27 May 2014 22:06:42 +0000 (15:06 -0700)]
camera_metadata: Doc update for lens locking behavior
Need clarify what the HAL should when focus is locked.
Change-Id: Ia0d58f534210a5f94ae3e3773f9ea88b4c646578
Zhijun He [Thu, 22 May 2014 00:51:05 +0000 (17:51 -0700)]
camera_metadata: Update spec for thumbnail cropping behavior
Also update FULL capability spec (remove ZSL from the requirement list) and
and remove LIMITED tag id.
Bug:
15168075
Change-Id: I864baf35ffab9047b52facb29011682e724bbc9b
Ruben Brunk [Wed, 28 May 2014 20:36:35 +0000 (20:36 +0000)]
am
9c766ad0: camera2: Update native/managed key mappings.
* commit '
9c766ad019249dcd238b33f2cd8865a394e2ab26':
camera2: Update native/managed key mappings.
Yin-Chia Yeh [Wed, 28 May 2014 20:36:34 +0000 (20:36 +0000)]
am
0a5f269f: Camera2: switch API interface to java classes
* commit '
0a5f269f79cc66b9c486137383413d6eb7664ea0':
Camera2: switch API interface to java classes
Eino-Ville Talvala [Wed, 28 May 2014 20:36:34 +0000 (20:36 +0000)]
am
aebc8c29: Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
* commit '
aebc8c299385e8e01138b6670408cae231b1b080':
Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
Igor Murashkin [Wed, 28 May 2014 20:36:33 +0000 (20:36 +0000)]
am
35a108fb: camera_metadata: Add support to generate Keys for generic types
* commit '
35a108fbfe7d174682187fa6a87f0590837924d0':
camera_metadata: Add support to generate Keys for generic types
Yin-Chia Yeh [Wed, 28 May 2014 20:36:33 +0000 (20:36 +0000)]
am
739effc0: Camera2: Replace int[] by MeteringRectangle.
* commit '
739effc073e1b0a0a4e22a5a6c162dc67f170e77':
Camera2: Replace int[] by MeteringRectangle.
Ruben Brunk [Wed, 28 May 2014 01:52:49 +0000 (18:52 -0700)]
camera2: Update native/managed key mappings.
Switches to using managed value classes for the following keys:
- android.sensor.info.sensitivityRange
- android.sensor.info.exposureTimeRange
- android.jpeg.gpsCoordinates
- android.jpeg.gpsTimestamp
- android.jpeg.gpsProcessingMethod
- android.statistics.lensShadingMap
- android.lens.info.shadingMapSize
Bug:
14628001
Change-Id: Ia0f541242f529ab9ba3111db799306b198f2b40b
Yin-Chia Yeh [Tue, 27 May 2014 16:48:07 +0000 (09:48 -0700)]
Camera2: switch API interface to java classes
android.sensor.info.physicalSize: float[] -> SizeF
android.statistics.hotPixelMap: int[] -> Point[]
android.tonemap.curve[Red|Green|Blue]: float[] -> TonemapCurve
Bug:
14628001
Change-Id: I1e085f5e640a059852fcb504b6dd5f884039e653
Eino-Ville Talvala [Tue, 27 May 2014 17:50:30 +0000 (10:50 -0700)]
Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
Affected keys:
android.colorCorrection.transform
android.colorCorrection.gain
android.control.aeAvailableAntibandingModes
android.control.aeAvailableModes
android.control.afAvailableModes
android.control.availableEffects
android.control.availableSceneModes
android.control.availableVideoStabilizationModes
android.control.awbAvailableModes
android.edge.availableEdgeModes
android.hotpixel.availableHotPixelModes
android.lens.info.availableOpticalStabilization
android.noiseReduction.availableNoiseReductionModes
android.sensor.calibrationTransform1
android.sensor.calibrationTransform2
android.sensor.colorTransform1
android.sensor.colorTransform2
android.sensor.forwardTransform1
android.sensor.forwardTransform2
android.statistics.info.availableFaceDetectModes
android.tonemap.availableToneMapModes
Bug:
14628001
Change-Id: Ic0a3ff0aaa6bfe872cf8fb740870618c3eee3008
Igor Murashkin [Tue, 27 May 2014 17:51:25 +0000 (10:51 -0700)]
camera_metadata: Add support to generate Keys for generic types
Also adds the following keys:
* android.control.maxRegionsAe
* android.control.maxRegionsAwb
* android.control.maxRegionsAf
* android.request.maxNumOutputRaw
* android.request.maxNumOutputProc
* android.request.maxNumOutputProcStalling
Changes the following keys' type generations:
* android.control.aeTargetFpsRange (Range<Integer>)
* android.control.aeAvailableTargetFpsRanges (Range<Integer>[])
* android.control.aeCompensationRange (Range<Integer>)
* android.lens.focusRange (Range<Float>)
When trying to generate code for a generic type such as a
"Range<Float>", the generated static key initializers will now use
a TypeReference<T> instead of a T.class.
Non-generic types will proceed to use the older T.class variant.
Bug:
14628001
Change-Id: I141847dffc4b0d89cea37c19a54d6d5faf24a9bb
Yin-Chia Yeh [Fri, 16 May 2014 22:13:13 +0000 (15:13 -0700)]
Camera2: Replace int[] by MeteringRectangle.
Bug:
14628001
Change-Id: I8ae4efa24d41043046a84b04e5209259a8a21063
Zhijun He [Fri, 23 May 2014 22:48:10 +0000 (22:48 +0000)]
am
66e62a49: camera_metadata: Mark the under-specified tags for FUTURE
* commit '
66e62a4952ede1bebd6bcbbdbf214720d61e43fc':
camera_metadata: Mark the under-specified tags for FUTURE
Andy Hung [Fri, 23 May 2014 22:31:52 +0000 (22:31 +0000)]
Merge "Add sf_readf_int to read files as 32 bit PCM int"
Andy Hung [Fri, 23 May 2014 22:10:37 +0000 (22:10 +0000)]
Merge "Update sf_readf_float to handle 16 and 32 bit PCM"
Zhijun He [Fri, 23 May 2014 18:02:34 +0000 (11:02 -0700)]
camera_metadata: Mark the under-specified tags for FUTURE
Also clean up the tag ids.
Bug:
15168075
Change-Id: I57fb6fb37e512c224370c72d806a4b702360f29f
Igor Murashkin [Fri, 23 May 2014 20:13:45 +0000 (20:13 +0000)]
am
21404a0d: camera2: Split CameraMetadata.Key into 3 key classes
* commit '
21404a0dbb5989e28bd32c4854088ec899027356':
camera2: Split CameraMetadata.Key into 3 key classes
Igor Murashkin [Tue, 20 May 2014 00:00:36 +0000 (17:00 -0700)]
camera2: Split CameraMetadata.Key into 3 key classes
- Also removes special-cased Face key generation for CTS
Bug:
15091017
Change-Id: Ic56c54c0d184e209e20de374dc8a6d79527c209f
Zhijun He [Fri, 23 May 2014 10:16:22 +0000 (10:16 +0000)]
am
d0f25ca5: camera_metadata: Add croppingType tag
* commit '
d0f25ca5e95ac23796a1209b82c4cafd91fa3402':
camera_metadata: Add croppingType tag
Zhijun He [Wed, 21 May 2014 22:29:07 +0000 (15:29 -0700)]
camera_metadata: Add croppingType tag
This is to indicate if the camera supports arbitrary cropping.
Bug:
15168075
Change-Id: Ib75f7af629be816229cc686c89980fec101301c0
Zhijun He [Fri, 23 May 2014 03:56:43 +0000 (03:56 +0000)]
am
507458b3: camera_metadata: Raw is not croppable
* commit '
507458b3ba51f573d611a9929d4868fcde560fc7':
camera_metadata: Raw is not croppable
Andy Hung [Fri, 23 May 2014 01:26:07 +0000 (18:26 -0700)]
Add sf_readf_int to read files as 32 bit PCM int
Change-Id: Ic98cca69926309b1a8f77cc702bc54aba20e3996
Andy Hung [Fri, 23 May 2014 01:17:53 +0000 (18:17 -0700)]
Update sf_readf_float to handle 16 and 32 bit PCM
Change-Id: I0f74ca686f1a86e724057bc483924cea13577ef0
Zhijun He [Wed, 21 May 2014 18:11:10 +0000 (11:11 -0700)]
camera_metadata: Raw is not croppable
Update spec doc to clarify that raw stream is not croppable.
Bug:
15168075
Change-Id: I4ffa8e2a06acd17913426ba37744bb9df1bc7330
Zhijun He [Fri, 23 May 2014 00:39:37 +0000 (00:39 +0000)]
am
46f82f0a: camera_metadata: Clarify shading map spec
* commit '
46f82f0adee2ff7d5681a378a5cc6cb3670a028d':
camera_metadata: Clarify shading map spec
Zhijun He [Wed, 21 May 2014 01:22:18 +0000 (18:22 -0700)]
camera_metadata: Clarify shading map spec
The existing spec is unclear about shading map calculation for both application
developer and hal implementers, need more clarification.
Also fix a typo in tonemap.mode.
Bug:
15168075
Change-Id: I7f38ccf6aa6938fdac9f64e95deddc0188025d08
Elliott Hughes [Thu, 22 May 2014 17:53:20 +0000 (10:53 -0700)]
resolved conflicts for merge of
eb5d1723 to master
Change-Id: I4452c3b32dc3144da696e63417cd6e7d69805ffb
Calin Juravle [Thu, 22 May 2014 13:47:48 +0000 (13:47 +0000)]
am
b154eb3e: am
16ef11bf: Merge "Move from fdprintf to POSIX dprintf."
* commit '
b154eb3ecb2e6de88be81692b4addda6d26e9516':
Move from fdprintf to POSIX dprintf.
Calin Juravle [Thu, 22 May 2014 13:44:18 +0000 (13:44 +0000)]
am
16ef11bf: Merge "Move from fdprintf to POSIX dprintf."
* commit '
16ef11bf7f6a220aa8eb3d358f1aada33a1b5a46':
Move from fdprintf to POSIX dprintf.
Calin Juravle [Thu, 22 May 2014 13:37:44 +0000 (13:37 +0000)]
Merge "Move from fdprintf to POSIX dprintf."
Elliott Hughes [Thu, 22 May 2014 08:18:02 +0000 (01:18 -0700)]
Move from fdprintf to POSIX dprintf.
Bug:
11156955
Change-Id: I6e15d8229a14688909976ec28b15b92fe507896d