OSDN Git Service
Zhijun He [Fri, 14 Feb 2014 23:49:55 +0000 (23:49 +0000)]
Merge "camera_metadata: Update maxNumOutputStreams for limited devices"
Ruben Brunk [Thu, 13 Feb 2014 19:38:57 +0000 (19:38 +0000)]
Merge "camera3: Remove geometric correction tags."
Zhijun He [Wed, 12 Feb 2014 21:37:03 +0000 (13:37 -0800)]
camera_metadata: Update maxNumOutputStreams for limited devices
Change-Id: I95df125e720ad6d6691b5822c9b6d2226a9f0ba0
Eino-Ville Talvala [Mon, 10 Feb 2014 20:39:35 +0000 (12:39 -0800)]
Camera2: Clean up cross-references
- Fix linkify to deal with a few more corner cases around '\n'
- Fix incorrect tag names
- Add test case for verifying linkify
Change-Id: I6dd26899eddc71bddcd53d3a0725c5ef97c2a39b
Ruben Brunk [Fri, 31 Jan 2014 20:48:23 +0000 (12:48 -0800)]
camera3: Remove geometric correction tags.
Change-Id: I01d70e06540862f7f30df570cb447c4411d9e4d4
Ruben Brunk [Sat, 8 Feb 2014 02:57:52 +0000 (02:57 +0000)]
Merge "camera3: Remove noiseModelCoefficients."
Igor Murashkin [Sat, 8 Feb 2014 02:54:00 +0000 (02:54 +0000)]
Merge "camera_metadata: Simplify min frame durations and add available stream configs"
Ruben Brunk [Fri, 31 Jan 2014 20:53:03 +0000 (12:53 -0800)]
camera3: Remove noiseModelCoefficients.
Change-Id: Icdbbe6b0b3c89db16d2e496f10de2f4dc211f87c
Igor Murashkin [Fri, 7 Feb 2014 22:31:31 +0000 (14:31 -0800)]
camera_metadata: Simplify min frame durations and add available stream configs
Change-Id: I41951c9a50a333e8e47d0ba616c316c065b604e8
Ruben Brunk [Sat, 8 Feb 2014 02:39:14 +0000 (02:39 +0000)]
Merge "camera3: Update hotpixel tags."
Igor Murashkin [Sat, 8 Feb 2014 02:35:50 +0000 (02:35 +0000)]
Merge "camera_metadata: Add tags for querying capabilities of a camera device"
Igor Murashkin [Thu, 6 Feb 2014 23:35:37 +0000 (15:35 -0800)]
camera_metadata: Add tags for querying capabilities of a camera device
Change-Id: I955b514f9fe66205d241cd4072aa6ddf71efb53c
Ruben Brunk [Fri, 31 Jan 2014 20:38:46 +0000 (12:38 -0800)]
camera3: Update hotpixel tags.
Change-Id: I6e2931d54a92f3852e8abe8c480f1762c92655ad
Igor Murashkin [Sat, 8 Feb 2014 02:23:03 +0000 (02:23 +0000)]
Merge "camera_metadata: Add android.scaler.availableInputOutputFormatsMap"
Igor Murashkin [Wed, 5 Feb 2014 02:02:27 +0000 (18:02 -0800)]
camera_metadata: Add android.scaler.availableInputOutputFormatsMap
Change-Id: I2f0000614063f4004aa90ad1846936bf85db0389
Ruben Brunk [Sat, 1 Feb 2014 00:50:27 +0000 (16:50 -0800)]
camera3: Update raw color calibration transform tags.
Change-Id: Ic7a8c68e83b3eb257bd15380baad6370c5eb0dbc
Ruben Brunk [Sat, 8 Feb 2014 01:12:21 +0000 (01:12 +0000)]
Merge "camera3: Add opaque raw format."
Ruben Brunk [Wed, 5 Feb 2014 02:27:20 +0000 (18:27 -0800)]
camera3: Add opaque raw format.
Change-Id: I7abf0e63a0f74ede46e0fe4dd1285283355624b1
Ruben Brunk [Sat, 8 Feb 2014 00:58:46 +0000 (00:58 +0000)]
Merge "camera3: Add camera profile properties."
Zhijun He [Sat, 8 Feb 2014 00:36:07 +0000 (00:36 +0000)]
Merge "camera_metadata: Add OFF_KEEP_STATE flag mode"
Ruben Brunk [Thu, 6 Feb 2014 21:04:38 +0000 (13:04 -0800)]
camera3: Add camera profile properties.
Change-Id: I39f6067bb1c05b8b00b0205bb367312112407299
Zhijun He [Thu, 6 Feb 2014 08:28:22 +0000 (00:28 -0800)]
camera_metadata: Add OFF_KEEP_STATE flag mode
Also fix some minor issue with awbLock.
Change-Id: Ic63b94f5234292121931f1b23d02fe0a70fc95e0
Ruben Brunk [Sat, 8 Feb 2014 00:13:09 +0000 (00:13 +0000)]
Merge "camera3: Make blackLevelPattern optional."
Ruben Brunk [Sat, 8 Feb 2014 00:09:40 +0000 (16:09 -0800)]
camera3: Make blackLevelPattern optional.
Change-Id: Ic7b115e9f6361e158e7af13442bb781bbf351cbf
Zhijun He [Fri, 7 Feb 2014 23:59:32 +0000 (23:59 +0000)]
Merge "camera_metadata: Update focus distance related tags."
Ruben Brunk [Fri, 7 Feb 2014 23:52:35 +0000 (23:52 +0000)]
Merge "camera3: Add camera neutral tag."
Zhijun He [Thu, 6 Feb 2014 09:40:35 +0000 (01:40 -0800)]
camera_metadata: Update focus distance related tags.
Also add focus distance calibration tag.
Change-Id: Iab8f626ec8d1166cfa78ec04425813a3aec9a4c7
Ruben Brunk [Fri, 7 Feb 2014 02:37:48 +0000 (18:37 -0800)]
camera3: Add camera neutral tag.
Change-Id: Ia7e8c444256ce2a587ce708c2e6e951dec9bbdc8
Ruben Brunk [Fri, 31 Jan 2014 22:11:20 +0000 (14:11 -0800)]
camera3: Update blackLevelPattern tag.
Change-Id: Iee29d475c92bec1688de96e7cae54dfaf1eec69d
Zhijun He [Wed, 5 Feb 2014 21:49:45 +0000 (21:49 +0000)]
Merge "camera_metadata: update aelock and tranform matrix tag specs"
Zhijun He [Wed, 5 Feb 2014 00:42:46 +0000 (16:42 -0800)]
camera_metadata: update aelock and tranform matrix tag specs
Change-Id: I9af0a32ee4dd92bbe0f9b86c3c55693f26b75500
Zhijun He [Wed, 5 Feb 2014 08:09:04 +0000 (00:09 -0800)]
camera_metadata: Deprecate trigger id related tags
Change-Id: I1522b0f1406ca09d65144a4ddce7ff64f94177d8
Zhijun He [Wed, 22 Jan 2014 23:58:57 +0000 (15:58 -0800)]
camera_metadata: Update max stream num metadata tags
Change-Id: I9b37600a1e01c9af8bc8b2e3e26c08219cf45ff0
Ruben Brunk [Tue, 4 Feb 2014 20:59:27 +0000 (20:59 +0000)]
Merge "camera3: Update maxRegions tag."
Zhijun He [Tue, 4 Feb 2014 19:32:24 +0000 (11:32 -0800)]
camera_metadata: Deprecate some tags
Change-Id: I3ee67d39492a2d3c58b1edc5491e7cbd1709a981
Ruben Brunk [Wed, 15 Jan 2014 23:55:08 +0000 (15:55 -0800)]
camera3: Update maxRegions tag.
Change-Id: I22501cbf7f941d9626b88182e2dda8a13a620d01
Ruben Brunk [Tue, 4 Feb 2014 01:17:58 +0000 (01:17 +0000)]
Merge "camera3: Update awbRegions tag."
Ruben Brunk [Fri, 31 Jan 2014 19:05:30 +0000 (11:05 -0800)]
camera3: Update awbRegions tag.
Change-Id: I85053b61fae4e360eff9143afc021ad60971f3b6
Igor Murashkin [Tue, 28 Jan 2014 00:06:38 +0000 (16:06 -0800)]
camera_metadata: Deprecate android.quirks.*partial*
Change-Id: I54ccc7a429a8510c6848e05903426a57ea60088f
Igor Murashkin [Tue, 28 Jan 2014 00:00:26 +0000 (16:00 -0800)]
camera_metadata: Revise android.sensor.maxFrameDuration definition
Change-Id: If0bb6c07f4dff85120c31f7163a41f2af255fd65
Zhijun He [Mon, 3 Feb 2014 19:46:58 +0000 (11:46 -0800)]
camera_metadata: Update sceneFlicker tag spec
Change-Id: I1dac4109848b7514d94858ca29d786585d422e97
Zhijun He [Sat, 25 Jan 2014 00:48:25 +0000 (16:48 -0800)]
camera_metadata: Update lens state tag
Also update some related tags.
Change-Id: I16e4973aa351434da30b5109558e9986686f9610
Zhijun He [Wed, 22 Jan 2014 02:28:30 +0000 (18:28 -0800)]
camera_metadata: Update pixelArraySize and analog sensitivity tags
Change-Id: Iafbdd2779873226fc20b0ab46999677f7a842334
Glenn Kasten [Mon, 3 Feb 2014 17:36:13 +0000 (17:36 +0000)]
am
479801e5: am
69e382cc: Merge "audio_route: fix crash with unsupported control types"
* commit '
479801e51167f500d419fee919ab9fc5302aaf44':
audio_route: fix crash with unsupported control types
Glenn Kasten [Mon, 3 Feb 2014 17:29:47 +0000 (17:29 +0000)]
am
69e382cc: Merge "audio_route: fix crash with unsupported control types"
* commit '
69e382cc98d84c2fee6461a21a91b8dfbd66c6b5':
audio_route: fix crash with unsupported control types
Glenn Kasten [Mon, 3 Feb 2014 17:23:46 +0000 (17:23 +0000)]
Merge "audio_route: fix crash with unsupported control types"
Eric Laurent [Wed, 18 Dec 2013 17:58:04 +0000 (09:58 -0800)]
audio_route: fix crash with unsupported control types
Check if control type is supported before accessing xxx_value
fields in mixer_state structure.
Also remove unused parameter warning.
Change-Id: I9005d4760e55f0798d576bd4507700e198900311
Colin Cross [Mon, 27 Jan 2014 22:38:07 +0000 (22:38 +0000)]
am
e41370ac: am
b4522d54: Merge "fix compiling against 64-bit bionic"
* commit '
e41370ac58669544f6a8bebfef30069d65c8253f':
fix compiling against 64-bit bionic
Colin Cross [Mon, 27 Jan 2014 22:33:02 +0000 (22:33 +0000)]
am
b4522d54: Merge "fix compiling against 64-bit bionic"
* commit '
b4522d546444eb1f5ffe8f78c6ea6ef0d4de04d2':
fix compiling against 64-bit bionic
Colin Cross [Mon, 27 Jan 2014 22:26:06 +0000 (22:26 +0000)]
Merge "fix compiling against 64-bit bionic"
Colin Cross [Sat, 25 Jan 2014 02:20:15 +0000 (18:20 -0800)]
fix compiling against 64-bit bionic
64-bit bionic does not define pthread_cond_timedwait_relative_np,
fall back to pthread_cond_timedwait if
HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is not set.
Also fixes an incorrect calculation of nsecs from msecs.
Change-Id: I6f7dab2d2fcc32dd32d6cfe81146150770889f1c
Igor Murashkin [Sat, 18 Jan 2014 02:45:59 +0000 (02:45 +0000)]
Merge "camera_metadata: Add android.request.partialResultCount"
Ruben Brunk [Sat, 18 Jan 2014 02:31:04 +0000 (02:31 +0000)]
Merge "camera3: Update optical stabilization tags."
Igor Murashkin [Fri, 10 Jan 2014 22:18:30 +0000 (14:18 -0800)]
camera_metadata: Add android.request.partialResultCount
Change-Id: Ie21010767ad1e58b3a46e977e7f9ee7f1951bad2
Ruben Brunk [Thu, 16 Jan 2014 02:09:41 +0000 (18:09 -0800)]
camera3: Update optical stabilization tags.
Change-Id: Ic2bdec216c1685f2ea3036f9d027ea24679a8bfe
Igor Murashkin [Fri, 17 Jan 2014 01:51:36 +0000 (17:51 -0800)]
camera_metadata: Add synchronization definitions to enable LIMITED HAL3 devices
Change-Id: Ic5fda4bdc3dda0d21f4738c81b5742f86e4ef02c
Igor Murashkin [Fri, 10 Jan 2014 01:43:38 +0000 (17:43 -0800)]
camera_metadata: Add test patterns and pipeline depth information
Bug:
9625427
Change-Id: I11ff3a74f3a115ac9b699ce516400ed323c274f9
Ruben Brunk [Sat, 18 Jan 2014 01:43:49 +0000 (01:43 +0000)]
Merge "camera3: Update sceneMode tag spec."
Igor Murashkin [Sat, 18 Jan 2014 01:27:15 +0000 (17:27 -0800)]
camera_metadata: regenerate HTML
Change-Id: Ic6e765f98f8b34a388bef876a1b2852b6e86fcb2
Igor Murashkin [Tue, 14 Jan 2014 00:51:17 +0000 (16:51 -0800)]
camera_metadata: Update android.tonemap.* definitions
Change-Id: Icdabd02d892018b104955146a4d94b5042ea59d8
Zhijun He [Sat, 18 Jan 2014 00:45:32 +0000 (00:45 +0000)]
Merge "camera_metadata: Update android.shading.mode spec"
Ruben Brunk [Sat, 18 Jan 2014 00:44:20 +0000 (00:44 +0000)]
Merge "camera3: Update availableEffects, effectMode tags."
Zhijun He [Wed, 15 Jan 2014 18:34:02 +0000 (10:34 -0800)]
camera_metadata: Update android.shading.mode spec
Change-Id: I1860b8f80f8e9e25e40831e74475891ba3a81884
Ruben Brunk [Wed, 15 Jan 2014 01:17:19 +0000 (17:17 -0800)]
camera3: Update availableEffects, effectMode tags.
Change-Id: I1edc89f7af9ef15894cfd398116730afa6b0053c
Ruben Brunk [Fri, 17 Jan 2014 23:34:56 +0000 (23:34 +0000)]
Merge "camera3: Update availableSceneModes tag spec."
Ruben Brunk [Wed, 15 Jan 2014 01:46:58 +0000 (17:46 -0800)]
camera3: Update availableSceneModes tag spec.
Change-Id: Ic12f131e438d1370c9db0027a4c54a540a5cb78f
Ruben Brunk [Fri, 17 Jan 2014 23:29:12 +0000 (23:29 +0000)]
Merge "camera3: Update sceneModeOverrides tag spec."
Ruben Brunk [Wed, 15 Jan 2014 03:31:21 +0000 (19:31 -0800)]
camera3: Update sceneModeOverrides tag spec.
Change-Id: Ia16d283df2ffc1b21cb68a6f73280629dd259306
Ruben Brunk [Fri, 17 Jan 2014 23:24:06 +0000 (23:24 +0000)]
Merge "camera3: Update focalLength tags."
Igor Murashkin [Fri, 10 Jan 2014 23:58:35 +0000 (15:58 -0800)]
camera_metadata: Update spec for android.colorCorrection.*
Change-Id: I02ba758f3da9e7c9e304591c410ca5385ebf4b4b
Igor Murashkin [Tue, 14 Jan 2014 01:22:58 +0000 (17:22 -0800)]
camera_metadata: Specify frame durations and minimum frame durations
Change-Id: Ic52c54c3c26e3547a1064fc5afc8ebbac5b392ad
Ruben Brunk [Fri, 17 Jan 2014 22:09:05 +0000 (22:09 +0000)]
Merge "Revert "Revert "camera3: Update vendor tag spec for HAL 3.2."""
Ruben Brunk [Fri, 17 Jan 2014 22:08:53 +0000 (22:08 +0000)]
Revert "Revert "camera3: Update vendor tag spec for HAL 3.2.""
This reverts commit
706caa81e62a1ec7f44caa83f367d75f4b86413e.
Change-Id: Iaecc491ea585ec8353ad03995d753ea13462200e
Ruben Brunk [Wed, 15 Jan 2014 02:55:29 +0000 (18:55 -0800)]
camera3: Update sceneMode tag spec.
Change-Id: I495435397086a295280c556d94fe8efd442a12c3
Zhijun He [Thu, 16 Jan 2014 17:47:07 +0000 (09:47 -0800)]
camera_metadata: Update available formats and sizes
Below tag specs are updated:
- android.scaler.availableFormats
- android.scaler.availableJpegSizes
- android.scaler.availableProcessedSizes
Change-Id: Icbb25f64d0b19685db1ea024db44d54b197fab0b
Ruben Brunk [Fri, 17 Jan 2014 19:33:34 +0000 (19:33 +0000)]
Merge "Revert "camera3: Update vendor tag spec for HAL 3.2.""
Ruben Brunk [Fri, 17 Jan 2014 19:33:04 +0000 (19:33 +0000)]
Revert "camera3: Update vendor tag spec for HAL 3.2."
This reverts commit
90951279fb355334ec7173c95cd6c857a525f6ef.
Change-Id: I7795811b0fe25209bfcaaa9aa8b8a1062b2198fd
Ruben Brunk [Fri, 17 Jan 2014 19:05:00 +0000 (19:05 +0000)]
Merge "camera3: Update vendor tag spec for HAL 3.2."
Ruben Brunk [Thu, 16 Jan 2014 02:39:35 +0000 (18:39 -0800)]
camera3: Update focalLength tags.
Change-Id: I59614223ae65e602f3461029cb4b8848fb22950e
Ruben Brunk [Fri, 17 Jan 2014 18:32:07 +0000 (18:32 +0000)]
Merge "camera3: Update filterDensity, availableFilterDensity tags."
Zhijun He [Wed, 15 Jan 2014 21:47:59 +0000 (13:47 -0800)]
camera_metadata: Update flash mode tag specs
Also added some minor update for captureIntent tag.
Change-Id: Ia667395962bec0f3eb0fe6212570369d0e975c98
Ruben Brunk [Thu, 16 Jan 2014 00:12:07 +0000 (16:12 -0800)]
camera3: Update filterDensity, availableFilterDensity tags.
Change-Id: I27cdf25e370f30637a1e027a57145b0276e5fb0f
Zhijun He [Tue, 14 Jan 2014 00:24:31 +0000 (16:24 -0800)]
camera_metadata: Update 3A state related tags
Below tags are updated:
- android.control.afState: add state transition tables.
- android.control.aeState: add state transition tables.
- android.control.awbState: add state transition tables.
- android.control.afTrigger: some minor corrections.
- android.control.aePrecaptureTrigger: some minor corrections.
Change-Id: I9e134ef4ea4e56336165b80a5850bc602c50f170
Ruben Brunk [Tue, 14 Jan 2014 23:37:33 +0000 (15:37 -0800)]
camera3: Update vendor tag spec for HAL 3.2.
- Deprecates vendor_tag_query_ops struct.
- Moves vendor tag ops declaration to a separate header.
Change-Id: I8066efbea6df20ddb494892684e6571c4fd6d369
Eino-Ville Talvala [Fri, 17 Jan 2014 00:15:08 +0000 (16:15 -0800)]
camera_metadata: Make @see output stable.
Use a sorted list instead of a set for outputting summaries
for filter_tag.
Bug:
12591820
Change-Id: Ia91b4fafb7f1b0c55895e215efcc5e3564cce800
Zhijun He [Thu, 16 Jan 2014 20:13:35 +0000 (12:13 -0800)]
camera_metadata: Update tag spec tone
Minor update for the tag spec tone.
Change-Id: I331a9416969e4d72ff020450fd32f8f34d013970
Igor Murashkin [Thu, 16 Jan 2014 01:05:22 +0000 (17:05 -0800)]
camera_metadata: Enum notes now render via markdown and get linkified
Change-Id: I60189bda78c70e52d6817fb7831610be1c2119a1
Igor Murashkin [Tue, 14 Jan 2014 00:59:47 +0000 (16:59 -0800)]
camera_metadata: Deprecate android.statistics.predictedColor*
Change-Id: I1338a5452faf74ca99973bd7a884834b04c7236a
Igor Murashkin [Tue, 14 Jan 2014 22:57:46 +0000 (14:57 -0800)]
camera_metadata: Fix @see being emitted into middle of javadoc (+more)
Other minor fixes:
- javadoc optional/FULL correctly emitted for properties lacking details
- javadoc details being incorrectly dedented before being rendered by
markdown, causing spurious <code> blocks to be emitted
Bug:
12552669
Change-Id: Ifced75d3c7ff1a4ddd49e013747420f8da4cbe5a
Zhijun He [Wed, 15 Jan 2014 00:30:31 +0000 (16:30 -0800)]
camera_metadata: Update awb mode related tag specs
Below tag specs are updated:
- android.control.awbAvailableModes
- android.control.awbMode (control and dynamic)
Change-Id: Ib1eb5947d7bf2eb76015f120f75148759b7899b4
Zhijun He [Tue, 14 Jan 2014 17:59:04 +0000 (09:59 -0800)]
camera_metadata: Update afAvailableModes tag
Change-Id: I7301021a78c45f76ce2b133663552648712e78e8
Zhijun He [Fri, 10 Jan 2014 18:22:53 +0000 (10:22 -0800)]
camera_metadata: Update lens aperture related tags
Change-Id: I542630509a7bb867bcf780d5d5b4542c36dd74cf
Eino-Ville Talvala [Mon, 13 Jan 2014 23:38:52 +0000 (23:38 +0000)]
Merge "camera_metadata: Update android.control.aeMode, .aeAvailableModes"
Eino-Ville Talvala [Thu, 9 Jan 2014 00:16:53 +0000 (16:16 -0800)]
camera_metadata: Update android.control.aeMode, .aeAvailableModes
Change-Id: Iad60cb27ba7b150f958778e9965db9474252f769
Igor Murashkin [Mon, 13 Jan 2014 19:50:24 +0000 (11:50 -0800)]
camera_metadata: Add ascii table generation to markdown
Change-Id: Ic82c0427ceda0ee9935caee1f4d27d66cc6a2961
Igor Murashkin [Fri, 10 Jan 2014 23:12:40 +0000 (15:12 -0800)]
camera_metadata: Fix HTML range output not to swallow the > sign
- escape all uses of > with &gt; so that it gets converted to
'>' before markdown renders it.
- use regular > for markdown block quotes
Change-Id: Ib86f83102a308613153d09dc5bae2bdb97c3d14f
Igor Murashkin [Fri, 10 Jan 2014 01:44:57 +0000 (17:44 -0800)]
camera_metadata: Fix broken metadata-validate script
- also make validate more robust by checking <clone> target paths
Change-Id: If5652caa35056b640692ac69a17bbc9a76821ffb
Eino-Ville Talvala [Mon, 30 Dec 2013 20:03:45 +0000 (12:03 -0800)]
camera_metadata: Update android.control.aeAntibandingMode
As well as android.control.aeAvailableAntibandingModes.
Change-Id: I36270f47bd94905111ba567e4524c58b1099bcbc
Eino-Ville Talvala [Fri, 3 Jan 2014 00:11:44 +0000 (16:11 -0800)]
camera_metadata: Automatically linkify tag names
Change-Id: I5f07a99765174f519e5d1187b38fd0e7ab355d3f
Igor Murashkin [Fri, 27 Dec 2013 23:30:25 +0000 (15:30 -0800)]
camera_metadata: Make word breaks work for entry names
- Fixes a bug where word breaks were only inserted once into a string.
- Adds unit tests for word breaks
- Unit tests are now always run when generating metadata
Bug:
12301333
Change-Id: Id604ecd275d026bb8818e56f1af0f03eb66edd41