OSDN Git Service

android-x86/system-media.git
10 years agoMerge "camera3: Update filterDensity, availableFilterDensity tags."
Ruben Brunk [Fri, 17 Jan 2014 18:32:07 +0000 (18:32 +0000)]
Merge "camera3: Update filterDensity, availableFilterDensity tags."

10 years agocamera_metadata: Update flash mode tag specs
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

10 years agocamera3: Update filterDensity, availableFilterDensity tags.
Ruben Brunk [Thu, 16 Jan 2014 00:12:07 +0000 (16:12 -0800)]
camera3: Update filterDensity, availableFilterDensity tags.

Change-Id: I27cdf25e370f30637a1e027a57145b0276e5fb0f

10 years agocamera_metadata: Update 3A state related tags
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

10 years agocamera_metadata: Make @see output stable.
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

10 years agocamera_metadata: Update tag spec tone
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

10 years agocamera_metadata: Enum notes now render via markdown and get linkified
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

10 years agocamera_metadata: Deprecate android.statistics.predictedColor*
Igor Murashkin [Tue, 14 Jan 2014 00:59:47 +0000 (16:59 -0800)]
camera_metadata: Deprecate android.statistics.predictedColor*

Change-Id: I1338a5452faf74ca99973bd7a884834b04c7236a

10 years agocamera_metadata: Fix @see being emitted into middle of javadoc (+more)
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

10 years agocamera_metadata: Update awb mode related tag specs
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

10 years agocamera_metadata: Update afAvailableModes tag
Zhijun He [Tue, 14 Jan 2014 17:59:04 +0000 (09:59 -0800)]
camera_metadata: Update afAvailableModes tag

Change-Id: I7301021a78c45f76ce2b133663552648712e78e8

10 years agocamera_metadata: Update lens aperture related tags
Zhijun He [Fri, 10 Jan 2014 18:22:53 +0000 (10:22 -0800)]
camera_metadata: Update lens aperture related tags

Change-Id: I542630509a7bb867bcf780d5d5b4542c36dd74cf

10 years agoMerge "camera_metadata: Update android.control.aeMode, .aeAvailableModes"
Eino-Ville Talvala [Mon, 13 Jan 2014 23:38:52 +0000 (23:38 +0000)]
Merge "camera_metadata: Update android.control.aeMode, .aeAvailableModes"

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

10 years agocamera_metadata: Add ascii table generation to markdown
Igor Murashkin [Mon, 13 Jan 2014 19:50:24 +0000 (11:50 -0800)]
camera_metadata: Add ascii table generation to markdown

Change-Id: Ic82c0427ceda0ee9935caee1f4d27d66cc6a2961

10 years agocamera_metadata: Fix HTML range output not to swallow the > sign
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 &gt; with &amp;gt; so that it gets converted to
  '&gt;' before markdown renders it.
- use regular &gt; for markdown block quotes

Change-Id: Ib86f83102a308613153d09dc5bae2bdb97c3d14f

10 years agocamera_metadata: Fix broken metadata-validate script
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

10 years agocamera_metadata: Update android.control.aeAntibandingMode
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

10 years agocamera_metadata: Automatically linkify tag names
Eino-Ville Talvala [Fri, 3 Jan 2014 00:11:44 +0000 (16:11 -0800)]
camera_metadata: Automatically linkify tag names

Change-Id: I5f07a99765174f519e5d1187b38fd0e7ab355d3f

10 years agocamera_metadata: Make word breaks work for entry names
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

10 years agocamera_metadata: Update android.blackLevel.lock
Eino-Ville Talvala [Thu, 26 Dec 2013 21:16:54 +0000 (13:16 -0800)]
camera_metadata: Update android.blackLevel.lock

Change-Id: I1e0ebcaf1c7ec3643464e3d92ac1fc116f85e67b

10 years agocamera_metadata: Add 'hal_details' field, rename 'notes' field to 'details'
Eino-Ville Talvala [Fri, 27 Dec 2013 21:50:19 +0000 (13:50 -0800)]
camera_metadata: Add 'hal_details' field, rename 'notes' field to 'details'

- Details will contain the full documentation aimed at API users
- HAL details will contain additional notes for HAL implementors

Change-Id: I66452914382b8eca166a032bff4681d7fcef22cf

10 years agocamera_metadata: Move notes to its own row.
Eino-Ville Talvala [Thu, 26 Dec 2013 20:06:13 +0000 (12:06 -0800)]
camera_metadata: Move notes to its own row.

Since the notes field is the majority of the docs, give it more room, to
roughly match the width of the javadoc.

Change-Id: I44e206ec1c6411f57f26235fc8b18a7407d07c22

10 years agocamera_metadata: update jpeg thumbnail related specs
Zhijun He [Thu, 12 Dec 2013 01:03:24 +0000 (17:03 -0800)]
camera_metadata: update jpeg thumbnail related specs

Below tags are updated:
- android.jpeg.thumbnailSize
- android.jpeg.availableThumbnailSizes

Bug: 12135317
Change-Id: I8dc9122fd009051d5b83de3d8c14fc4903ade3c5

10 years agoam c5b5f6b3: audio_route: fix crash with unsupported control types
Eric Laurent [Wed, 18 Dec 2013 22:56:40 +0000 (22:56 +0000)]
am c5b5f6b3: audio_route: fix crash with unsupported control types

* commit 'c5b5f6b344e3d8448e436835e5214364469614f6':
  audio_route: fix crash with unsupported control types

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

10 years agocamera_metadata: Update metadata tag specs
Zhijun He [Mon, 16 Dec 2013 23:08:14 +0000 (15:08 -0800)]
camera_metadata: Update metadata tag specs

Below tags are updated:
- android.edge.mode
- android.noiseReduction.mode

Bug: 12135317
Change-Id: I0d3f1d920f37d3513ed64eeb5740a8017bf8f451

10 years agocamera_metadata: Update metadata tag specs
Zhijun He [Sat, 14 Dec 2013 01:48:53 +0000 (17:48 -0800)]
camera_metadata: Update metadata tag specs

Below tag specs are updated:
- android.control.mode
- android.control.aeMode
- android.control.afMode
- android.control.awbMode

Bug: 12135317
Change-Id: I187d4d404b5c30f0179bf85724c72f5303905fb7

10 years agocamera_metadata: Add support for embedding images into html/javadoc
Igor Murashkin [Wed, 11 Dec 2013 21:31:00 +0000 (13:31 -0800)]
camera_metadata: Add support for embedding images into html/javadoc

- Also finishes specifying the lensShadingMap related fields

Bug: 12135317
Change-Id: I488f76db4650fcc4f8ce6d45e420217016837fbc

10 years agoMerge "camera_metadata: add markdown support to rendering HTML/javadoc"
Igor Murashkin [Wed, 11 Dec 2013 18:21:58 +0000 (18:21 +0000)]
Merge "camera_metadata: add markdown support to rendering HTML/javadoc"

10 years agocamera_metadata: add markdown support to rendering HTML/javadoc
Igor Murashkin [Mon, 9 Dec 2013 20:06:17 +0000 (12:06 -0800)]
camera_metadata: add markdown support to rendering HTML/javadoc

- Also update the android.blackLevel.lock description
  (as an example of using markdown)

Change-Id: I1107cfc2a024d0dd8227ec6afa76f9fbc7f473ad

10 years agocamera_metadata: add API to query metadata alignment
Zhijun He [Thu, 5 Dec 2013 15:44:56 +0000 (07:44 -0800)]
camera_metadata: add API to query metadata alignment

Bug: 12010193
Change-Id: I7d190a183fa89d96cc3cbd59228df3f2a2347c2e

10 years agocamera_metadata: fix metadata clone bug
Zhijun He [Tue, 26 Nov 2013 21:41:18 +0000 (13:41 -0800)]
camera_metadata: fix metadata clone bug

clone_camera_metadata fails at validation during camera start, then crashes
camera.

Bug: 11879762
Change-Id: I9437c6724dd290aec162ae8b68be898b2f9a5b9e

10 years agolibcamera_metadata: export include dir
Alex Ray [Tue, 19 Nov 2013 00:02:26 +0000 (16:02 -0800)]
libcamera_metadata: export include dir

Change-Id: I7327205cceecc429ee048c1620d5ba9b660141f0

10 years agoMerge "camera_metadata: update metadata type in metadata test"
Zhijun He [Fri, 15 Nov 2013 20:58:50 +0000 (20:58 +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
Change-Id: I71daefdfdf733d65016c51c90e04d9ac0b4b1d4a

10 years agolibcamera_metadata: assert correct state on exit
Alex Ray [Wed, 13 Nov 2013 02:09:31 +0000 (18:09 -0800)]
libcamera_metadata: assert correct state on exit

Change-Id: I2d9138f61665baa6695ac086184246334038236d

10 years agoam 52a64a57: Camera: Make partialResult quirk fields hidden, not system.
Eino-Ville Talvala [Fri, 8 Nov 2013 17:54:24 +0000 (09:54 -0800)]
am 52a64a57: Camera: Make partialResult quirk fields hidden, not system.

* commit '52a64a571f037c5b519b98c69a3b47466d4accce':
  Camera: Make partialResult quirk fields hidden, not system.

10 years agoCamera: Make partialResult quirk fields hidden, not system.
Eino-Ville Talvala [Thu, 7 Nov 2013 22:43:43 +0000 (14:43 -0800)]
Camera: Make partialResult quirk fields hidden, not system.

Bug: 11115603
Change-Id: I39c51f0a7655736ff216143ece951102930af93c

10 years agoam 82ce3311: Camera: Add partialResult quirk metadata fields
Eino-Ville Talvala [Tue, 5 Nov 2013 23:53:22 +0000 (15:53 -0800)]
am 82ce3311: Camera: Add partialResult quirk metadata fields

* commit '82ce3311c9430610330456412b0dfab208a7dee3':
  Camera: Add partialResult quirk metadata fields

10 years agoCamera: Add partialResult quirk metadata fields
Eino-Ville Talvala [Thu, 10 Oct 2013 01:21:30 +0000 (18:21 -0700)]
Camera: Add partialResult quirk metadata fields

To be used by HALs to split up capture results into
multiple batches.

Bug: 11115603

Change-Id: I5cfc26b2812f9bf4613944c0679e0e29cfd43616

10 years agocamera_metadata: hide some face metadata
Zhijun He [Mon, 7 Oct 2013 18:23:30 +0000 (11:23 -0700)]
camera_metadata: hide some face metadata

Face ids, scores, rectangels, landmarks are not needed to be exposed to API.

Bug: 11082745
Change-Id: Iaf89f0d6c3e0391ba907a2167d1b56ad10fc6e98

10 years agolibcamera_metadata: document return values
Alex Ray [Thu, 24 Oct 2013 21:01:55 +0000 (14:01 -0700)]
libcamera_metadata: document return values

Change-Id: I940dc7c90f1b1491194e03120c70af4c3893defe

10 years agolibcamera_metadata: Minor fixes
Alex Ray [Mon, 21 Oct 2013 19:57:05 +0000 (12:57 -0700)]
libcamera_metadata: Minor fixes

Add method to get read-only metadata entry by index.
Update some function descriptions to show return values.

Change-Id: Ib79ec1aab8f44f4ee7122fd56064514b2d6f78b4

10 years agomerge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:48:28 +0000 (17:48 -0700)]
merge in klp-release (no-op)

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 10 Oct 2013 13:01:53 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agocamera_metadata: Add CaptureResult cts test
Zhijun He [Sun, 6 Oct 2013 20:03:07 +0000 (13:03 -0700)]
camera_metadata: Add CaptureResult cts test

Also remove the new line from CameraMetadataKeys.mako to avoid adding new line
to the generated file every time we run the script.

Bug: 11082745
Change-Id: I6bed9a71463d866adfe4178e00c33df7b9158ab8

10 years agomerge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 23:03:11 +0000 (16:03 -0700)]
merge in KFS78N (no-op)

10 years agomerge in KQS81M
Ed Heyl [Tue, 8 Oct 2013 22:45:09 +0000 (15:45 -0700)]
merge in KQS81M

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 8 Oct 2013 13:01:49 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoMerge "camera_metadata: add non-full hw level optional tag" into klp-dev
Alex Ray [Mon, 7 Oct 2013 23:25:55 +0000 (23:25 +0000)]
Merge "camera_metadata: add non-full hw level optional tag" into klp-dev

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 6 Oct 2013 13:02:26 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev

10 years agocamera_metadata: add non-full hw level optional tag
Alex Ray [Wed, 2 Oct 2013 00:52:33 +0000 (17:52 -0700)]
camera_metadata: add non-full hw level optional tag

Bug: 10838063
Change-Id: If6d1ef5bd58aca3a9a722e4317f5ce6804dd6680

10 years agocamera_metadata: make face score range 1-100
Zhijun He [Wed, 2 Oct 2013 21:06:15 +0000 (14:06 -0700)]
camera_metadata: make face score range 1-100

1-100 is what we specified in API side.

Bug: 10406212
Change-Id: Id0180dc44b95c43ad820a307d9e3bd98b8fd74fb

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 1 Oct 2013 13:01:49 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agocamera_metadata: Update CameraCharactericsTest to check #getKeys()
Igor Murashkin [Mon, 30 Sep 2013 19:19:19 +0000 (12:19 -0700)]
camera_metadata: Update CameraCharactericsTest to check #getKeys()

Bug: 11007040
Change-Id: If934f861db61cd23af029104d8120a08e52a27ae

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 29 Sep 2013 13:01:56 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agocamera_metadata: Fix focusRange definition
Zhijun He [Thu, 26 Sep 2013 17:27:47 +0000 (10:27 -0700)]
camera_metadata: Fix focusRange definition

It should be a pair of floats.

Bug: 10360518
Change-Id: Ia24741ce9bcae4473eee8be0adc3a190efeab0b8

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 26 Sep 2013 13:02:21 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoMerge "camera_metadata: Update CameraCharacteristicsTest" into klp-dev
Zhijun He [Thu, 26 Sep 2013 00:03:56 +0000 (00:03 +0000)]
Merge "camera_metadata: Update CameraCharacteristicsTest" into klp-dev

10 years agoMerge "Camera: Add PASSIVE_UNFOCUSED AF state" into klp-dev
Eino-Ville Talvala [Wed, 25 Sep 2013 19:27:27 +0000 (19:27 +0000)]
Merge "Camera: Add PASSIVE_UNFOCUSED AF state" into klp-dev

10 years agocamera_metadata: Update CameraCharacteristicsTest
Zhijun He [Wed, 25 Sep 2013 17:08:37 +0000 (10:08 -0700)]
camera_metadata: Update CameraCharacteristicsTest

Replace CameraDevice#getProperties with CameraManager#getCameraCharacteristics.

Bug: 10360518
Change-Id: Id79ee8d984b79ed43bccf77bb571eb6d788e1a1a

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 24 Sep 2013 13:02:16 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoMerge "Visualizer header update for level monitoring" into klp-dev
Jean-Michel Trivi [Mon, 23 Sep 2013 21:18:50 +0000 (21:18 +0000)]
Merge "Visualizer header update for level monitoring" into klp-dev

10 years agoVisualizer header update for level monitoring
Jean-Michel Trivi [Fri, 20 Sep 2013 19:14:40 +0000 (12:14 -0700)]
Visualizer header update for level monitoring

Definition and command for measurement mode, and performing a
  measurement

Bug 8413913

Change-Id: Id4e3cc6be89f6f706adb933fe14e3df7241236a9

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 23 Sep 2013 13:00:51 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 22 Sep 2013 17:52:00 +0000 (10:52 -0700)]
merge in klp-release history after reset to klp-dev

10 years agocamera_metadata: Rename CameraProperties to CameraCharacteristics
Igor Murashkin [Tue, 10 Sep 2013 19:25:56 +0000 (12:25 -0700)]
camera_metadata: Rename CameraProperties to CameraCharacteristics

Bug: 10360518
Change-Id: Ib152a751fed07250c8f211b25469560ef05f1107

10 years agocamera_metadata: Update android.request.frameCount docs
Igor Murashkin [Tue, 10 Sep 2013 22:26:20 +0000 (15:26 -0700)]
camera_metadata: Update android.request.frameCount docs

Bug: 10360518
Change-Id: Ia8601df787d166f07264ab0c19ca78e4412574c1

10 years agoCamera: Add PASSIVE_UNFOCUSED AF state
Eino-Ville Talvala [Sat, 21 Sep 2013 00:24:00 +0000 (17:24 -0700)]
Camera: Add PASSIVE_UNFOCUSED AF state

Bug: 10860639
Change-Id: I967b207f8e0473d590fecab942b39dbbb04d0186

10 years agocamera2: Update api to be async
Igor Murashkin [Fri, 20 Sep 2013 00:32:24 +0000 (17:32 -0700)]
camera2: Update api to be async

Bug: 10360518
Change-Id: I66b0dc54135a85822a218e1259dd171e7ddf0c87

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 18 Sep 2013 04:12:13 +0000 (21:12 -0700)]
merge in klp-release history after reset to klp-dev

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 18 Sep 2013 00:40:04 +0000 (17:40 -0700)]
merge in klp-release history after reset to klp-dev

10 years agocamera_metadata: doc fix for availableProcessedSizes
Zhijun He [Tue, 17 Sep 2013 19:38:34 +0000 (12:38 -0700)]
camera_metadata: doc fix for availableProcessedSizes

Bug: 10745982
Change-Id: I2d5aa9a384fa3107482fcf67bef7c1afbd60c50c

10 years agoAudio effect header for loudness enhancement
Jean-Michel Trivi [Tue, 10 Sep 2013 16:05:49 +0000 (09:05 -0700)]
Audio effect header for loudness enhancement

Not defined in OpenSL ES.
Single parameter: target gain, in mB

Bug 8413913

Change-Id: I088009b7471b21502cbeb84a668ebe3484aaea84

10 years agomerge in klp-factoryrom-release history after reset to klp-release
The Android Automerger [Mon, 16 Sep 2013 18:07:04 +0000 (11:07 -0700)]
merge in klp-factoryrom-release history after reset to klp-release

10 years agoMerge "Camera: Fix Java metadata generation bug" into klp-dev
Eino-Ville Talvala [Thu, 12 Sep 2013 18:32:13 +0000 (18:32 +0000)]
Merge "Camera: Fix Java metadata generation bug" into klp-dev

10 years agoMerge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev
Igor Murashkin [Thu, 12 Sep 2013 18:21:15 +0000 (18:21 +0000)]
Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev

10 years agoCamera: Fix Java metadata generation bug
Eino-Ville Talvala [Thu, 12 Sep 2013 18:13:21 +0000 (11:13 -0700)]
Camera: Fix Java metadata generation bug

When a single section included multiple groups of metadata of the same
kind (control, static, or dynamic), only the first was being used
for generating Java-level keys and enums.

Specifically, this affected android.statistics.lensShadingMapMode

Bug: 10726421
Change-Id: Ibec159777dee4d89cf04a7e2a450d4675934636f

10 years agocamera_metadata: add android.lens.state MOVING enum value
Igor Murashkin [Fri, 6 Sep 2013 18:50:48 +0000 (11:50 -0700)]
camera_metadata: add android.lens.state MOVING enum value

Bug: 10621609
Change-Id: Ie5533dfa846df3d4935dcdc58ecc0ce4bcda1914

10 years agoCamera: Updates for latest camera2 API changes
Eino-Ville Talvala [Tue, 10 Sep 2013 17:01:51 +0000 (10:01 -0700)]
Camera: Updates for latest camera2 API changes

Bug: 10549462
Change-Id: Ic8d24d5288a2da8c9e804293be7b4043be038e05

10 years agoMerge "camera_metadata: Correct stream id type" into klp-dev
Zhijun He [Mon, 9 Sep 2013 18:27:34 +0000 (18:27 +0000)]
Merge "camera_metadata: Correct stream id type" into klp-dev

10 years agoMerge "Camera: Add operations to enumerate vendor tags" into klp-dev
Alexander Ray [Sat, 7 Sep 2013 00:39:20 +0000 (00:39 +0000)]
Merge "Camera: Add operations to enumerate vendor tags" into klp-dev

10 years agocamera_metadata: Correct stream id type
Zhijun He [Fri, 6 Sep 2013 21:28:37 +0000 (14:28 -0700)]
camera_metadata: Correct stream id type

It was wrongly specified as uint8_t.

Bug: 10604704
Change-Id: I1cbe2862f49135ddc600e9c05c6f1dda6d28070c

10 years agoCamera2: Minor docs fix.
Timothy Knight [Fri, 6 Sep 2013 20:32:51 +0000 (13:32 -0700)]
Camera2: Minor docs fix.

Bug: 10639270
Change-Id: Ic395460e5c7855df4737227c2afd96498e4e8e5d

10 years agoCamera: Add operations to enumerate vendor tags
Alexander Ray [Tue, 5 Feb 2013 23:47:31 +0000 (15:47 -0800)]
Camera: Add operations to enumerate vendor tags

Adds methods so the framework can enumerate the entire set of vendor
tags supported on a platform.

Change-Id: I17f6c14afd44a1fb0d165f4a13060dd828c80d84

10 years agoCamera2: Clarified docs for 3A regions.
Timothy Knight [Wed, 4 Sep 2013 00:21:45 +0000 (17:21 -0700)]
Camera2: Clarified docs for 3A regions.

Bug: 10545568
Change-Id: I9c74986dd5835f35d44e005bc0eba28f71024ed4

10 years agocamera_metadata: Correct the tone curve definitions.
Zhijun He [Mon, 19 Aug 2013 22:26:33 +0000 (15:26 -0700)]
camera_metadata: Correct the tone curve definitions.

android.tonemap.curveGreen and android.tonemap.curveBlue should be updated to
match android.tonemap.curveRed.

Bug: 10394966
Change-Id: I1e9a36b2cb4a056d7b8418102c95da9411ea3e99

10 years agocamera_metadata: Clear up gain/exposure defs and add sensor.temperature def
Igor Murashkin [Tue, 13 Aug 2013 21:23:39 +0000 (14:23 -0700)]
camera_metadata: Clear up gain/exposure defs and add sensor.temperature def

- sensor.temperature is optional

Change-Id: I6c837ecb4f1701274ed720d13d71bd7f3f112229

10 years agoCamera2: sensor phys. size property type mismatch
Timothy Knight [Fri, 16 Aug 2013 23:15:29 +0000 (16:15 -0700)]
Camera2: sensor phys. size property type mismatch

Bug: 10365758
Change-Id: I7b2b41dad022e8295ae70071359fdf45dcbe9562

10 years agoCamera: Update SDK metadata key/enum generation
Eino-Ville Talvala [Thu, 8 Aug 2013 19:56:37 +0000 (12:56 -0700)]
Camera: Update SDK metadata key/enum generation

- Flatten Key hierarchy
- Insert Keys into their respective containers instead of separate files
- Use ints instead of Enum types
- Insert enum ints into CameraMetadata
- Add @see cross-references between enum Keys and values.
- Add Javadoc to Keys and enum values.
- Map SCALER_AVAILABLE_FORMATS to int

Bug: 10345522
Change-Id: Ia9762b326b404c572de97c2c7814c4e2e0f3070d

10 years agoAdded auto-generator for CameraProperties CTS test
Timothy Knight [Tue, 30 Jul 2013 02:21:49 +0000 (19:21 -0700)]
Added auto-generator for CameraProperties CTS test

Conflicts:
camera/docs/metadata-generate

Change-Id: If34887e869cea7ea2c344c000cb959fe6297e9c0

10 years agoAdd support for writing float .wav to tinysndfile
Glenn Kasten [Tue, 5 Feb 2013 21:14:08 +0000 (13:14 -0800)]
Add support for writing float .wav to tinysndfile

Also improve error handling for the .wav reader

Change-Id: I1a309c723389c9eafd81344d9de4973d237837b8

10 years agoMerge "Add memcpy_to_i16_from_i32 and memcpy_to_i16_from_float"
Glenn Kasten [Tue, 30 Jul 2013 23:09:26 +0000 (23:09 +0000)]
Merge "Add memcpy_to_i16_from_i32 and memcpy_to_i16_from_float"

10 years agoMerge "Camera: Rename photography -> camera2"
Eino-Ville Talvala [Tue, 30 Jul 2013 17:58:00 +0000 (17:58 +0000)]
Merge "Camera: Rename photography -> camera2"

10 years agoAdd memcpy_to_i16_from_i32 and memcpy_to_i16_from_float
Glenn Kasten [Fri, 21 Jun 2013 21:01:54 +0000 (14:01 -0700)]
Add memcpy_to_i16_from_i32 and memcpy_to_i16_from_float

Change-Id: I0c74d99f3201dbd7f51ba0a6e85c51c207c1db1f

10 years agoMerge "Minor resampler cleanup: comments and qualifier order"
Glenn Kasten [Fri, 26 Jul 2013 21:15:46 +0000 (21:15 +0000)]
Merge "Minor resampler cleanup: comments and qualifier order"

10 years agoCamera: Rename photography -> camera2
Eino-Ville Talvala [Fri, 26 Jul 2013 00:10:11 +0000 (17:10 -0700)]
Camera: Rename photography -> camera2

Change-Id: I3d7235b9a82bd5b5c32dab5c9c0bf0718ebf0447

10 years agoMinor resampler cleanup: comments and qualifier order
Glenn Kasten [Wed, 17 Jul 2013 14:25:05 +0000 (07:25 -0700)]
Minor resampler cleanup: comments and qualifier order

Add comments for utility function used by resampler.
Use const int32_t * not int32_t const *.

Change-Id: Iaa5d6a5f7f77178ce0492dc77dcc5c1204271e5f

11 years agocamera_metadata: add typedefs for java generated code
Igor Murashkin [Wed, 17 Jul 2013 23:29:34 +0000 (16:29 -0700)]
camera_metadata: add typedefs for java generated code

Change-Id: I619261b9645cda669a3b5ee7c79f4c56d4d4c3d4