OSDN Git Service

android-x86/system-media.git
10 years agocamera_metadata: update metadata type in metadata test
Zhijun He [Thu, 14 Nov 2013 22:19:02 +0000 (14:19 -0800)]
camera_metadata: update metadata type in metadata test

android.colorCorrection.transform was updated to rational type in metadata
change.

Also cleanup the code a little bit.

Bug: 11691467

(cherry picked from commit 7e59ded046175c20258be150cbc94be085924d28)

Change-Id: I2e029651117db809bacd7a3a566975db8eb7168b

10 years agoLP64 fixes for camera_metadata.
Narayan Kamath [Fri, 30 May 2014 14:25:18 +0000 (15:25 +0100)]
LP64 fixes for camera_metadata.

camera_metadata packets are transferred across process
boundaries with Parcel::readBlob / Parcel::writeBlob calls
so we should make sure they have a consistent layout across
32 and 64 bit processes. In this change :

- Replace size_t members with uint32_t members.
- Remove the "void*" user pointer which is no longer required

(cherry picked from commit 21532655a531cf1168f10b8b974e2cef3061dd91)

Change-Id: Iae8d169c8ab4e708128531e09dbe140c3f3b395a

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

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

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

Change-Id: I232bc69613d4defde8389ae42fc6dca0ffde63e0

10 years agoam 16ef11bf: Merge "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.

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

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

10 years agoam e0b59251: Merge "Added parsing of hexadecimal values"
Glenn Kasten [Wed, 30 Apr 2014 23:44:23 +0000 (23:44 +0000)]
am e0b59251: Merge "Added parsing of hexadecimal values"

* commit 'e0b59251376ccaaba5f7f44100d33ad9469d41ed':
  Added parsing of hexadecimal values

10 years agoMerge "Added parsing of hexadecimal values"
Glenn Kasten [Wed, 30 Apr 2014 23:40:30 +0000 (23:40 +0000)]
Merge "Added parsing of hexadecimal values"

10 years agoMerge commit 'acdc8dc1463fcd3c40f7816fdd9f6c05b997214c' into HEAD
Bill Yi [Tue, 29 Apr 2014 18:35:33 +0000 (11:35 -0700)]
Merge commit 'acdc8dc1463fcd3c40f7816fdd9f6c05b997214c' into HEAD

10 years agoMerge "media: echo_reference 64 bit compile issues"
Mark Salyzyn [Wed, 16 Apr 2014 23:16:36 +0000 (23:16 +0000)]
Merge "media: echo_reference 64 bit compile issues"

10 years agomedia: echo_reference 64 bit compile issues
Mark Salyzyn [Wed, 16 Apr 2014 23:04:02 +0000 (16:04 -0700)]
media: echo_reference 64 bit compile issues

Change-Id: Ib84f3e6ded55a3553f9ea33d1257bfd12eb57d8c

10 years agoMerge "Fixes for LP64"
Glenn Kasten [Wed, 26 Mar 2014 21:10:58 +0000 (21:10 +0000)]
Merge "Fixes for LP64"

10 years agoFixes for LP64
Kévin PETIT [Wed, 26 Mar 2014 11:56:32 +0000 (11:56 +0000)]
Fixes for LP64

Change-Id: I30a4eee58385f868795c7fae24a0dd189acf8592
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
10 years agoam fecd69c0: Merge "Revert "Update 64-bit blacklist for libaudioroute""
Colin Cross [Tue, 25 Mar 2014 00:10:14 +0000 (00:10 +0000)]
am fecd69c0: Merge "Revert "Update 64-bit blacklist for libaudioroute""

* commit 'fecd69c05469aaef9f71bd40c2bcfc0532abbc6c':
  Revert "Update 64-bit blacklist for libaudioroute"

10 years agoMerge "Revert "Update 64-bit blacklist for libaudioroute""
Colin Cross [Tue, 25 Mar 2014 00:01:22 +0000 (00:01 +0000)]
Merge "Revert "Update 64-bit blacklist for libaudioroute""

10 years agoRevert "Update 64-bit blacklist for libaudioroute"
Colin Cross [Sat, 22 Mar 2014 05:33:52 +0000 (22:33 -0700)]
Revert "Update 64-bit blacklist for libaudioroute"

This reverts commit b7bd550f054eb141d1e0b57effe614a0f6defd6a.

libaudioroute builds fine for 64-bit

10 years agoam 81e7e452: Merge "Update 64-bit blacklist for libaudioroute"
Glenn Kasten [Fri, 14 Mar 2014 18:33:54 +0000 (18:33 +0000)]
am 81e7e452: Merge "Update 64-bit blacklist for libaudioroute"

* commit '81e7e45299eb0f0528a4ead333f97b9dd2ef9e35':
  Update 64-bit blacklist for libaudioroute

10 years agoMerge "Update 64-bit blacklist for libaudioroute"
Glenn Kasten [Fri, 14 Mar 2014 18:29:21 +0000 (18:29 +0000)]
Merge "Update 64-bit blacklist for libaudioroute"

10 years agoam 6d41d77a: Merge "libcamera_metadata: assert correct state on exit"
Mark Salyzyn [Thu, 13 Mar 2014 23:19:02 +0000 (23:19 +0000)]
am 6d41d77a: Merge "libcamera_metadata: assert correct state on exit"

* commit '6d41d77a36741776c26c6983de83f169a0c8ab9d':
  libcamera_metadata: assert correct state on exit

10 years agoam b7f55262: Merge "libcamera_metadata: 64-bit compile issues"
Mark Salyzyn [Thu, 13 Mar 2014 23:18:58 +0000 (23:18 +0000)]
am b7f55262: Merge "libcamera_metadata: 64-bit compile issues"

* commit 'b7f552621eb37f9f5135c7b9110fdddc1c96ab75':
  libcamera_metadata: 64-bit compile issues

10 years agoMerge "libcamera_metadata: assert correct state on exit"
Mark Salyzyn [Thu, 13 Mar 2014 23:01:12 +0000 (23:01 +0000)]
Merge "libcamera_metadata: assert correct state on exit"

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

(cherry picked from commit 151389f386c45ff23ca5e2df4c3aaeb1fde3c496)

Change-Id: I2d9138f61665baa6695ac086184246334038236d

10 years agoMerge "libcamera_metadata: 64-bit compile issues"
Mark Salyzyn [Thu, 13 Mar 2014 21:36:04 +0000 (21:36 +0000)]
Merge "libcamera_metadata: 64-bit compile issues"

10 years agolibcamera_metadata: 64-bit compile issues
Mark Salyzyn [Thu, 13 Mar 2014 20:24:19 +0000 (13:24 -0700)]
libcamera_metadata: 64-bit compile issues

- logger messages use %zu for size_t
- print format for int32_t and int64_t types.

Change-Id: I3117b074b473f591fd69426a9cd53e8d5d1de52b

10 years agoUpdate 64-bit blacklist for libaudioroute
Glenn Kasten [Sat, 1 Mar 2014 01:24:39 +0000 (17:24 -0800)]
Update 64-bit blacklist for libaudioroute

libaudioroute depends on tinyalsa, which are both 32-bit only since it
is used by mediaserver

Change-Id: If85741bdea73c4272ee751800a0a7f44e6f8efee

10 years agoam 30bf0cc1: audio_route: fix crash with unsupported control types
Eric Laurent [Fri, 7 Mar 2014 18:30:29 +0000 (18:30 +0000)]
am 30bf0cc1: audio_route: fix crash with unsupported control types

* commit '30bf0cc133ecab46b7999ac791ebe95d0c51d746':
  audio_route: fix crash with unsupported control types

10 years agoAdded parsing of hexadecimal values
Johan Gustavsson [Fri, 8 Nov 2013 09:54:12 +0000 (10:54 +0100)]
Added parsing of hexadecimal values

Parsing of hexadecimal values enables expressing e.g. IIR filter
values in hexadecimal format.

Change-Id: Iaa2913777f96176cc4ffa62d9f44cf2e4a5b5c5b

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

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

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

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

11 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

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

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

11 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

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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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

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

11 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

11 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