OSDN Git Service
Zhijun He [Fri, 13 Jun 2014 21:40:52 +0000 (21:40 +0000)]
Merge "camera_metadata: Add rollingShutterSkew tag"
Zhijun He [Wed, 11 Jun 2014 17:44:53 +0000 (10:44 -0700)]
camera_metadata: Add rollingShutterSkew tag
Change-Id: Icbedaeda9fc64a9dda509493ad9d14569c56cd18
Eino-Ville Talvala [Thu, 12 Jun 2014 16:53:54 +0000 (16:53 +0000)]
am
b4329160: camera_metadata: Update docs for enum value definitions
* commit '
b432916043290beb246054a77f8978b3136f4315':
camera_metadata: Update docs for enum value definitions
Eino-Ville Talvala [Wed, 11 Jun 2014 17:03:12 +0000 (17:03 +0000)]
am
68dbc6f7: camera_metadata: Update docs for acronym usage, other fixes
* commit '
68dbc6f7051b626f6b8f5127393f4cbed8d8500f':
camera_metadata: Update docs for acronym usage, other fixes
Eino-Ville Talvala [Mon, 9 Jun 2014 21:23:02 +0000 (14:23 -0700)]
camera_metadata: Update docs for enum value definitions
- Add proper @hide support for enum values
(previous hack produced bad @see lines)
- Format many enum values properly for javadoc
- Additional updates to various entries
Bug:
15475465
Change-Id: I2b03cac8d478e945c7d93717845a9ae44b97639b
Eino-Ville Talvala [Fri, 6 Jun 2014 21:35:41 +0000 (14:35 -0700)]
camera_metadata: Update docs for acronym usage, other fixes
- Expand acronyms, improve docs for aeExposureCompensation
- Fix minor formatting issues such as missing periods.
- Rewrite cropRegion, sensitivity docs
- Minor fixes to a few enum value docs, still more to do.
Bug:
15394242
Change-Id: I48de626a33ef9b834578f7bb890de9b98d3122d2
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.
(cherry-picked from commit commit
550458b2e2ba280030d1774395f3062a3d9af01)
Change-Id: If653fae98870b77841ec11e26fbcc64656202e18
Narayan Kamath [Fri, 6 Jun 2014 10:25:21 +0000 (10:25 +0000)]
am
4efffd39: (-s ours) am
a34e4dfd: Merge "Build camera tests as both 32 and 64 bit binaries."
* commit '
4efffd39dc446a91a78ee019f6310e6b7791277e':
Build camera tests as both 32 and 64 bit binaries.
Narayan Kamath [Fri, 6 Jun 2014 10:21:09 +0000 (10:21 +0000)]
am
a34e4dfd: Merge "Build camera tests as both 32 and 64 bit binaries."
* commit '
a34e4dfd8657b1310f9f7f2e6f3fd71ae6f2214e':
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."
Zhijun He [Thu, 5 Jun 2014 23:21:04 +0000 (23:21 +0000)]
am
59793d75: camera_metadata: Hide input stream related key and enum
* commit '
59793d75a462bb7a4ac2a7b94da284e3e8516a88':
camera_metadata: Hide input stream related key and enum
Glenn Kasten [Thu, 5 Jun 2014 23:21:04 +0000 (23:21 +0000)]
am
f64074e0: Squashed commit of the following:
* commit '
f64074e0dcf0e6bbafea3e2cb0037e0d88aeb0c1':
Squashed commit of the following:
Zhijun He [Thu, 5 Jun 2014 18:24:52 +0000 (11:24 -0700)]
camera_metadata: Hide input stream related key and enum
Bug:
14622091
Change-Id: Id8fc20b752da876f00a94d0262cd9468951bb36d
Zhijun He [Thu, 5 Jun 2014 14:43:46 +0000 (14:43 +0000)]
am
5a1276a6: camera_metadata: Update availableStreamConfigurations for JPEG sizes
* commit '
5a1276a68269b5f2959d406d2d7497bd7e8ab591':
camera_metadata: Update availableStreamConfigurations for JPEG sizes
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
Glenn Kasten [Thu, 5 Jun 2014 03:30:23 +0000 (20:30 -0700)]
Squashed commit of the following:
commit
b80e690164b152a2fc8ae55c549cf6082c29719a
Author: Andy Hung <hunga@google.com>
Date: Thu May 22 18:26:07 2014 -0700
Add sf_readf_int to read files as 32 bit PCM int
Change-Id: Ic98cca69926309b1a8f77cc702bc54aba20e3996
commit
a0d0fb2d89f5b22cf82dc5a4da52e4bbc3aaffb6
Author: Andy Hung <hunga@google.com>
Date: Thu May 22 18:17:53 2014 -0700
Update sf_readf_float to handle 16 and 32 bit PCM
Change-Id: I0f74ca686f1a86e724057bc483924cea13577ef0
Change-Id: Ie18b611b3025e9b0c566c024b774f2cb2c49ceda
Zhijun He [Mon, 2 Jun 2014 23:46:03 +0000 (16:46 -0700)]
camera_metadata: Update availableStreamConfigurations for JPEG sizes
Also Fix some doc issue in availableCapabilities
Bug:
12035686
Change-Id: Ie517a587f4a9e6cd9731fcca042e24adf832d9e3
Andy Hung [Wed, 4 Jun 2014 02:22:26 +0000 (19:22 -0700)]
Add float to pcm16 writing capability to tinysndfile
Also added pcm16 to float writing capability.
Change-Id: Ic9aef8a3f699ec06d175f0040ee2e5096330a429
Andy Hung [Wed, 4 Jun 2014 02:15:18 +0000 (19:15 -0700)]
Fix tinysndfile write
Wav header incorrectly written in some cases,
resulting in partial data loss and misalignment.
Change-Id: I33d8cd2242e0fc1c6e7b3b36718c4eebb3114ab4
Yin-Chia Yeh [Fri, 30 May 2014 21:43:45 +0000 (21:43 +0000)]
am
ffa121ca: Merge "Camera2: update the spec for 3A region weight" into lmp-preview-dev
* commit '
ffa121ca2e61b40edf56834211f332f4a2cf3055':
Camera2: update the spec for 3A region weight
Yin-Chia Yeh [Fri, 30 May 2014 21:41:22 +0000 (21:41 +0000)]
Merge "Camera2: update the spec for 3A region weight" into lmp-preview-dev
Igor Murashkin [Fri, 30 May 2014 21:33:22 +0000 (21:33 +0000)]
am
b0f18b44: camera_metadata: Change android.lens.focusRange typedef to a float pair
* commit '
b0f18b445eba22a036795fe75c95dd30726c90b6':
camera_metadata: Change android.lens.focusRange typedef to a float pair
Igor Murashkin [Fri, 30 May 2014 17:51:40 +0000 (10:51 -0700)]
camera_metadata: Change android.lens.focusRange typedef to a float pair
Bug:
15335269
Change-Id: If2f3259aeec072438a1c18c1b9728a4c81e92a40
Zhijun He [Thu, 29 May 2014 23:15:35 +0000 (23:15 +0000)]
am
c593aee3: camera_metadata: Fix availableCapabilities incorrect type
* commit '
c593aee3c1184a4a5641c6bec7d6fc305b50d429':
camera_metadata: Fix availableCapabilities incorrect type
Zhijun He [Thu, 29 May 2014 20:31:49 +0000 (13:31 -0700)]
camera_metadata: Fix availableCapabilities incorrect type
Bug:
15168075
Change-Id: I50553d740101b7db1b7695344bf4cdf9c5cd1cf9
Zhijun He [Thu, 29 May 2014 00:42:35 +0000 (00:42 +0000)]
am
a19ede8f: camera_metadata: Doc update for lens locking behavior
* commit '
a19ede8f836c6a924948382ea0677712511bcabf':
camera_metadata: Doc update for lens locking behavior
Zhijun He [Thu, 29 May 2014 00:42:34 +0000 (00:42 +0000)]
am
5fb671c5: camera_metadata: Update spec for thumbnail cropping behavior
* commit '
5fb671c5e2a253246114fab69c6ded5282ccfd4d':
camera_metadata: Update spec for thumbnail cropping behavior
Yin-Chia Yeh [Wed, 14 May 2014 21:05:20 +0000 (14:05 -0700)]
Camera2: update the spec for 3A region weight
Add some details to the 3A region weight spec.
The spec is the same as API1 except now 0 is a valid
setting.
Bug:
15315352
Change-Id: Iceb13b72508cb3c9f758bdcb1b69b6b11ec5aaf8
Zhijun He [Tue, 27 May 2014 22:06:42 +0000 (15:06 -0700)]
camera_metadata: Doc update for lens locking behavior
Need clarify what the HAL should when focus is locked.
Change-Id: Ia0d58f534210a5f94ae3e3773f9ea88b4c646578
Zhijun He [Thu, 22 May 2014 00:51:05 +0000 (17:51 -0700)]
camera_metadata: Update spec for thumbnail cropping behavior
Also update FULL capability spec (remove ZSL from the requirement list) and
and remove LIMITED tag id.
Bug:
15168075
Change-Id: I864baf35ffab9047b52facb29011682e724bbc9b
Ruben Brunk [Wed, 28 May 2014 20:36:35 +0000 (20:36 +0000)]
am
9c766ad0: camera2: Update native/managed key mappings.
* commit '
9c766ad019249dcd238b33f2cd8865a394e2ab26':
camera2: Update native/managed key mappings.
Yin-Chia Yeh [Wed, 28 May 2014 20:36:34 +0000 (20:36 +0000)]
am
0a5f269f: Camera2: switch API interface to java classes
* commit '
0a5f269f79cc66b9c486137383413d6eb7664ea0':
Camera2: switch API interface to java classes
Eino-Ville Talvala [Wed, 28 May 2014 20:36:34 +0000 (20:36 +0000)]
am
aebc8c29: Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
* commit '
aebc8c299385e8e01138b6670408cae231b1b080':
Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
Igor Murashkin [Wed, 28 May 2014 20:36:33 +0000 (20:36 +0000)]
am
35a108fb: camera_metadata: Add support to generate Keys for generic types
* commit '
35a108fbfe7d174682187fa6a87f0590837924d0':
camera_metadata: Add support to generate Keys for generic types
Yin-Chia Yeh [Wed, 28 May 2014 20:36:33 +0000 (20:36 +0000)]
am
739effc0: Camera2: Replace int[] by MeteringRectangle.
* commit '
739effc073e1b0a0a4e22a5a6c162dc67f170e77':
Camera2: Replace int[] by MeteringRectangle.
Ruben Brunk [Wed, 28 May 2014 01:52:49 +0000 (18:52 -0700)]
camera2: Update native/managed key mappings.
Switches to using managed value classes for the following keys:
- android.sensor.info.sensitivityRange
- android.sensor.info.exposureTimeRange
- android.jpeg.gpsCoordinates
- android.jpeg.gpsTimestamp
- android.jpeg.gpsProcessingMethod
- android.statistics.lensShadingMap
- android.lens.info.shadingMapSize
Bug:
14628001
Change-Id: Ia0f541242f529ab9ba3111db799306b198f2b40b
Yin-Chia Yeh [Tue, 27 May 2014 16:48:07 +0000 (09:48 -0700)]
Camera2: switch API interface to java classes
android.sensor.info.physicalSize: float[] -> SizeF
android.statistics.hotPixelMap: int[] -> Point[]
android.tonemap.curve[Red|Green|Blue]: float[] -> TonemapCurve
Bug:
14628001
Change-Id: I1e085f5e640a059852fcb504b6dd5f884039e653
Eino-Ville Talvala [Tue, 27 May 2014 17:50:30 +0000 (10:50 -0700)]
Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
Affected keys:
android.colorCorrection.transform
android.colorCorrection.gain
android.control.aeAvailableAntibandingModes
android.control.aeAvailableModes
android.control.afAvailableModes
android.control.availableEffects
android.control.availableSceneModes
android.control.availableVideoStabilizationModes
android.control.awbAvailableModes
android.edge.availableEdgeModes
android.hotpixel.availableHotPixelModes
android.lens.info.availableOpticalStabilization
android.noiseReduction.availableNoiseReductionModes
android.sensor.calibrationTransform1
android.sensor.calibrationTransform2
android.sensor.colorTransform1
android.sensor.colorTransform2
android.sensor.forwardTransform1
android.sensor.forwardTransform2
android.statistics.info.availableFaceDetectModes
android.tonemap.availableToneMapModes
Bug:
14628001
Change-Id: Ic0a3ff0aaa6bfe872cf8fb740870618c3eee3008
Igor Murashkin [Tue, 27 May 2014 17:51:25 +0000 (10:51 -0700)]
camera_metadata: Add support to generate Keys for generic types
Also adds the following keys:
* android.control.maxRegionsAe
* android.control.maxRegionsAwb
* android.control.maxRegionsAf
* android.request.maxNumOutputRaw
* android.request.maxNumOutputProc
* android.request.maxNumOutputProcStalling
Changes the following keys' type generations:
* android.control.aeTargetFpsRange (Range<Integer>)
* android.control.aeAvailableTargetFpsRanges (Range<Integer>[])
* android.control.aeCompensationRange (Range<Integer>)
* android.lens.focusRange (Range<Float>)
When trying to generate code for a generic type such as a
"Range<Float>", the generated static key initializers will now use
a TypeReference<T> instead of a T.class.
Non-generic types will proceed to use the older T.class variant.
Bug:
14628001
Change-Id: I141847dffc4b0d89cea37c19a54d6d5faf24a9bb
Yin-Chia Yeh [Fri, 16 May 2014 22:13:13 +0000 (15:13 -0700)]
Camera2: Replace int[] by MeteringRectangle.
Bug:
14628001
Change-Id: I8ae4efa24d41043046a84b04e5209259a8a21063
Zhijun He [Fri, 23 May 2014 22:48:10 +0000 (22:48 +0000)]
am
66e62a49: camera_metadata: Mark the under-specified tags for FUTURE
* commit '
66e62a4952ede1bebd6bcbbdbf214720d61e43fc':
camera_metadata: Mark the under-specified tags for FUTURE
Andy Hung [Fri, 23 May 2014 22:31:52 +0000 (22:31 +0000)]
Merge "Add sf_readf_int to read files as 32 bit PCM int"
Andy Hung [Fri, 23 May 2014 22:10:37 +0000 (22:10 +0000)]
Merge "Update sf_readf_float to handle 16 and 32 bit PCM"
Zhijun He [Fri, 23 May 2014 18:02:34 +0000 (11:02 -0700)]
camera_metadata: Mark the under-specified tags for FUTURE
Also clean up the tag ids.
Bug:
15168075
Change-Id: I57fb6fb37e512c224370c72d806a4b702360f29f
Igor Murashkin [Fri, 23 May 2014 20:13:45 +0000 (20:13 +0000)]
am
21404a0d: camera2: Split CameraMetadata.Key into 3 key classes
* commit '
21404a0dbb5989e28bd32c4854088ec899027356':
camera2: Split CameraMetadata.Key into 3 key classes
Igor Murashkin [Tue, 20 May 2014 00:00:36 +0000 (17:00 -0700)]
camera2: Split CameraMetadata.Key into 3 key classes
- Also removes special-cased Face key generation for CTS
Bug:
15091017
Change-Id: Ic56c54c0d184e209e20de374dc8a6d79527c209f
Zhijun He [Fri, 23 May 2014 10:16:22 +0000 (10:16 +0000)]
am
d0f25ca5: camera_metadata: Add croppingType tag
* commit '
d0f25ca5e95ac23796a1209b82c4cafd91fa3402':
camera_metadata: Add croppingType tag
Zhijun He [Wed, 21 May 2014 22:29:07 +0000 (15:29 -0700)]
camera_metadata: Add croppingType tag
This is to indicate if the camera supports arbitrary cropping.
Bug:
15168075
Change-Id: Ib75f7af629be816229cc686c89980fec101301c0
Zhijun He [Fri, 23 May 2014 03:56:43 +0000 (03:56 +0000)]
am
507458b3: camera_metadata: Raw is not croppable
* commit '
507458b3ba51f573d611a9929d4868fcde560fc7':
camera_metadata: Raw is not croppable
Andy Hung [Fri, 23 May 2014 01:26:07 +0000 (18:26 -0700)]
Add sf_readf_int to read files as 32 bit PCM int
Change-Id: Ic98cca69926309b1a8f77cc702bc54aba20e3996
Andy Hung [Fri, 23 May 2014 01:17:53 +0000 (18:17 -0700)]
Update sf_readf_float to handle 16 and 32 bit PCM
Change-Id: I0f74ca686f1a86e724057bc483924cea13577ef0
Zhijun He [Wed, 21 May 2014 18:11:10 +0000 (11:11 -0700)]
camera_metadata: Raw is not croppable
Update spec doc to clarify that raw stream is not croppable.
Bug:
15168075
Change-Id: I4ffa8e2a06acd17913426ba37744bb9df1bc7330
Zhijun He [Fri, 23 May 2014 00:39:37 +0000 (00:39 +0000)]
am
46f82f0a: camera_metadata: Clarify shading map spec
* commit '
46f82f0adee2ff7d5681a378a5cc6cb3670a028d':
camera_metadata: Clarify shading map spec
Zhijun He [Wed, 21 May 2014 01:22:18 +0000 (18:22 -0700)]
camera_metadata: Clarify shading map spec
The existing spec is unclear about shading map calculation for both application
developer and hal implementers, need more clarification.
Also fix a typo in tonemap.mode.
Bug:
15168075
Change-Id: I7f38ccf6aa6938fdac9f64e95deddc0188025d08
Elliott Hughes [Thu, 22 May 2014 17:53:20 +0000 (10:53 -0700)]
resolved conflicts for merge of
eb5d1723 to master
Change-Id: I4452c3b32dc3144da696e63417cd6e7d69805ffb
Calin Juravle [Thu, 22 May 2014 13:47:48 +0000 (13:47 +0000)]
am
b154eb3e: am
16ef11bf: Merge "Move from fdprintf to POSIX dprintf."
* commit '
b154eb3ecb2e6de88be81692b4addda6d26e9516':
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.
Calin Juravle [Thu, 22 May 2014 13:37:44 +0000 (13:37 +0000)]
Merge "Move 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
Igor Murashkin [Thu, 15 May 2014 00:30:49 +0000 (17:30 -0700)]
camera2: Move parameters around to android.hardware.camera2.params
* Also add the android.statistics.faces synthetic key;
- this removes the hardcoded key from CaptureResult.java
Bug:
14628001
Change-Id: Ie7a82bf9f4a0d8c18e0dc3a1581123c0d95da3f0
Igor Murashkin [Tue, 13 May 2014 21:51:49 +0000 (14:51 -0700)]
camera2: Add synthetic key support; add scaler.streamConfigurationMap
Also @hide/@deprecate keys that are now accessible only via
StreamConfigurationMap.
Bug:
14628001
Change-Id: I2db490a0849680a133a901403477a147b004fb28
Yin-Chia Yeh [Mon, 5 May 2014 21:26:03 +0000 (14:26 -0700)]
Camera2: update exposureCompensation spec
Change-Id: I19f8d1c5e712acecdefec027e7cebe11eed7673d
Zhijun He [Wed, 7 May 2014 21:31:46 +0000 (21:31 +0000)]
Merge "camera_metadata: Change some DNG tag visibility to system"
Glenn Kasten [Wed, 7 May 2014 18:20:55 +0000 (11:20 -0700)]
Add ability to read multi-channel .wav files
For the moment, only allow up to 8 channels, and channel count must
be even. These limits may be expanded later.
Change-Id: If1bb407ed39fbc3332c64a9078d7b58ec7922a8a
Zhijun He [Tue, 6 May 2014 23:18:04 +0000 (16:18 -0700)]
camera_metadata: Change some DNG tag visibility to system
Change-Id: I576084fbf0d8f628cb64518b4514e77cf52fb21c
Zhijun He [Sat, 3 May 2014 00:38:15 +0000 (17:38 -0700)]
camera_metadata: Add missing capture result tags
All capture request tags should be available in capture result.
Bug:
14059883
Change-Id: I0aa8d7341b14fbbd627b17eb316bb016ff1fc316
Zhijun He [Tue, 6 May 2014 00:03:08 +0000 (00:03 +0000)]
Merge "camera_metadata: make videostabilization type consistent"
Andy Hung [Mon, 5 May 2014 23:17:36 +0000 (23:17 +0000)]
Merge "Change Endian compiler warning to error"
Glenn Kasten [Mon, 5 May 2014 20:47:50 +0000 (13:47 -0700)]
Fix comments: 3-byte packed 24 bits are native endian
Change-Id: Ie65d0ee1df64d6d966bc1a6422032c0bfef1d4c8
Glenn Kasten [Fri, 2 May 2014 19:41:04 +0000 (12:41 -0700)]
Add memcpy_to_p24_from_q8_23 and clamp24_from_q8_23
Change-Id: Ibe712c7b1e0fa4efd9a3e8f9dee11080f6c68941
Zhijun He [Wed, 30 Apr 2014 02:23:08 +0000 (19:23 -0700)]
Camera2: update hyperfocalDistance spec
Change-Id: I1b425ab739f10d5e2ba9403baf918f3ee6150d71
Eric Laurent [Fri, 2 May 2014 16:20:08 +0000 (09:20 -0700)]
audio utils: fix resampler bug
input and output frame counts passed to speex resampler
where not initialized by resampler_resample_from_input().
Bug:
14240418.
Change-Id: Ieaaea5986667abd01400775f36d12d09a2670841
Glenn Kasten [Wed, 30 Apr 2014 23:49:34 +0000 (23:49 +0000)]
am
ab03736c: am
db7e74ec: am
e0b59251: Merge "Added parsing of hexadecimal values"
* commit '
ab03736c770d9d363a975cbacbc21f9864d460ee':
Added parsing of hexadecimal values
Glenn Kasten [Wed, 30 Apr 2014 23:47:44 +0000 (23:47 +0000)]
am
db7e74ec: am
e0b59251: Merge "Added parsing of hexadecimal values"
* commit '
db7e74ecf031e3ae070d754ffbcf1c81273f5238':
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
Glenn Kasten [Wed, 30 Apr 2014 23:40:30 +0000 (23:40 +0000)]
Merge "Added parsing of hexadecimal values"
Bill Yi [Wed, 30 Apr 2014 12:50:48 +0000 (12:50 +0000)]
Bill Yi [Wed, 30 Apr 2014 01:00:08 +0000 (01:00 +0000)]
Zhijun He [Tue, 29 Apr 2014 22:24:16 +0000 (15:24 -0700)]
camera_metadata: make videostabilization type consistent
Make it consistent with availableVideoStabilizationModes and its optical
stabilization relatives.
Change-Id: I6e3834af8a62d4f84fca2d305ac9574052b69db0
Zhijun He [Tue, 29 Apr 2014 19:34:48 +0000 (19:34 +0000)]
Merge "camera_metadata: Mark availableFormats as deprecated"
Zhijun He [Thu, 24 Apr 2014 18:17:25 +0000 (11:17 -0700)]
camera_metadata: Mark availableFormats as deprecated
Change-Id: I1cd2a39ee6a4d3ec391fa827accaa8ad1b3dfc6e
Bill Yi [Tue, 29 Apr 2014 18:35:33 +0000 (11:35 -0700)]
Haynes Mathew George [Wed, 5 Feb 2014 04:49:25 +0000 (20:49 -0800)]
audio_route: Add APIs to update mixer based on path
audio_route_apply_and_update_path
audio_route_reset_and_update_path
These routines allows updating the mixer controls for just the specified path.
The controls will be updated in the order listed in the path.
Change-Id: If193bc047ccbb8c6497926d6181c5c4541a9d6aa
Eric Laurent [Mon, 21 Apr 2014 16:53:14 +0000 (16:53 +0000)]
Merge "Non API functions should be static."
Eric Laurent [Mon, 21 Apr 2014 16:41:20 +0000 (09:41 -0700)]
Non API functions should be static.
Change-Id: I89586e413ceb24c17a18e7dcf1241aefb274d573
Zhijun He [Thu, 17 Apr 2014 20:28:12 +0000 (20:28 +0000)]
Merge "camera_metadata: fix int64 enums being mismapped to Integer in API"
Mark Salyzyn [Thu, 17 Apr 2014 19:36:42 +0000 (19:36 +0000)]
am
2c3197e3: am
3853fae2: Merge "media: echo_reference 64 bit compile issues"
* commit '
2c3197e35e2e6fbf281bde19dc978c94f711324e':
media: echo_reference 64 bit compile issues
Zhijun He [Thu, 17 Apr 2014 18:33:33 +0000 (11:33 -0700)]
camera_metadata: fix int64 enums being mismapped to Integer in API
metadata generation logic wrongly maps all tags that are both int64 and enum
to Integer type in managed code. This created mismatch between native and
managed sides and caused exception when application get the metadata key.
Change-Id: I53a213078d3587522970ca8af46ac28d43eef425
Mark Salyzyn [Thu, 17 Apr 2014 17:08:00 +0000 (17:08 +0000)]
am
3853fae2: Merge "media: echo_reference 64 bit compile issues"
* commit '
3853fae2704e3ad79d1441364286d0c0b24b5721':
media: echo_reference 64 bit compile issues
Ruben Brunk [Wed, 16 Apr 2014 23:35:54 +0000 (23:35 +0000)]
Merge "Update DNG HAL tags."
Mark Salyzyn [Wed, 16 Apr 2014 23:16:36 +0000 (23:16 +0000)]
Merge "media: 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
Ruben Brunk [Wed, 16 Apr 2014 00:43:56 +0000 (17:43 -0700)]
Update DNG HAL tags.
Change-Id: I17c8d4f2f211c2993117f29fa9001c9731c7dff6
Ruben Brunk [Tue, 15 Apr 2014 21:37:39 +0000 (21:37 +0000)]
Merge "Update precision in dump."
Ruben Brunk [Tue, 15 Apr 2014 17:55:57 +0000 (10:55 -0700)]
Update precision in dump.
Change-Id: I7508a9abad59e995163bf7fe8b4878a78711278c
Andy Hung [Thu, 10 Apr 2014 19:27:31 +0000 (19:27 +0000)]
Merge "Update tinysndfile to write multichannel WAV"
Andy Hung [Thu, 10 Apr 2014 01:52:06 +0000 (18:52 -0700)]
Update tinysndfile to write multichannel WAV
Change-Id: Ibe73ff5e787bde8f7c5e4c326e849978410ff58f
Signed-off-by: Andy Hung <hunga@google.com>
Zhijun He [Wed, 9 Apr 2014 17:55:50 +0000 (10:55 -0700)]
camera_metadata: Add MANUAL capture intent
Change-Id: I6a3ba818cc7d13e0fcf0d90a16c53884b6cc20ab
Zhijun He [Wed, 9 Apr 2014 00:22:07 +0000 (17:22 -0700)]
camera_metadata: Make colorFilterArrangement public
Also fix a typo in spec.
Change-Id: I8427df6b28149c0f8ced27b110efe96dd38357f4
Andy Hung [Mon, 7 Apr 2014 21:08:22 +0000 (21:08 +0000)]
Merge "Add q4_27 conversion from float with tests"