OSDN Git Service

android-x86/system-media.git
9 years agoMerge "radio metadata definitions"
Eric Laurent [Mon, 16 Mar 2015 18:16:11 +0000 (18:16 +0000)]
Merge "radio metadata definitions"

9 years agoradio metadata definitions
Eric Laurent [Thu, 5 Mar 2015 21:00:24 +0000 (13:00 -0800)]
radio metadata definitions

Added public definitions for radio metadata and
metadata utility library API.

Change-Id: I61ead52d319e36a1e39ad7dd175fb260d3c1b93a

9 years agoCamera2: Add max depth point count and stream configuration tags
Eino-Ville Talvala [Mon, 23 Feb 2015 23:51:58 +0000 (15:51 -0800)]
Camera2: Add max depth point count and stream configuration tags

- Add system-level android.depth.maxDepthSamples to indicate maximum
  size of a point cloud buffer
- Add hidden android.depth.availableDepthStreamConfigurations,
  android.depth.availableDepthMinFrameDurations, and
  android.depth.availableDepthStallDurations
- Add DEPTH tag that covers the above.

Change-Id: I639f9cdfbcfdea871479f3b886db83dd88b8994f

9 years agoAdd channel index mask audio data conversion
Andy Hung [Mon, 2 Feb 2015 23:34:13 +0000 (15:34 -0800)]
Add channel index mask audio data conversion

Adds memcpy_by_index_array_initialization_src_index which fills an
index array used by memcpy_by_index_array.

Change-Id: Id8823a11cad642688ecbc16d9f2d894845d6e9c0

9 years agoCamera2: fix enum ordering
Yin-Chia Yeh [Fri, 20 Feb 2015 23:34:14 +0000 (15:34 -0800)]
Camera2: fix enum ordering

Make sure new keys are appended at end of tag section to maintain
binary compatibility.

Bug: 19443488
Change-Id: I333b741b2021d364a1923bfea3a763db7ba0854d

9 years agoMerge "Camera2: lens shading related update for HAL3.3"
Yin-Chia Yeh [Tue, 10 Feb 2015 01:15:44 +0000 (01:15 +0000)]
Merge "Camera2: lens shading related update for HAL3.3"

9 years agoCamera2: lens shading related update for HAL3.3
Yin-Chia Yeh [Wed, 4 Feb 2015 18:04:37 +0000 (10:04 -0800)]
Camera2: lens shading related update for HAL3.3

1. Define android.shading.availableMode and
   android.statistics.info.availableLensShadingMapModes for
   checking availablity of corresponding controls.
2. Define android.sensor.info.lensShadingApplied to allow for
   lens shading correction baked in the RAW image data.

Change-Id: I57bc94cec351388337c8f7532c357ea9b70395af

9 years agoMerge "Camera2: tonemapping related HAL3.3 update"
Yin-Chia Yeh [Mon, 9 Feb 2015 19:11:28 +0000 (19:11 +0000)]
Merge "Camera2: tonemapping related HAL3.3 update"

9 years agocamera_metadata: add precapture trigger CANCEL
Zhijun He [Thu, 5 Feb 2015 22:32:57 +0000 (14:32 -0800)]
camera_metadata: add precapture trigger CANCEL

Bug: 19265647
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b

9 years agoam dfd2e7a6: am cad66197: camera-metadata: clarify the AE precapture trigger API...
Zhijun He [Mon, 9 Feb 2015 04:15:30 +0000 (04:15 +0000)]
am dfd2e7a6: am cad66197: camera-metadata: clarify the AE precapture trigger API spec

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

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 agoCamera2: tonemapping related HAL3.3 update
Yin-Chia Yeh [Thu, 5 Feb 2015 21:19:21 +0000 (13:19 -0800)]
Camera2: tonemapping related HAL3.3 update

1. Add two new tonemapping modes: GAMMA_VALUE and PRESET_CURVE
2. Change MANUAL_POSTPROC capability to support either:
     - FAST and CONTRAST_CURVE, or
     - FAST, GAMMA_VALUE, and PRESET_CURVE

Change-Id: I7aa1f9d1cd75be053def2ceb0c84dd28acd476d4

9 years agoam 370fbd58: am fa73c084: camera_metadata: relax the EV compensation requirements
Zhijun He [Fri, 6 Feb 2015 16:48:03 +0000 (16:48 +0000)]
am 370fbd58: am fa73c084: camera_metadata: relax the EV compensation requirements

* commit '370fbd58a2e5ba3c7b54ba0e550ef4ce493582bc':
  camera_metadata: relax the EV compensation requirements

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 agoMerge "Camera2: several metadata update for HAL3.3"
Yin-Chia Yeh [Tue, 3 Feb 2015 00:40:40 +0000 (00:40 +0000)]
Merge "Camera2: several metadata update for HAL3.3"

9 years agoCamera2: several metadata update for HAL3.3
Yin-Chia Yeh [Wed, 28 Jan 2015 21:18:31 +0000 (13:18 -0800)]
Camera2: several metadata update for HAL3.3

1. Add android.control.availableModes for querying available
   android.control.mode
2. Add android.control.aeLockAvailable and
   android.control.awbLockAvailable for querying AE/AWB lock,
   though only LEGACY mode are allowed to report FALSE
3. Update color correction transform and gain spec to list the
   guaranteed working range of gain and matrix coefficients.

Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6

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

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

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 agocamera_metadata: reprocessing spec update
Zhijun He [Fri, 16 Jan 2015 02:17:24 +0000 (18:17 -0800)]
camera_metadata: reprocessing spec update

* Clarify reprocessing capabilities and reprocessing controls
* Update noise reduction and edge sharpening controls for
finer granularity controls.

Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4

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

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

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 agoMerge "camera_metadata: add lens facing EXTERNAL enum"
Zhijun He [Fri, 23 Jan 2015 23:58:32 +0000 (23:58 +0000)]
Merge "camera_metadata: add lens facing EXTERNAL enum"

9 years agoMerge "Add primitives test for unsigned 8 bit sample conversion"
Andy Hung [Thu, 15 Jan 2015 20:03:43 +0000 (20:03 +0000)]
Merge "Add primitives test for unsigned 8 bit sample conversion"

9 years agoMerge "Add floating point to unsigned 8 bit conversion"
Andy Hung [Thu, 15 Jan 2015 18:33:32 +0000 (18:33 +0000)]
Merge "Add floating point to unsigned 8 bit conversion"

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

* commit 'a4eec839d04106ce95cce2f22af74621bb98501d':
  Add audio_utils FIFO library

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

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

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 agoMerge "Update libaudioutils for host"
Glenn Kasten [Thu, 15 Jan 2015 01:26:18 +0000 (01:26 +0000)]
Merge "Update libaudioutils for host"

9 years agoMerge "Add fifo_tests"
Glenn Kasten [Thu, 15 Jan 2015 01:26:02 +0000 (01:26 +0000)]
Merge "Add fifo_tests"

9 years agoMerge "Add audio_utils FIFO library"
Glenn Kasten [Thu, 15 Jan 2015 01:25:21 +0000 (01:25 +0000)]
Merge "Add audio_utils FIFO library"

9 years agoUpdate libaudioutils for host
Glenn Kasten [Wed, 14 Jan 2015 01:04:09 +0000 (17:04 -0800)]
Update libaudioutils for host

Change-Id: Ic10f786952dffc29e3ce0399cb72ce1cec4055e2

9 years agoAdd fifo_tests
Glenn Kasten [Wed, 14 Jan 2015 00:25:39 +0000 (16:25 -0800)]
Add fifo_tests

Change-Id: I62a783bf551fd6c6c9e734b550f8bcc4e2a32df3

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 agoAdd primitives test for unsigned 8 bit sample conversion
Andy Hung [Tue, 13 Jan 2015 22:39:39 +0000 (14:39 -0800)]
Add primitives test for unsigned 8 bit sample conversion

Change-Id: I2ecfe3531062ea4796b113fac324d75851d5116b

9 years agoAdd floating point to unsigned 8 bit conversion
Andy Hung [Tue, 13 Jan 2015 21:56:37 +0000 (13:56 -0800)]
Add floating point to unsigned 8 bit conversion

Change-Id: Icc4591ab8f594f9c203644812208b227442d1f05

9 years agoMerge "Fix 64 bit compiler warnings"
Andy Hung [Tue, 13 Jan 2015 23:51:33 +0000 (23:51 +0000)]
Merge "Fix 64 bit compiler warnings"

9 years agoFix 64 bit compiler warnings
Andy Hung [Tue, 13 Jan 2015 22:30:23 +0000 (14:30 -0800)]
Fix 64 bit compiler warnings

And reorder EXPECT_EQ to have expected as the first argument

Change-Id: I1250d3fb73c70468f3ee1184d944b73ab4327f52

9 years agoTech Debt Paydown - Moved audio utils from USB HAL to system/media_alsautils.
Paul McLean [Tue, 13 Jan 2015 17:41:36 +0000 (09:41 -0800)]
Tech Debt Paydown - Moved audio utils from USB HAL to system/media_alsautils.

Rename "audio" utils to "alsa" utils to better reflect their purpose.

Change-Id: I60d3b7e11e7e38039a59d3e0748b8128a75f4cd5

9 years agocamera_metadata: add lens facing EXTERNAL enum
Zhijun He [Mon, 12 Jan 2015 23:06:16 +0000 (15:06 -0800)]
camera_metadata: add lens facing EXTERNAL enum

This is for usb camera support

Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b

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 2930d576: am aed8ceae: Camera2: update color aberration spec
Yin-Chia Yeh [Wed, 7 Jan 2015 00:57:54 +0000 (00:57 +0000)]
am 2930d576: am aed8ceae: Camera2: update color aberration spec

* commit '2930d576db05b51afb9349380839f13044e028a2':
  Camera2: update color aberration spec

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 agoLine length 100
Glenn Kasten [Tue, 30 Dec 2014 16:26:25 +0000 (08:26 -0800)]
Line length 100

Change-Id: I2f0a0b8cba1c976dc31ad7e074b0a447ed61468f

9 years agoam b8e19cb1: am c89548e3: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
Ying Wang [Tue, 16 Dec 2014 21:49:40 +0000 (21:49 +0000)]
am b8e19cb1: am c89548e3: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."

* commit 'b8e19cb15cfc5e2d3cbf17c34bb4cd44e7f8ccb1':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.

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 415c4583: am 14cd0984: Camera: Make HDR scene mode public.
Eino-Ville Talvala [Tue, 9 Dec 2014 00:56:50 +0000 (00:56 +0000)]
am 415c4583: am 14cd0984: Camera: Make HDR scene mode public.

* commit '415c45831a01866f59f65e3cb5ccfcc776f1f0e0':
  Camera: Make HDR scene mode public.

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 dede7aaf: am 9d1b4524: Camera2: update antibanding spec
Yin-Chia Yeh [Thu, 4 Dec 2014 20:44:30 +0000 (20:44 +0000)]
am dede7aaf: am 9d1b4524: Camera2: update antibanding spec

* commit 'dede7aaf8c3e29b29094a2fcd9979db60739ef49':
  Camera2: update antibanding spec

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 153de437: am 29a4e283: Merge "We HAVE_LITTLE_ENDIAN."
Elliott Hughes [Sat, 22 Nov 2014 08:04:40 +0000 (08:04 +0000)]
am 153de437: am 29a4e283: Merge "We HAVE_LITTLE_ENDIAN."

* commit '153de437c04acc6c4ccb97cf209b12df41191580':
  We HAVE_LITTLE_ENDIAN.

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 18:23:16 +0000 (18:23 +0000)]
am c60634d8: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev
automerge: 658a2e6

* commit '658a2e66bec074768687a968f2929ee00de24710':
  Camera2: Doc updates for aeExposureCompensation.

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 agoam dbdc93b1: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android...
Chong Zhang [Fri, 21 Nov 2014 12:17:42 +0000 (12:17 +0000)]
am dbdc93b1: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/system/media into lmp-mr1-dev-plus-aosp

* commit 'dbdc93b10a14bd519ceeac2003091aa869c3d572':

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

* commit 'b9bf26817150fef892fca2eff2ea9b3f73bd1844':

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 agoam b857704e: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1...
Eino-Ville Talvala [Fri, 21 Nov 2014 02:58:14 +0000 (02:58 +0000)]
am b857704e: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev automerge: bc0f14b

* commit 'b857704e32f2b51989e7f0b0122b4281fdd2d16c':
  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 [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 232ac007: am b7592db1: Merge "[audio][eac3] Support EAC3 with small frames" into...
Phil Burk [Tue, 18 Nov 2014 02:32:02 +0000 (02:32 +0000)]
am 232ac007: am b7592db1: Merge "[audio][eac3] Support EAC3 with small frames" into lmp-mr1-dev

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

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 25adeec4: am 0f0d7955: Camera: Add BURST_CAPTURE capability flag
Eino-Ville Talvala [Mon, 17 Nov 2014 20:25:53 +0000 (20:25 +0000)]
am 25adeec4: am 0f0d7955: Camera: Add BURST_CAPTURE capability flag

* commit '25adeec4b415e2deba996d6e6ce240eba5aba41d':
  Camera: Add BURST_CAPTURE capability flag

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 agoam 1c362994: Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev automerg...
Ruben Brunk [Sat, 15 Nov 2014 03:09:26 +0000 (03:09 +0000)]
am 1c362994: Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev automerge: 96ce0ae

* commit '1c362994810ef595fa0255e3812fe5eb7684c10c':
  camera2: Add READ_SETTINGS capability.

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 agoam 9345ff94: Camera: doc update for independent 3A automerge: 668e43c
Yin-Chia Yeh [Fri, 14 Nov 2014 20:45:39 +0000 (20:45 +0000)]
am 9345ff94: Camera: doc update for independent 3A automerge: 668e43c

* commit '9345ff94afa43f27e52405479b5fbaf265506e29':
  Camera: doc update for independent 3A

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 095c4d20: am 7d62fa85: Merge "Move to libc++."
Dan Albert [Wed, 12 Nov 2014 03:43:51 +0000 (03:43 +0000)]
am 095c4d20: am 7d62fa85: Merge "Move to libc++."

* commit '095c4d20d612f5d3f290ddc56906cad2f2a37c45':
  Move to libc++.

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 568ef408: am 7d99fccf: am 567167ac: CameraMetadata: Docs cleanup, especially units...
Eino-Ville Talvala [Wed, 29 Oct 2014 07:12:52 +0000 (07:12 +0000)]
am 568ef408: am 7d99fccf: am 567167ac: CameraMetadata: Docs cleanup, especially units and range

* commit '568ef4080d8dd81b2481735b68e3d5b88d392855':