OSDN Git Service

android-x86/system-media.git
9 years agoam cad66197: camera-metadata: clarify the AE precapture trigger API spec
Zhijun He [Sun, 8 Feb 2015 22:36:48 +0000 (22:36 +0000)]
am cad66197: camera-metadata: clarify the AE precapture trigger API spec

* commit 'cad6619726fc322e9f0a2c958cd5e5cac319a795':
  camera-metadata: clarify the AE precapture trigger API spec

9 years agocamera-metadata: clarify the AE precapture trigger API spec
Zhijun He [Fri, 6 Feb 2015 21:42:40 +0000 (13:42 -0800)]
camera-metadata: clarify the AE precapture trigger API spec

Doc only change.

Bug: 19301706
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b

9 years agoam fa73c084: camera_metadata: relax the EV compensation requirements
Zhijun He [Fri, 6 Feb 2015 00:07:00 +0000 (00:07 +0000)]
am fa73c084: camera_metadata: relax the EV compensation requirements

* commit 'fa73c084d0accb03eec5e9296cc05239a13a577e':
  camera_metadata: relax the EV compensation requirements

9 years agocamera_metadata: relax the EV compensation requirements
Zhijun He [Wed, 4 Feb 2015 21:51:22 +0000 (13:51 -0800)]
camera_metadata: relax the EV compensation requirements

FULL and LIMITED is allowed to advertise [0,0], which indicates that the
exposure compensation is not supported.

Bug: 19219128
Change-Id: I6020a771201d754351f76617f68c06363fac78e8

9 years agoam 65720457: Merge "Fix "error: \'memset\' was not declared in this scope"."
Elliott Hughes [Sat, 31 Jan 2015 08:50:21 +0000 (08:50 +0000)]
am 65720457: Merge "Fix "error: \'memset\' was not declared in this scope"."

* commit '657204576c253d119a7fa0661a0d3c49bd822da9':
  Fix "error: 'memset' was not declared in this scope".

9 years agoMerge "Fix "error: 'memset' was not declared in this scope"."
Elliott Hughes [Sat, 31 Jan 2015 08:38:32 +0000 (08:38 +0000)]
Merge "Fix "error: 'memset' was not declared in this scope"."

9 years agoFix "error: 'memset' was not declared in this scope".
Elliott Hughes [Sat, 31 Jan 2015 08:37:28 +0000 (00:37 -0800)]
Fix "error: 'memset' was not declared in this scope".

Change-Id: I3a1c3e9d6bdfe7e99e82d29d815fe8e73bc9bd65

9 years agoam 4ee35d10: Merge "Add missing <string.h> include."
Elliott Hughes [Thu, 29 Jan 2015 16:46:29 +0000 (16:46 +0000)]
am 4ee35d10: Merge "Add missing <string.h> include."

* commit '4ee35d1082aead1baf1b999d062fc903a2372010':
  Add missing <string.h> include.

9 years agoMerge "Add missing <string.h> include."
Elliott Hughes [Thu, 29 Jan 2015 05:00:57 +0000 (05:00 +0000)]
Merge "Add missing <string.h> include."

9 years agoAdd missing <string.h> include.
Elliott Hughes [Thu, 29 Jan 2015 03:37:43 +0000 (19:37 -0800)]
Add missing <string.h> include.

Change-Id: Ib6d840effe96510d3f0a7a175651151539eb89a3

9 years agoam c6e6a404: Merge "Add audio_utils FIFO library"
Glenn Kasten [Thu, 15 Jan 2015 17:28:12 +0000 (17:28 +0000)]
am c6e6a404: Merge "Add audio_utils FIFO library"

* commit 'c6e6a4040699ba8d16e86fe8aa39abade4846a48':
  Add audio_utils FIFO library

9 years agoam 4d52b215: Merge "Move roundup from frameworks/av to system/media"
Glenn Kasten [Thu, 15 Jan 2015 17:28:11 +0000 (17:28 +0000)]
am 4d52b215: Merge "Move roundup from frameworks/av to system/media"

* commit '4d52b215834b7878f9526734122df373b62cb51c':
  Move roundup from frameworks/av to system/media

9 years agoMerge "Add audio_utils FIFO library"
Glenn Kasten [Thu, 15 Jan 2015 17:11:48 +0000 (17:11 +0000)]
Merge "Add audio_utils FIFO library"

9 years agoMerge "Move roundup from frameworks/av to system/media"
Glenn Kasten [Thu, 15 Jan 2015 17:11:07 +0000 (17:11 +0000)]
Merge "Move roundup from frameworks/av to system/media"

9 years agoAdd audio_utils FIFO library
Glenn Kasten [Tue, 6 Jan 2015 22:13:13 +0000 (14:13 -0800)]
Add audio_utils FIFO library

This enables simple uses without requiring the (relatively complex) NBAIO structure.

Change-Id: Ia8cfeb4460cc9f5f41da70ae3e917b89fb745bb9

9 years agoMove roundup from frameworks/av to system/media
Glenn Kasten [Tue, 6 Jan 2015 19:19:48 +0000 (11:19 -0800)]
Move roundup from frameworks/av to system/media

Change-Id: I1083ab739e445e5bd3e3082fc1d3a20cc19601d5

9 years agoam aed8ceae: Camera2: update color aberration spec
Yin-Chia Yeh [Wed, 7 Jan 2015 00:07:08 +0000 (00:07 +0000)]
am aed8ceae: Camera2: update color aberration spec

* commit 'aed8ceae86e48229031b4c6d363025d962e2adc5':
  Camera2: update color aberration spec

9 years agoCamera2: update color aberration spec
Yin-Chia Yeh [Tue, 6 Jan 2015 18:30:16 +0000 (10:30 -0800)]
Camera2: update color aberration spec

Clarify color aberration spec a bit and bind it to MANUAL_POSTPROC
capability instead of FULL mode.

Bug: 18915494
Change-Id: Id5692299190f86eebb30742a87cb3211f47496e7

9 years agoam c89548e3: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
Ying Wang [Tue, 16 Dec 2014 20:46:09 +0000 (20:46 +0000)]
am c89548e3: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."

* commit 'c89548e3d088fd7ee8a0f3a43a9c11a1329b7a20':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.

9 years agoMerge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
Ying Wang [Tue, 16 Dec 2014 20:35:55 +0000 (20:35 +0000)]
Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."

9 years agoCleanup Obsolete LOCAL_PRELINK_MODULE.
Ying Wang [Tue, 16 Dec 2014 20:34:38 +0000 (12:34 -0800)]
Cleanup Obsolete LOCAL_PRELINK_MODULE.

Bug: 18675947
Change-Id: Ib79bf2e7f621532ccfb43d852a6e450932f080be

9 years agoam 14cd0984: Camera: Make HDR scene mode public.
Eino-Ville Talvala [Mon, 8 Dec 2014 19:17:25 +0000 (19:17 +0000)]
am 14cd0984: Camera: Make HDR scene mode public.

* commit '14cd09848a55555c0a8e5de1fc50abb072b02d21':
  Camera: Make HDR scene mode public.

9 years agoCamera: Make HDR scene mode public.
Eino-Ville Talvala [Fri, 5 Dec 2014 18:46:45 +0000 (10:46 -0800)]
Camera: Make HDR scene mode public.

To maximize backwards compatibility, support the HDR scene mode fully,
as it was supported on Camera HAL1 / Camera API1.

Bug: 18639933
Change-Id: I37938c0d655afbfae72514f176a641b01f79738e

9 years agoam 9d1b4524: Camera2: update antibanding spec
Yin-Chia Yeh [Thu, 4 Dec 2014 20:22:43 +0000 (20:22 +0000)]
am 9d1b4524: Camera2: update antibanding spec

* commit '9d1b45241159df81a71f682c6e09d8962fb3a23b':
  Camera2: update antibanding spec

9 years agoCamera2: update antibanding spec
Yin-Chia Yeh [Tue, 25 Nov 2014 19:51:48 +0000 (11:51 -0800)]
Camera2: update antibanding spec

Allow camera to not support AUTO mode.

Bug: 18503791
Change-Id: I9124e2869cfa2376984817006e9cb6e11a9f88f0

9 years agoam 29a4e283: Merge "We HAVE_LITTLE_ENDIAN."
Elliott Hughes [Sat, 22 Nov 2014 08:01:16 +0000 (08:01 +0000)]
am 29a4e283: Merge "We HAVE_LITTLE_ENDIAN."

* commit '29a4e2837b89114cc4da1f991badf2656f342cb5':
  We HAVE_LITTLE_ENDIAN.

9 years agoMerge "We HAVE_LITTLE_ENDIAN."
Elliott Hughes [Sat, 22 Nov 2014 07:52:01 +0000 (07:52 +0000)]
Merge "We HAVE_LITTLE_ENDIAN."

9 years agoWe HAVE_LITTLE_ENDIAN.
Elliott Hughes [Sat, 22 Nov 2014 07:34:05 +0000 (23:34 -0800)]
We HAVE_LITTLE_ENDIAN.

Change-Id: I7d36cda0f4f5ba496ed5e39b54d6c243e3450e3d

9 years agoam c60634d8: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev
Ruben Brunk [Fri, 21 Nov 2014 17:55:10 +0000 (17:55 +0000)]
am c60634d8: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev

* commit 'c60634d85a244faf1df1edfab516f7f4d7425ff6':
  Camera2: Doc updates for aeExposureCompensation.

9 years agoMerge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev
Ruben Brunk [Fri, 21 Nov 2014 17:42:26 +0000 (17:42 +0000)]
Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev

9 years agoMerge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com...
Chong Zhang [Fri, 21 Nov 2014 02:59:28 +0000 (02:59 +0000)]
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/system/media into lmp-mr1-dev-plus-aosp

9 years agoMerge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev
Eino-Ville Talvala [Fri, 21 Nov 2014 02:49:38 +0000 (02:49 +0000)]
Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev
automerge: bc0f14b

* commit 'bc0f14b024896a0cf36d9d15cfe5cca57cd33fda':
  Camera: Add one more requirement to BURST_CAPTURE

9 years agoam bc0f14b0: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev
Eino-Ville Talvala [Fri, 21 Nov 2014 02:44:25 +0000 (02:44 +0000)]
am bc0f14b0: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev

* commit 'bc0f14b024896a0cf36d9d15cfe5cca57cd33fda':
  Camera: Add one more requirement to BURST_CAPTURE

9 years agoMerge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev
Eino-Ville Talvala [Thu, 20 Nov 2014 22:03:07 +0000 (22:03 +0000)]
Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev

9 years agoCamera2: Doc updates for aeExposureCompensation.
Ruben Brunk [Thu, 20 Nov 2014 19:44:48 +0000 (11:44 -0800)]
Camera2: Doc updates for aeExposureCompensation.

Bug: 18467471
Change-Id: I3c270c535fa5e7f3eb40bd699898a759c07d986b

9 years agoam b7592db1: Merge "[audio][eac3] Support EAC3 with small frames" into lmp-mr1-dev
Phil Burk [Tue, 18 Nov 2014 02:06:18 +0000 (02:06 +0000)]
am b7592db1: Merge "[audio][eac3] Support EAC3 with small frames" into lmp-mr1-dev

* commit 'b7592db1edd4dddeccbc676863c821c72363d7fb':
  [audio][eac3] Support EAC3 with small frames

9 years agoMerge "[audio][eac3] Support EAC3 with small frames" into lmp-mr1-dev
Phil Burk [Mon, 17 Nov 2014 21:42:13 +0000 (21:42 +0000)]
Merge "[audio][eac3] Support EAC3 with small frames" into lmp-mr1-dev

9 years agoam 0f0d7955: Camera: Add BURST_CAPTURE capability flag
Eino-Ville Talvala [Mon, 17 Nov 2014 19:31:52 +0000 (19:31 +0000)]
am 0f0d7955: Camera: Add BURST_CAPTURE capability flag

* commit '0f0d79551a1c00565ce4ed389f82d2f468d7ce7d':
  Camera: Add BURST_CAPTURE capability flag

9 years agoCamera: Add one more requirement to BURST_CAPTURE
Eino-Ville Talvala [Mon, 17 Nov 2014 19:27:21 +0000 (11:27 -0800)]
Camera: Add one more requirement to BURST_CAPTURE

To enable full-AUTO bursts, also need to ensure a fast enough
AE target FPS range is available.

Bug: 18281970
Change-Id: Ib4185657a4b32339ce9da3dc71e05a71613ec50f

9 years agoCamera: Add BURST_CAPTURE capability flag
Eino-Ville Talvala [Fri, 3 Oct 2014 01:27:34 +0000 (18:27 -0700)]
Camera: Add BURST_CAPTURE capability flag

This capability (a subset of FULL) indicates that a camera device can
capture high-rate (>= 20fps) bursts of images at full device
resolution, in at least the YUV_420_888 format.

It also guarantees that the synchronization latency for a device is
relatively small, so that fixed-setting bursts can be captured quickly.

Bug: 18281970
Change-Id: Ib774e1cef8b1924326f505c3595f947ac725e27e

9 years agoMerge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev
Ruben Brunk [Sat, 15 Nov 2014 02:46:31 +0000 (02:46 +0000)]
Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev
automerge: 96ce0ae

* commit '96ce0ae53cb5fd46d2e23aa0246b3a8824cdc84e':
  camera2: Add READ_SETTINGS capability.

9 years agoMerge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev
Ruben Brunk [Sat, 15 Nov 2014 01:14:07 +0000 (01:14 +0000)]
Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev

9 years ago[audio][eac3] Support EAC3 with small frames
Phil Burk [Thu, 13 Nov 2014 00:56:25 +0000 (16:56 -0800)]
[audio][eac3] Support EAC3 with small frames

EAC3 can have 1,2,3 or 6 audio blocks per sync frame.
The old code only supported 6 audio blocks per sync frame.
So streams with fewer blocks were not aligned correctly
in the SPDIF data burst. See IEC61937-3 spec P5.3.3.

The code now tracks how many blocks have been accumulated
for each possible substream.

Bug: 18315783
Change-Id: I75dbedeb69a597a877b2b68c6be23c831ae119b6
Signed-off-by: Phil Burk <philburk@google.com>
9 years agoCamera: doc update for independent 3A
Yin-Chia Yeh [Fri, 14 Nov 2014 20:42:26 +0000 (20:42 +0000)]
Camera: doc update for independent 3A
automerge: 668e43c

* commit '668e43c08838252e8954a4f78851f368ebf573bd':
  Camera: doc update for independent 3A

9 years agocamera2: Add READ_SETTINGS capability.
Ruben Brunk [Tue, 11 Nov 2014 19:47:03 +0000 (11:47 -0800)]
camera2: Add READ_SETTINGS capability.

This capability is a subset of the MANUAL_SENSOR capability,
and indicates that the camera device can provide read-only
access to many of the sensor control values, even when these
settings cannot be manually changed.

Bug: 18281970
Change-Id: I28be92a85f0a843c690f9ff49263440cd871e40d

9 years agoCamera: doc update for independent 3A
Yin-Chia Yeh [Wed, 12 Nov 2014 19:38:10 +0000 (11:38 -0800)]
Camera: doc update for independent 3A

Capability not defined yet. Just add warning about independent 3A
might not just work.

Bug: 18281970
Change-Id: I0efbd6bce161ad32c1aa391cad1b295dfddc2486

9 years agoam 7d62fa85: Merge "Move to libc++."
Dan Albert [Wed, 12 Nov 2014 02:52:58 +0000 (02:52 +0000)]
am 7d62fa85: Merge "Move to libc++."

* commit '7d62fa85066977c1eabfa59d3ea766b9c8144b84':
  Move to libc++.

9 years agoMerge "Move to libc++."
Dan Albert [Wed, 12 Nov 2014 01:52:59 +0000 (01:52 +0000)]
Merge "Move to libc++."

9 years agoMove to libc++.
Dan Albert [Mon, 10 Nov 2014 22:46:11 +0000 (14:46 -0800)]
Move to libc++.

Bug: 15193147
Change-Id: I9b6ac5f2282ebb093324d2638f48af229d44ab15

9 years agoam 7d99fccf: am 567167ac: CameraMetadata: Docs cleanup, especially units and range
Eino-Ville Talvala [Wed, 29 Oct 2014 07:00:08 +0000 (07:00 +0000)]
am 7d99fccf: am 567167ac: CameraMetadata: Docs cleanup, especially units and range

* commit '7d99fccf5355b05d89a63a98aa88f9b0cd968b21':

9 years agoam 567534e2: am ca25627f: camera: Add a hwlevel attribute, annotate each metadata...
Igor Murashkin [Wed, 29 Oct 2014 07:00:07 +0000 (07:00 +0000)]
am 567534e2: am ca25627f: camera: Add a hwlevel attribute, annotate each metadata\'s hardware level

* commit '567534e244bca15799b8369c3b73269d5ca5d8ee':

9 years agoam cc889095: am d77b234a: Camera: Reduce maximum required ISO sensitivity to 800
Eino-Ville Talvala [Wed, 29 Oct 2014 07:00:07 +0000 (07:00 +0000)]
am cc889095: am d77b234a: Camera: Reduce maximum required ISO sensitivity to 800

* commit 'cc8890959a2d5f15aeef79bee4d6ca1587c645c8':

9 years agoam 349e6a11: am a5bcb401: camera2: Docs update for available AF modes.
Ruben Brunk [Wed, 29 Oct 2014 07:00:01 +0000 (07:00 +0000)]
am 349e6a11: am a5bcb401: camera2: Docs update for available AF modes.

* commit '349e6a11d0d366209a3dd606f99f30f6fc1cd9f8':

9 years agoam 567167ac: CameraMetadata: Docs cleanup, especially units and range
Eino-Ville Talvala [Thu, 9 Oct 2014 22:24:32 +0000 (22:24 +0000)]
am 567167ac: CameraMetadata: Docs cleanup, especially units and range

* commit '567167ac6be36e732e98089d6e5d7d4f041f3323':
  CameraMetadata: Docs cleanup, especially units and range

9 years agoam ca25627f: camera: Add a hwlevel attribute, annotate each metadata\'s hardware...
Igor Murashkin [Thu, 9 Oct 2014 22:24:31 +0000 (22:24 +0000)]
am ca25627f: camera: Add a hwlevel attribute, annotate each metadata\'s hardware level

* commit 'ca25627fc63255d147286ef9a9624059825eb548':
  camera: Add a hwlevel attribute, annotate each metadata's hardware level

9 years agoam 567167ac: CameraMetadata: Docs cleanup, especially units and range
Eino-Ville Talvala [Wed, 8 Oct 2014 22:49:07 +0000 (22:49 +0000)]
am 567167ac: CameraMetadata: Docs cleanup, especially units and range

* commit '567167ac6be36e732e98089d6e5d7d4f041f3323':
  CameraMetadata: Docs cleanup, especially units and range

9 years agoam ca25627f: camera: Add a hwlevel attribute, annotate each metadata\'s hardware...
Igor Murashkin [Wed, 8 Oct 2014 22:49:06 +0000 (22:49 +0000)]
am ca25627f: camera: Add a hwlevel attribute, annotate each metadata\'s hardware level

* commit 'ca25627fc63255d147286ef9a9624059825eb548':
  camera: Add a hwlevel attribute, annotate each metadata's hardware level

9 years agoCameraMetadata: Docs cleanup, especially units and range
Eino-Ville Talvala [Fri, 3 Oct 2014 01:27:34 +0000 (18:27 -0700)]
CameraMetadata: Docs cleanup, especially units and range

- Add entries for units and range into javadoc
- Fix up existing units entries and add new ones
- Fix up range entries to be consistent for enums
- Add range entries where it makes sense
- Minor fix to javadoc gen to allow for code indentation
- Lots of edits for consistency, especially to
  available* entries.

Bug: 16525650
Change-Id: I654d86c66e796e87d2cf3b47ffcc72cd26977e43

9 years agocamera: Add a hwlevel attribute, annotate each metadata's hardware level
Igor Murashkin [Thu, 2 Oct 2014 22:27:09 +0000 (15:27 -0700)]
camera: Add a hwlevel attribute, annotate each metadata's hardware level

* Set each metadata key to one of full,legacy,limited.
* All keys present on the lower level must also be present on higher
  levels (i.e. all legacy keys present on limited/full devices, all limited
  keys present on full devices.)
* If a key is not annotated, it is assumed to be optional even on full.
  This is usually the case only for future, deprecated, or system keys.

Bug: 17788234
Change-Id: Ie88f3750cc06d889c6750f2099598d53ccb601b7

9 years agoam d77b234a: Camera: Reduce maximum required ISO sensitivity to 800
Eino-Ville Talvala [Fri, 26 Sep 2014 00:23:18 +0000 (00:23 +0000)]
am d77b234a: Camera: Reduce maximum required ISO sensitivity to 800

* commit 'd77b234a57985f421c32749f821c035f1a2af004':
  Camera: Reduce maximum required ISO sensitivity to 800

9 years agoam d77b234a: Camera: Reduce maximum required ISO sensitivity to 800
Eino-Ville Talvala [Thu, 25 Sep 2014 17:47:21 +0000 (17:47 +0000)]
am d77b234a: Camera: Reduce maximum required ISO sensitivity to 800

* commit 'd77b234a57985f421c32749f821c035f1a2af004':
  Camera: Reduce maximum required ISO sensitivity to 800

9 years agoCamera: Reduce maximum required ISO sensitivity to 800
Eino-Ville Talvala [Thu, 25 Sep 2014 17:27:48 +0000 (10:27 -0700)]
Camera: Reduce maximum required ISO sensitivity to 800

Too many ISPs can't produce 1600 gain.

Bug: 17489253
Change-Id: Id99cb73dc935c145b12129029615ab1159eb4dae

9 years agoam a5bcb401: camera2: Docs update for available AF modes.
Ruben Brunk [Tue, 23 Sep 2014 15:50:50 +0000 (15:50 +0000)]
am a5bcb401: camera2: Docs update for available AF modes.

* commit 'a5bcb401f154ddf05017ee13d6ae7e4774fd3107':
  camera2: Docs update for available AF modes.

9 years agoam a5bcb401: camera2: Docs update for available AF modes.
Ruben Brunk [Tue, 23 Sep 2014 02:53:15 +0000 (02:53 +0000)]
am a5bcb401: camera2: Docs update for available AF modes.

* commit 'a5bcb401f154ddf05017ee13d6ae7e4774fd3107':
  camera2: Docs update for available AF modes.

9 years agocamera2: Docs update for available AF modes.
Ruben Brunk [Mon, 22 Sep 2014 23:11:06 +0000 (16:11 -0700)]
camera2: Docs update for available AF modes.

Bug: 17588783
Change-Id: If4010517e79b3a51bd6231424a10be672ff5a252

9 years agoam 425bf818: Merge "Special-case handling of MONO to/from Multichannel conversions...
Paul McLean [Fri, 12 Sep 2014 20:34:28 +0000 (20:34 +0000)]
am 425bf818: Merge "Special-case handling of MONO to/from Multichannel conversions." into lmp-dev

* commit '425bf818f27d2ee92b73c8f0d7d375d88d28dd68':
  Special-case handling of MONO to/from Multichannel conversions.

9 years agoam 89a2450a: Merge "Remove makefile cruft."
Dan Albert [Fri, 12 Sep 2014 20:08:40 +0000 (20:08 +0000)]
am 89a2450a: Merge "Remove makefile cruft."

* commit '89a2450a407ef237e5e35fb21a682758cc6b5f5a':
  Remove makefile cruft.

9 years agoMerge "Special-case handling of MONO to/from Multichannel conversions." into lmp-dev
Paul McLean [Fri, 12 Sep 2014 20:01:19 +0000 (20:01 +0000)]
Merge "Special-case handling of MONO to/from Multichannel conversions." into lmp-dev

9 years agoMerge "Remove makefile cruft."
Dan Albert [Fri, 12 Sep 2014 18:07:38 +0000 (18:07 +0000)]
Merge "Remove makefile cruft."

9 years agoRemove makefile cruft.
Dan Albert [Fri, 12 Sep 2014 17:46:51 +0000 (10:46 -0700)]
Remove makefile cruft.

Don't manually include stlport, and don't use private bionic headers.

Change-Id: Ib1b2ee08cdea9ea52aaabbc95aecddb6b1a2c3a5

9 years agoSpecial-case handling of MONO to/from Multichannel conversions.
Paul McLean [Tue, 9 Sep 2014 16:09:16 +0000 (09:09 -0700)]
Special-case handling of MONO to/from Multichannel conversions.

Bug 17435345

Change-Id: Ib4bb2474c8f024c5fec3e17a3dfac178f2096134

9 years agocamera2: make 3A regions null when not available
Yin-Chia Yeh [Thu, 4 Sep 2014 16:33:34 +0000 (09:33 -0700)]
camera2: make 3A regions null when not available

Bug: 17346456
Change-Id: If8e1611614622e7eef6f77e03ef55375650f1c51

9 years agoMerge "camera2: Add back HDR scenemode." into lmp-dev
Ruben Brunk [Sat, 30 Aug 2014 00:28:09 +0000 (00:28 +0000)]
Merge "camera2: Add back HDR scenemode." into lmp-dev

9 years agocamera2: Add back HDR scenemode.
Ruben Brunk [Fri, 29 Aug 2014 00:16:38 +0000 (17:16 -0700)]
camera2: Add back HDR scenemode.

Bug: 17072609

Change-Id: Iebb97d12fc62986ad389460c253cfc504a68ad7f

9 years agocamera: Remove obsolete CameraCharacteristicsTest
Igor Murashkin [Thu, 28 Aug 2014 20:47:56 +0000 (13:47 -0700)]
camera: Remove obsolete CameraCharacteristicsTest

This test has now been fully superceded by
ExtendedCameraCharacteristicsTest

Bug: 17282060
Change-Id: Ic421d0712c78129f0c72251119654856db86a7cf

9 years agoMerge "camera_metadata: Update the aberration correction related tag names" into...
Zhijun He [Thu, 21 Aug 2014 16:17:48 +0000 (16:17 +0000)]
Merge "camera_metadata: Update the aberration correction related tag names" into lmp-dev

9 years agoCamera2: update focusDistanceCalibration doc
Yin-Chia Yeh [Mon, 18 Aug 2014 17:44:21 +0000 (10:44 -0700)]
Camera2: update focusDistanceCalibration doc

Require infinity focus to work for devices advertise
APPROXIMATE or higher quality.

bug 13933979

Change-Id: I4b3e13be657f1643c398930860f0a174a4497a97

9 years agocamera_metadata: Update the aberration correction related tag names
Zhijun He [Mon, 18 Aug 2014 17:55:33 +0000 (10:55 -0700)]
camera_metadata: Update the aberration correction related tag names

Bug: 17008587
Change-Id: I9e635198f150de1f079c17b27c83c7e9c85f018f

9 years ago[audio][spdif] Add spdif AC3 make to audio_utils make
Phil Burk [Mon, 11 Aug 2014 18:46:45 +0000 (11:46 -0700)]
[audio][spdif] Add spdif AC3 make to audio_utils make

Recursively build libraries under audio_utils to resolve
dependencies properly for HAL.

This is part of support for AC3 passthrough over HDMI.

Bug: 9428304
Change-Id: I2e3067dbe9b28dc5ea9eb0e9faebe31f8d9e4135
Signed-off-by: Phil Burk <philburk@google.com>
9 years ago[audio][spdif] Move AC3/SPDIF wrapper from Molly HAL
Phil Burk [Tue, 5 Aug 2014 22:15:29 +0000 (15:15 -0700)]
[audio][spdif] Move AC3/SPDIF wrapper from Molly HAL

Wrap encoded AC3 data in a PCM data burst according
to the IEC61937 spec.

Change-Id: I59b81cafffb36cc430ee2d0776b511576643069f
Signed-off-by: Phil Burk <philburk@google.com>
9 years agoCamera: Rename timestampCalibration -> timestampSource
Eino-Ville Talvala [Mon, 28 Jul 2014 19:49:25 +0000 (12:49 -0700)]
Camera: Rename timestampCalibration -> timestampSource

Improves clarity.

Bug: 16402755
Change-Id: I181186427ce3eb5e2b4a609fbbc0643fca3acce8

9 years agoMerge "camera2: @hide android.request.frameCount" into lmp-dev
Igor Murashkin [Tue, 29 Jul 2014 22:03:29 +0000 (22:03 +0000)]
Merge "camera2: @hide android.request.frameCount" into lmp-dev

9 years agoMerge "Update channel conversion to handle 1 and 3 byte samples" into lmp-dev
Andy Hung [Tue, 29 Jul 2014 14:05:50 +0000 (14:05 +0000)]
Merge "Update channel conversion to handle 1 and 3 byte samples" into lmp-dev

9 years agoUpdate channel conversion to handle 1 and 3 byte samples
Andy Hung [Mon, 28 Jul 2014 03:11:31 +0000 (20:11 -0700)]
Update channel conversion to handle 1 and 3 byte samples

Change-Id: I274def198e0d4d307dd3cffb1fd8c7662d0bb15b

9 years agoDO NOT MERGE: camera2: Move noise model to dynamic metadata.
Ruben Brunk [Wed, 23 Jul 2014 22:13:16 +0000 (15:13 -0700)]
DO NOT MERGE: camera2: Move noise model to dynamic metadata.

Bug: 16369384

Change-Id: I7a540705176c7be68431a977e2b7218ffa1bddd0
(cherry picked from commit 2569725e938810d592a57160770a310f176adb81)

9 years agocamera2: @hide android.request.frameCount
Igor Murashkin [Fri, 25 Jul 2014 23:55:18 +0000 (16:55 -0700)]
camera2: @hide android.request.frameCount

API users should be using exclusively CaptureResult#getFrameNumber()

HAL3 users should be exclusively using camera3_request_t::frame_count

Change-Id: I164011c97a57fb9fb9c504ae4c5f394dcb36a4bc

9 years agoMerge "camera: Annotate public/synthetic keys in the java code" into lmp-dev
Igor Murashkin [Tue, 22 Jul 2014 20:11:14 +0000 (20:11 +0000)]
Merge "camera: Annotate public/synthetic keys in the java code" into lmp-dev

9 years agoCamera2: replace int[] by HighSpeedVideoConfiguration
Yin-Chia Yeh [Tue, 15 Jul 2014 17:42:05 +0000 (10:42 -0700)]
Camera2: replace int[] by HighSpeedVideoConfiguration

Use the new wrapper class to replace int[] representation.
Also update the metadata description to disallow multiple streams
to use different high speed video configurations.

Change-Id: I192e57f6ab5dfbba6d958571352f067a9eaec7b2

10 years agoMerge "Move channel expansion/contraction functions out of USB audio HAL." into lmp-dev
Paul McLean [Fri, 18 Jul 2014 19:26:52 +0000 (19:26 +0000)]
Merge "Move channel expansion/contraction functions out of USB audio HAL." into lmp-dev

10 years agoMove channel expansion/contraction functions out of USB audio HAL.
Paul McLean [Wed, 16 Jul 2014 20:35:52 +0000 (13:35 -0700)]
Move channel expansion/contraction functions out of USB audio HAL.

Change-Id: I551bdf90315488791a7c05ebc70039ccebee209f

10 years agocamera_metadata: partialResultCount should be optional
Zhijun He [Fri, 18 Jul 2014 00:42:56 +0000 (17:42 -0700)]
camera_metadata: partialResultCount should be optional

Change-Id: Iacd2b5e8f388c18cbff0f1cefdb5c10812ae751e

10 years agocamera_metadata: Rename DNG capability to RAW.
Eino-Ville Talvala [Tue, 15 Jul 2014 17:43:01 +0000 (10:43 -0700)]
camera_metadata: Rename DNG capability to RAW.

While this capability allows for saving DNG files, it's
really about the camera device producing usable RAW data, either
for application processing or saving as a DNG.

Leave in the DNG name as an alias to ease transition; it
will be removed when the next metadata update is made.

Bug: 15415688
Change-Id: I1ea9f65b03c4fa06a5004f9d1d485935742001c8

10 years agocamera: Annotate public/synthetic keys in the java code
Igor Murashkin [Wed, 16 Jul 2014 23:54:57 +0000 (16:54 -0700)]
camera: Annotate public/synthetic keys in the java code

Change-Id: Ifc89153136a9be502b7b88addbd16a5de68a7bfc

10 years agoMerge "DO NOT MERGE Virtualizer effect: add parameter to query virtualization mode...
Jean-Michel Trivi [Tue, 15 Jul 2014 15:52:48 +0000 (15:52 +0000)]
Merge "DO NOT MERGE Virtualizer effect: add parameter to query virtualization mode" into lmp-dev

10 years agoDO NOT MERGE Virtualizer effect: add parameter to query virtualization mode
Jean-Michel Trivi [Tue, 15 Jul 2014 00:19:22 +0000 (17:19 -0700)]
DO NOT MERGE Virtualizer effect: add parameter to query virtualization mode

Change-Id: Ie3be4b20e9c7f1a1427b5ae21e6f6ea07c8e2886
(cherry picked from commit 2044f5c00fe126e9faaf03790478944222a353d6)

10 years agoDO NOT MERGE Update virtualizer effect interface for elevation angle
Jean-Michel Trivi [Mon, 14 Jul 2014 22:55:50 +0000 (15:55 -0700)]
DO NOT MERGE Update virtualizer effect interface for elevation angle

Update the comments in the virtualization effect parameters to
  reflect how elevation angles are part of the virtual speaker
  angle query.

Change-Id: Ic942cac40eea954a4f123729b92143a54518453c
(cherry picked from commit 046dddfb4fbdbd8eda6f4f8ad0218cfde2b9a09e)

10 years agoDO NOT MERGE Audio virtualizer effect: define new parameters for capability query
Jean-Michel Trivi [Wed, 9 Jul 2014 16:14:46 +0000 (09:14 -0700)]
DO NOT MERGE Audio virtualizer effect: define new parameters for capability query

Change-Id: I8882e528047a74b425cfa10a1b10c4fef0286bc0
(cherry picked from commit 4f57d02bf3de631f88de1318f0e7e5258c50e0e2)

10 years agoMerge "Fix const in memcpy_by_audio_format parameter"
Andy Hung [Fri, 11 Jul 2014 22:32:56 +0000 (22:32 +0000)]
Merge "Fix const in memcpy_by_audio_format parameter"

10 years agoFix const in memcpy_by_audio_format parameter
Andy Hung [Thu, 10 Jul 2014 21:21:42 +0000 (14:21 -0700)]
Fix const in memcpy_by_audio_format parameter

Change-Id: I7bdeb587e45695e6a914918ba75f102048b2e0eb

10 years agocamera2: Update medadata for BlackLevelPattern.
Ruben Brunk [Thu, 5 Jun 2014 20:20:47 +0000 (13:20 -0700)]
camera2: Update medadata for BlackLevelPattern.

Bug: 15448889

Change-Id: I5d3393f4a1695664bc5315eb592fb0a4e154d22e