OSDN Git Service

android-x86/system-media.git
7 years agoFix potential overflow in Visualizer effect
rago [Tue, 20 Sep 2016 00:35:06 +0000 (00:35 +0000)]
Fix potential overflow in Visualizer effect
am: 7bbd500874

Change-Id: I88bbbf8cfa578a86a692d75dd5a8cab00be0dcfc

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

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

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

Change-Id: I780f5c31874d12a2d6e16c4658902e271f07ddcf

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

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

Bug: 30591838
Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2

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

Change-Id: I45dd85c5fb5e8066d4fe66f5f07bdfd8cd0d6789

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

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

Bug: 30741779
Change-Id: I6405fe608567a4f4113674050f826f305ecae030

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.

Bug: 12871072.
Change-Id: I64c7d5e16728e3502f1fcd0a40658b72ec7acbe7

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

10 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

10 years agocamera_metadata: Add/Update some metadata tags
Zhijun He [Wed, 17 Jul 2013 16:42:58 +0000 (09:42 -0700)]
camera_metadata: Add/Update some metadata tags

Below tags are Added/Updated:

android.statistics.sceneFlicker
android.colorCorrection.gains
android.statistics.lensShadingMapMode
android.lens.info.lensShadingMapSize
android.statistics.lensShadingMap
android.statistics.predictedColorTransform
android.statistics.predictedColorGains
android.sensor.info.sensitivityRange

Also fixed some typos in tag descrptions.

Change-Id: Ib051bd3c97dad04062ece82e90bce8e6a2531bbd

10 years agoCamera: Improve HTML docs appearance
Eino-Ville Talvala [Tue, 16 Jul 2013 23:18:44 +0000 (16:18 -0700)]
Camera: Improve HTML docs appearance

- Sort TOC by kind
- Update color choices to mimic developer docs
- Add paragraph breaks to several notes sections

Change-Id: Ic4cef63d45bef9edb141f2c65f2004b2b5db4c15

10 years agocamera_metadata: Add visibility support, and a HAL2 tag
Eino-Ville Talvala [Sat, 13 Jul 2013 00:02:27 +0000 (17:02 -0700)]
camera_metadata: Add visibility support, and a HAL2 tag

- Add a visibility property which controls whether a tag is available
  only to the system, hidden in managed code, or public in managed code.
- Add a HAL2 tag to indicate HAL2.x-only tags
- Fix output/inputStream tags to be arrays.

Change-Id: I856d0b1bf413eefd58914e5b85b08331a4bf4536

10 years agoMerge "Camera: Metadata: clear metadata buffer entry before values are assigned"
Zhijun He [Mon, 15 Jul 2013 21:28:32 +0000 (21:28 +0000)]
Merge "Camera: Metadata: clear metadata buffer entry before values are assigned"

10 years agoCamera: Metadata: clear metadata buffer entry before values are assigned
Zhijun He [Mon, 15 Jul 2013 20:55:11 +0000 (13:55 -0700)]
Camera: Metadata: clear metadata buffer entry before values are assigned

To avoid inconsistent state of metadata buffer entry when the entry count is 0.

Bug: 9529161

Change-Id: Ic3fa4b39457142b8bec61d0625d04672b51890b7

10 years agocamera_metadata: Generate java metadata keys source code
Igor Murashkin [Sat, 29 Jun 2013 00:27:49 +0000 (17:27 -0700)]
camera_metadata: Generate java metadata keys source code

Change-Id: Id1d1d4367eb51354e85c4eea38c593a498932e5b

10 years agoMerge "Tweak the metadata-generate script to spit out git repositories that need...
Igor Murashkin [Wed, 26 Jun 2013 23:20:20 +0000 (23:20 +0000)]
Merge "Tweak the metadata-generate script to spit out git repositories that need commit"

10 years agoaudio_route: use mixer_ctl_get/set_array
Ravi Kumar Alamanda [Sat, 25 May 2013 01:02:24 +0000 (18:02 -0700)]
audio_route: use mixer_ctl_get/set_array

Rather than make individual calls to tinyalsa for every
value in each mixer control, which is expensive for linked
controls, use the array get/set functions instead. This
reduces the number of system calls that tinyalsa has to
make. The majority of controls are linked and have 1 or 2
values so the CPU overhead is small.

Change-Id: If32cb8c639e113403641cab0d68b32799cebb059

10 years agoTweak the metadata-generate script to spit out git repositories that need commit
Igor Murashkin [Fri, 21 Jun 2013 19:10:42 +0000 (12:10 -0700)]
Tweak the metadata-generate script to spit out git repositories that need commit

Bug: 9529161
Change-Id: I739b5d5f273e8447bcb955e978c66e4d61c7ace9

11 years agoam f35f6ce7: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Fri, 24 May 2013 22:30:17 +0000 (15:30 -0700)]
am f35f6ce7: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'f35f6ce75375b05634a0acb332635e1954058336':
  camera_metadata: Add supportedHardwareLevel field

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Fri, 24 May 2013 22:28:34 +0000 (15:28 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I03fc6d2dac608cdc0e0c83a87cc90b821f4be52c

11 years agoam 38b8cae3: camera_metadata: Add supportedHardwareLevel field
Igor Murashkin [Fri, 24 May 2013 19:40:59 +0000 (12:40 -0700)]
am 38b8cae3: camera_metadata: Add supportedHardwareLevel field

* commit '38b8cae3876ce1c02d6da310ad93fb31d9c5a9ed':
  camera_metadata: Add supportedHardwareLevel field

11 years agocamera_metadata: Add supportedHardwareLevel field
Igor Murashkin [Thu, 23 May 2013 23:38:59 +0000 (16:38 -0700)]
camera_metadata: Add supportedHardwareLevel field

Bug: 9111852
Change-Id: I6a01cb2678c8cd824eb2eb84d69d47a524c20750

11 years agocamera_metadata: Add supportedHardwareLevel field
Igor Murashkin [Thu, 23 May 2013 23:38:59 +0000 (16:38 -0700)]
camera_metadata: Add supportedHardwareLevel field

Bug: 9111852
Change-Id: I6a01cb2678c8cd824eb2eb84d69d47a524c20750

11 years agoam c2eebfff: Camera: Metadata: Fix color format dump issue
Zhijun He [Mon, 20 May 2013 17:00:46 +0000 (10:00 -0700)]
am c2eebfff: Camera: Metadata: Fix color format dump issue

* commit 'c2eebfffbaeb9da4093d3cd1a323974dbb2b164d':
  Camera: Metadata: Fix color format dump issue

11 years agoMerge "audio_route: skip missing controls"
Simon Wilson [Fri, 17 May 2013 21:22:42 +0000 (21:22 +0000)]
Merge "audio_route: skip missing controls"

11 years agoCamera: Metadata: Fix color format dump issue
Zhijun He [Fri, 17 May 2013 00:49:35 +0000 (17:49 -0700)]
Camera: Metadata: Fix color format dump issue

There are typos and missing color formats in metadata property file, which makes
metadata dump produce misleading logs.
This is debug only change, shouldn't impact any functionality.

Bug: 8970663
Change-Id: If6b9bac9c88db993be51f6eb22ad8821d70abf51

11 years agoam bd7f15b4: Camera: Metadata: Fix the activeArraySize typo.
Zhijun He [Tue, 14 May 2013 06:31:46 +0000 (23:31 -0700)]
am bd7f15b4: Camera: Metadata: Fix the activeArraySize typo.

* commit 'bd7f15b4123546106acb95657289026f4da5a813':
  Camera: Metadata: Fix the activeArraySize typo.

11 years agoCamera: Metadata: Fix the activeArraySize typo.
Zhijun He [Mon, 13 May 2013 23:59:51 +0000 (16:59 -0700)]
Camera: Metadata: Fix the activeArraySize typo.

Bug: 8778377
Change-Id: I1b0724cdc5d72ca54f8b88d101ef13601a95c4fb

11 years agoaudio_route: skip missing controls
Simon Wilson [Mon, 13 May 2013 19:47:41 +0000 (12:47 -0700)]
audio_route: skip missing controls

Mixer controls that are in mixer_paths.xml but missing from
the mixer should be skipped, otherwise arrays will be accessed
out of bounds. This happened in b/8893515.

Also print the missing control name to aid debugging.

Change-Id: Ia808df48734f78a02281408a4025652dec9762c0

11 years agoMerge "audio_route: use ctl_index instead of searching"
Simon Wilson [Thu, 9 May 2013 18:14:18 +0000 (18:14 +0000)]
Merge "audio_route: use ctl_index instead of searching"

11 years agoMerge "Camera: Revise crop region definition." into jb-mr2-dev
Eino-Ville Talvala [Tue, 7 May 2013 23:45:17 +0000 (23:45 +0000)]
Merge "Camera: Revise crop region definition." into jb-mr2-dev

11 years agoMerge "camera_metadata: Fix inconsistencies in digital zoom reporting" into jb-mr2-dev
Igor Murashkin [Tue, 7 May 2013 23:43:06 +0000 (23:43 +0000)]
Merge "camera_metadata: Fix inconsistencies in digital zoom reporting" into jb-mr2-dev

11 years agoMerge "Camera: Metadata: Fix a.ctrl.awbAvailableModes" into jb-mr2-dev
Alex Ray [Tue, 7 May 2013 22:31:36 +0000 (22:31 +0000)]
Merge "Camera: Metadata: Fix a.ctrl.awbAvailableModes" into jb-mr2-dev

11 years agoCamera: Revise crop region definition.
Eino-Ville Talvala [Tue, 16 Apr 2013 22:35:18 +0000 (15:35 -0700)]
Camera: Revise crop region definition.

The current definition is too coarse for controlling the relative
cropping of the output streams.

Bug: 8484377
Change-Id: I5f673fa851dac4648b2b30fe9c7b518ce7689c9c

11 years agocamera_metadata: Fix inconsistencies in digital zoom reporting
Igor Murashkin [Tue, 7 May 2013 17:00:46 +0000 (10:00 -0700)]
camera_metadata: Fix inconsistencies in digital zoom reporting

Bug: 8840802
Change-Id: I195aa3b3ea8a60a7f737ec9abcae676a2d6c1e4f

11 years agocamera_metadata: add validation function to ensure structural sanity
Igor Murashkin [Wed, 1 May 2013 00:21:54 +0000 (17:21 -0700)]
camera_metadata: add validation function to ensure structural sanity

This is particularly useful when accepting copied metadata from another process,
since it could put whatever it want into the binder parcel.

Bug: 8713951
Change-Id: I72b25b2bf96230eb995bb32e3bbd68de16e122cd

11 years agoCamera: Metadata: Fix a.ctrl.awbAvailableModes
Alex Ray [Tue, 30 Apr 2013 23:43:44 +0000 (16:43 -0700)]
Camera: Metadata: Fix a.ctrl.awbAvailableModes

Bug: 8778377
Change-Id: I36138b903909d6cd849efc1775630fcea23dd57d

11 years agocamera_metadata: add new android.led.transmit and availableLeds fields
Igor Murashkin [Tue, 23 Apr 2013 21:31:02 +0000 (14:31 -0700)]
camera_metadata: add new android.led.transmit and availableLeds fields

Bug: 8554573
Change-Id: Iaa93deeab5ee228bf7e01c58d80f1cdb5b2bb79c

11 years agoAdd liblog
Ying Wang [Wed, 10 Apr 2013 05:04:38 +0000 (22:04 -0700)]
Add liblog

Bug: 8580410
Change-Id: I135d98df6283f2c8cfc94817b2d09d68cf0063c0

11 years agocamera_metadata: Mark enum snprint with non-hidden visibility
Igor Murashkin [Tue, 2 Apr 2013 22:19:40 +0000 (15:19 -0700)]
camera_metadata: Mark enum snprint with non-hidden visibility

Since by default our build system assumes everything has hidden visibility,
the symbols for the enum snprint function were not being exported.

Change-Id: I6c0b36067052aceca9ccd56a1b073fd96b35f6ef

11 years agoCamera: Metadata: Fix markdown error in Readme.md
Alex Ray [Wed, 27 Mar 2013 23:40:34 +0000 (16:40 -0700)]
Camera: Metadata: Fix markdown error in Readme.md

Protect filename that contains syntax-parsed "_" character.

Change-Id: I7688ba2e2fbf3172be46e7652fc1d228a5f474b4

11 years agoCamera: Metadata: give explicit 3A starting states
Alex Ray [Wed, 27 Mar 2013 23:26:41 +0000 (16:26 -0700)]
Camera: Metadata: give explicit 3A starting states

Change-Id: I9633393484525ee0e233be9a4835aeed4a075429

11 years agoMerge "Camera: Add trigger metadata entries." into jb-mr2-dev
Eino-Ville Talvala [Fri, 22 Mar 2013 00:20:16 +0000 (00:20 +0000)]
Merge "Camera: Add trigger metadata entries." into jb-mr2-dev

11 years agoCamera: Fix metadata generation on OS X.
Eino-Ville Talvala [Mon, 18 Mar 2013 16:43:57 +0000 (09:43 -0700)]
Camera: Fix metadata generation on OS X.

- readlink has no -f option.
- mktemp requires a template

Change-Id: I77e2fd6a664cda5edeeeb4d781ab5439d6c7c507