OSDN Git Service
android-build-team Robot [Fri, 8 Jun 2018 07:23:35 +0000 (07:23 +0000)]
Snap for
4829593 from
00d504d2d3d14a8a11113993aa9c28ff61541d36 to pi-release
Change-Id: I09cd97e053c3f1198778a2643743fc7880171f8d
Yin-Chia Yeh [Thu, 15 Mar 2018 18:08:49 +0000 (11:08 -0700)]
Camera: update tonemap images
Also check in the plot script.
Bug:
74942037
Merged-In: If3cf99c83470f146f5e68714274b74d8e719e372
Change-Id: If3cf99c83470f146f5e68714274b74d8e719e372
android-build-team Robot [Thu, 7 Jun 2018 07:21:29 +0000 (07:21 +0000)]
Snap for
4826885 from
4db8bb86f2a27a15a22e14536e81bd35bd382bef to pi-release
Change-Id: I7e65c50557195d1030bb230573933edf65b75d8c
Shuzhen Wang [Thu, 7 Jun 2018 00:21:54 +0000 (17:21 -0700)]
Camera: Fix a typo in android.scaler.cropRegion
Test: Compile
Bug:
109839186
Change-Id: Iddbf41ee4dff363510ffc27f3ec4140bac0324c0
android-build-team Robot [Sun, 27 May 2018 07:26:25 +0000 (07:26 +0000)]
Snap for
4807121 from
1a5092e9648b9e59b7e2d7fd92b9368cd5966af9 to pi-release
Change-Id: Iddde659f4a4b6bd5f2fa6ca44d954360f589a10c
Shuzhen Wang [Wed, 23 May 2018 16:07:11 +0000 (09:07 -0700)]
Camera: Clarify camera ID selection logic for logical camera
- Clarify the assumption camera app can make on camera ids.
- Document that camera service only advertises one camera id out of every
logical camera id combination for API1.
Test: Build
Bug:
80075565
Change-Id: Idc3c600983ef36f24cdc7f4ca0f25e41451ff8ab
android-build-team Robot [Sun, 20 May 2018 07:22:53 +0000 (07:22 +0000)]
Snap for
4793185 from
3fd8ae99b441b6b50bc8cb60bd4326b52aa70b8c to pi-release
Change-Id: I8725e7987b5726994e763d8fe69617d045447e22
TreeHugger Robot [Fri, 18 May 2018 09:12:16 +0000 (09:12 +0000)]
Merge "Camera: Describe framerate session parameter corner case" into pi-dev
Aniket Kumar Lata [Fri, 4 May 2018 22:56:58 +0000 (15:56 -0700)]
media: Add A2DP codec reconfiguration parameters
Add A2DP codec reconfiguration parameters for hardware offload.
Bug:
79476124
Test: music playback over BT A2DP
Change-Id: I0f445b2b508b6b930bf8d58efbb4dba851ca3165
android-build-team Robot [Wed, 16 May 2018 07:22:40 +0000 (07:22 +0000)]
Snap for
4784261 from
74961a7910a716bc4271d0addc66b5a7e5eb8b1a to pi-release
Change-Id: I7d70336d57ea1935c28a5cabdda9e3c84aadfb39
Jiabin Huang [Tue, 15 May 2018 20:54:28 +0000 (20:54 +0000)]
Merge "Add const value for manually set surround formats." into pi-dev
Emilian Peev [Tue, 15 May 2018 10:18:04 +0000 (11:18 +0100)]
Camera: Describe framerate session parameter corner case
A corner case exists during framerate session parameter
updates in constrained HFR mode. The framework will only
monitor for fps upper range modifications.
Bug:
78494729
Test: Camera CTS
Change-Id: I88d59163c060f6e19b3d9f30925b2c5b03077d71
android-build-team Robot [Sun, 13 May 2018 07:26:30 +0000 (07:26 +0000)]
Snap for
4778776 from
e5a5cfb39fd8afefcca9c51a6728aa0d3637a1ae to pi-release
Change-Id: I95bd0d43d65ff81d0d178dd865e890db797a6581
Emilian Peev [Fri, 11 May 2018 10:17:56 +0000 (03:17 -0700)]
Merge commit '
f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-
0d58d39a-0539-474e-b9c8-
36cc976d15e8 am:
6837fddebd am:
4b350d5472
am:
a90677991f
Change-Id: I1ab47ca738094c00d962cf014c0f4e020a4f0ec9
Emilian Peev [Fri, 11 May 2018 10:12:22 +0000 (03:12 -0700)]
Merge commit '
f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-
0d58d39a-0539-474e-b9c8-
36cc976d15e8 am:
6837fddebd
am:
4b350d5472
Change-Id: Ie9158972fd863bba1ac99a4437f29487106bcae7
Emilian Peev [Fri, 11 May 2018 10:06:07 +0000 (03:06 -0700)]
Merge commit '
f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-
0d58d39a-0539-474e-b9c8-
36cc976d15e8
am:
6837fddebd
Change-Id: I80ae81e9fdcdac5dad4a35641ab2ee7aa17bc9f3
Emilian Peev [Fri, 11 May 2018 08:53:13 +0000 (09:53 +0100)]
Merge commit '
f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-
0d58d39a-0539-474e-b9c8-
36cc976d15e8
* commit '
f9e3022c474619c69a46ae7dbe11b5b531dbad57':
Camera: Initialize metadata padding field
Test: Camera CTS
Bug:
77238656
Change-Id: I6c8b3138a0e2176228180d7b1edc9f9352d0c07f
Android Build Merger (Role) [Fri, 11 May 2018 08:47:34 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am:
f85ced2263 am:
4c34eb7ac8 am:
e164ecb113 am:
a0358c3c10 am:
9fbf06511d am:
e09df97fbe am:
d0d0d54c51 am:
4feb98a933
Change-Id: Ia67374cd29031a7754fc88f2d571b37e27efe9d5
Android Build Merger (Role) [Fri, 11 May 2018 08:47:31 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am:
f85ced2263 am:
4c34eb7ac8 am:
e164ecb113 am:
a0358c3c10 am:
9fbf06511d am:
e09df97fbe am:
d0d0d54c51
Change-Id: I9f265f2ad023a2c55907d2b029d8629428155353
Android Build Merger (Role) [Fri, 11 May 2018 08:47:29 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am:
f85ced2263 am:
4c34eb7ac8 am:
e164ecb113 am:
a0358c3c10 am:
9fbf06511d am:
e09df97fbe
Change-Id: I302f48a487b61353f120dbae83304777b20fde5a
Android Build Merger (Role) [Fri, 11 May 2018 08:47:26 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am:
f85ced2263 am:
4c34eb7ac8 am:
e164ecb113 am:
a0358c3c10 am:
9fbf06511d
Change-Id: If33362ba096af1c11226021147f671ce0936455a
Android Build Merger (Role) [Fri, 11 May 2018 08:47:24 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am:
f85ced2263 am:
4c34eb7ac8 am:
e164ecb113 am:
a0358c3c10
Change-Id: I529ab232eab8b02fdcaf6df9eaa28366c978d36e
Android Build Merger (Role) [Fri, 11 May 2018 08:47:21 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am:
f85ced2263 am:
4c34eb7ac8 am:
e164ecb113
Change-Id: Ic4237032dc357905cde458219a42a2fece3636bc
Android Build Merger (Role) [Fri, 11 May 2018 08:47:18 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am:
f85ced2263 am:
4c34eb7ac8
Change-Id: I2b38ba060b9398b616ac7adb24816655b7b46384
Android Build Merger (Role) [Fri, 11 May 2018 08:47:16 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am:
f85ced2263
Change-Id: Ic1b147fbf96aa567af9ea10533d0012a8765eca4
Emilian Peev [Tue, 10 Apr 2018 12:11:43 +0000 (13:11 +0100)]
Camera: Initialize metadata padding field
'padding' field in internal camera metadata structure should be
initialized.
Bug:
77238656
Test: Camera CTS
Change-Id: I57919ec6d6834b5e830be7cbe871558a5da3f266
Merged-In: I57919ec6d6834b5e830be7cbe871558a5da3f266
android-build-team Robot [Thu, 10 May 2018 07:24:30 +0000 (07:24 +0000)]
Snap for
4773106 from
534cf9df97786dce7f7ec7687716723f83ed1c1e to pi-release
Change-Id: Iea5e32f4b582c40a796f8f11ee6911fc6b3a4ce3
jiabin [Mon, 7 May 2018 17:55:12 +0000 (10:55 -0700)]
Remove valid_mask from audio.h
As valid mask only using in hal to indicate which fields of microphone
characteristics is available and it is not used in other case, we can
only keep it in hal layer instead of audio.h.
Bug:
79272216
Test: run cts
Change-Id: I2f41c382551eff105f321a7d3639ac5d5557305c
android-build-team Robot [Tue, 1 May 2018 07:24:08 +0000 (07:24 +0000)]
Snap for
4754571 from
66e77458988941c0a47de05b507d1aeaa7e7dfde to pi-release
Change-Id: Id91c1d0cc0f6be9f43b4ef9ac6944bd409ab6fdb
android-build-team Robot [Mon, 30 Apr 2018 23:05:33 +0000 (23:05 +0000)]
Merge "Add AUDIO_MICROPHONE_CHANNEL_MAPPING_CNT." into pi-dev
android-build-team Robot [Sun, 29 Apr 2018 07:21:00 +0000 (07:21 +0000)]
Snap for
4751833 from
614439ed8b3c41ccf0d8c438afa5a6f74d66d3e6 to pi-release
Change-Id: I23e961b1baf6eb64795f67df1a26b1b47275e8e9
jiabin [Fri, 27 Apr 2018 23:03:29 +0000 (16:03 -0700)]
Add AUDIO_MICROPHONE_CHANNEL_MAPPING_CNT.
Bug:
75041465
Test: make
Change-Id: I2cd6a5cdcd497bd9723d058a71737da67fa9810a
Andy Hung [Fri, 27 Apr 2018 16:58:10 +0000 (16:58 +0000)]
Merge "Fix in-place audio format conversion issues" into pi-dev
Andy Hung [Thu, 26 Apr 2018 00:59:24 +0000 (17:59 -0700)]
Fix in-place audio format conversion issues
memcpy_by_audio_format() corner case of same format in-place.
memcpy_to_p24_from_i16() for the first sample in buffer for in-place.
Update memcpy_by_audio_format() documentation.
Test: added native unit test format_tests
Bug:
78598192
Change-Id: I9e538ed4ef233b319b846f4a91c27a86eb605a20
android-build-team Robot [Thu, 26 Apr 2018 07:27:03 +0000 (07:27 +0000)]
Snap for
4745538 from
d267471813a203fb08e4e57f57d6680b08951caa to pi-release
Change-Id: Ie34de838a0b58006987692493fa68069169e1a39
TreeHugger Robot [Wed, 25 Apr 2018 23:16:31 +0000 (23:16 +0000)]
Merge "audio-base.h number in hex" into pi-dev
Kevin Rocard [Wed, 25 Apr 2018 03:04:15 +0000 (20:04 -0700)]
audio-base.h number in hex
Make audio.h great again.
All values expressed in hex in types.hal are now also hex in
audio-base.h
Generated by running on each enum body:
sed -E 's/(.* )= ([0-9]*)u?,(.*)/echo "\1@= 0x$(printf \%x \2),@\3"/e' |
column -ts@ | sed 's/ =/=/;s/, /,/;s/[()]//g' |
sed -E 's/0x([a-zA-Z0-9]+)/0x\U\1/'
And then a few manual removal of whitespace for vertical alignments.
Test: check that some numbers are correctly converted
Bug:
38184704
Change-Id: I6740e00285b8d301320dd8ae408d3f1fd46511c3
Signed-off-by: Kevin Rocard <krocard@google.com>
android-build-team Robot [Wed, 25 Apr 2018 07:22:44 +0000 (07:22 +0000)]
Snap for
4742838 from
5c9c78f9527540deaeb22c6f32eb5e001272f77e to pi-release
Change-Id: I0783d5d9eea9f1706035db2bf7d252b426e23bef
jiabin [Tue, 24 Apr 2018 22:20:05 +0000 (15:20 -0700)]
Make maximum number of frequency response larger.
Bug:
64038649
Test: make
Change-Id: Ic41b9e48d5c4e33718cd8f1d7233e29daf0659fe
jiabin [Tue, 3 Apr 2018 01:20:37 +0000 (18:20 -0700)]
Add const value for manually set surround formats.
To make surround sound setting more clear to users, we are changing
surround setting from ALWAYS to MANUAL. With MANUAL, users could enable
surround formats according to their need.
Bug:
67479735
Test: Try creating AudioTrack with enable/disable surround formats.
Change-Id: I32c5a766300fc0ed294150f703e46602970a76d3
android-build-team Robot [Thu, 19 Apr 2018 07:25:24 +0000 (07:25 +0000)]
Snap for
4731145 from
c5e409aa6b5083b6a7a431ac920455ca41ed0db7 to pi-release
Change-Id: I09401a44b7a606c29c4262d30bdf6a4a1f703a71
Andy Hung [Wed, 18 Apr 2018 01:13:05 +0000 (18:13 -0700)]
Add safe string copy primitives
Test: string_tests
Bug:
78198288
Change-Id: I711dc633ebbc87bc2fc564a2d75c2575d87934fd
android-build-team Robot [Tue, 17 Apr 2018 07:22:18 +0000 (07:22 +0000)]
Snap for
4725392 from
9dcd0a5267d15fd070d89a844fb5d8bed92bf2e6 to pi-release
Change-Id: I2b1a4762d886d982bfee2fb81222bbfd47c4cfa6
Hidenari Koshimae [Fri, 13 Apr 2018 00:42:27 +0000 (09:42 +0900)]
Camera: Fix a description for MONOCHROME camera capability
Bug:
77902724
Change-Id: Ib16d34fe2dda94b579034251f72cb0a383b96d3c
android-build-team Robot [Wed, 4 Apr 2018 07:28:14 +0000 (07:28 +0000)]
Snap for
4698807 from
6b1001e5c8e7610ed46646fc85abb7797b86ce1c to pi-release
Change-Id: I89aaccd2e9cb20f87eb069dde4dac2db062bb66e
TreeHugger Robot [Tue, 3 Apr 2018 12:57:19 +0000 (12:57 +0000)]
Merge "Camera: Update camera docs about external device orientation" into pi-dev
android-build-team Robot [Sun, 1 Apr 2018 07:28:45 +0000 (07:28 +0000)]
Snap for
4693621 from
5e696a82f671e8d5211a598d4108ce2b59777449 to pi-release
Change-Id: I96b8a098286ff8a79963b971972e3f0b36e92e3e
Kevin Rocard [Tue, 27 Mar 2018 21:07:33 +0000 (14:07 -0700)]
Audio V4: Add metadata struct in the legacy HAL API
Test: compile
Bug:
38184704
Change-Id: I9bc58d47f9e985ecf7aa93858eec5ab78b248554
Signed-off-by: Kevin Rocard <krocard@google.com>
TreeHugger Robot [Fri, 30 Mar 2018 16:59:41 +0000 (16:59 +0000)]
Merge "Add const value for querying microphones information." into pi-dev
android-build-team Robot [Thu, 29 Mar 2018 07:21:49 +0000 (07:21 +0000)]
Snap for
4686875 from
bb1549f4d29f76cc968797c48e978064757a034b to pi-release
Change-Id: I420fcf476006a9d9ff9e9a41185e7270d55f0898
TreeHugger Robot [Wed, 28 Mar 2018 21:01:31 +0000 (21:01 +0000)]
Merge "Camera: Add MONOCHROME camera capability" into pi-dev
Shuzhen Wang [Wed, 21 Mar 2018 02:04:06 +0000 (19:04 -0700)]
Camera: Add MONOCHROME camera capability
Add MONOCHROME camera capability which outputs greyscale instead of
color image.
Test: run metadata-generate
Bug:
74597035
Bug:
64691172
Change-Id: If15a444500983e448fde7d03f2a96b0c59b045db
Emilian Peev [Wed, 28 Mar 2018 10:17:14 +0000 (11:17 +0100)]
Camera: Update camera docs about external device orientation
The orientation and facing of external devices cannot be used
for calculating the jpeg orientation. Clients should ignore
the reference code in this case.
Bug:
72261912
Test: Android compiles without errors
Change-Id: I05e85d00eed1454d43b8f648bc7debd1c2290f05
android-build-team Robot [Wed, 28 Mar 2018 07:20:30 +0000 (07:20 +0000)]
Snap for
4683893 from
c8e8062cbeec8f08050867db132fd8d1479ccfef to pi-release
Change-Id: I709cda2df1b63106ac70d7b1d79bf70fc77ea8f7
TreeHugger Robot [Wed, 28 Mar 2018 02:23:28 +0000 (02:23 +0000)]
Merge "Dynamics Processing Effect" into pi-dev
rago [Thu, 1 Feb 2018 22:24:40 +0000 (14:24 -0800)]
Dynamics Processing Effect
Dynamics Processing Effect definitions
Bug:
64161702
Bug:
38266419
Test: manual testing and CTS tests
Change-Id: Ie0070f331b487716cac4b3009282ffa2e8b76548
TreeHugger Robot [Tue, 27 Mar 2018 19:26:45 +0000 (19:26 +0000)]
Merge "Camera2: Add distortion correction support" into pi-dev
Eino-Ville Talvala [Wed, 14 Mar 2018 02:46:57 +0000 (19:46 -0700)]
Camera2: Add distortion correction support
This allows camera devices to correct geometric distortion in their
optics, when requested by the application.
The correction only applies to processed (YUV, JPEG, etc) outputs,
not RAW buffers, or the result metadata.
Also fix metadata generation code to handle <clone> entries and their
hal_versions, to fix code generation for the HIDL layer. A clone entry
inherits its target entry's hal version, but can override it to a
higher version if necessary; an error is generated if the version is
less than the target entry. In addition, fix bug in generating HIDL
output when there are multiple new sections in a new HAL version.
Test: New CTS test passes
Bug:
74434422
Change-Id: I6154e9757310636565aec5344a8988408234c164
android-build-team Robot [Sun, 25 Mar 2018 07:25:01 +0000 (07:25 +0000)]
Snap for
4677756 from
1933be01b142091f121e4de46873f59631a7fd2d to pi-release
Change-Id: I4163f06fcbfa3bb98085af970be69abc69e34347
TreeHugger Robot [Fri, 23 Mar 2018 17:24:11 +0000 (17:24 +0000)]
Merge "libcamera_metata is re-exporting headers from libcutils" into pi-dev
jiabin [Tue, 20 Mar 2018 01:24:11 +0000 (18:24 -0700)]
Add const value for querying microphones information.
Add const value when microphones information is not available.
Bug:
64038649
Test: Manual Testing and Cts test
Change-Id: Ib46d9e2b976df607e87f6ae69f0aa25f159a2003
Jiyong Park [Thu, 22 Mar 2018 08:19:38 +0000 (17:19 +0900)]
libcamera_metata is re-exporting headers from libcutils
camera_metada.h is including cutils/compiler.h. Re-exporting headers
from libcutils so that clients can use camera_metadata.h without
referring to the libcutils header explicitly.
Bug:
73723591
Test: m -j
Change-Id: I23e512923c0619e5d471ddf46550e81323f61d0e
Jack He [Thu, 8 Mar 2018 01:02:23 +0000 (17:02 -0800)]
Bluetooth: Enable in-band ringing in vibration mode (2/4)
* Add AUDIO_POLICY_FORCE_FOR_VIBRATE_RINGING force mode
Bug:
72647074
Test: Call phone in vibration mode and hear ringtone on HFP enabled
headset, verify that ringtone is only played through headset.
Then disconnect headset and call again to verify that ringtone
does not play through phone speaker in vibration mode.
Change-Id: I6a738115a968ac76cb7cf83b52fe2e28a2fbc17f
(cherry picked from commit
2fa5ecf152f1227a6493b51ed114bc7c1a304202)
android-build-team Robot [Wed, 21 Mar 2018 07:25:30 +0000 (07:25 +0000)]
Snap for
4667902 from
17f2f7c22464959ca619b6cf19dae1f2ea4c7fd8 to pi-release
Change-Id: I9a13d14e4e92995b29454595d056fda6d86b2d81
Eino-Ville Talvala [Tue, 20 Mar 2018 21:58:16 +0000 (21:58 +0000)]
Merge "Camera2: Deprecate LENS_RADIAL_DISTORTION, add LENS_DISTORTION" into pi-dev
Mikhail Naganov [Fri, 16 Mar 2018 21:39:21 +0000 (14:39 -0700)]
Add 5.1.2, 5.1.4, 7.1.2, 7.1.4 output channel masks
They were supposed to be added by the change with id
I2f488462614114e4c82149460b030585981ae15e
but actually were not.
Also, rename OUT_TOP_CENTER_... to OUT_TOP_SIDE_...
according to Dean's suggestion.
Bug:
38184704
Bug:
63901775
Test: make
Change-Id: Ia23e200887e75ce4376e68ba99312821869e1001
android-build-team Robot [Sun, 18 Mar 2018 07:20:55 +0000 (07:20 +0000)]
Snap for
4662252 from
e33828b07329c3da501062ab52cfd8a3a203da1c to pi-release
Change-Id: I7d5d194aa78d764fccb5d005033baa3c3c7875b8
Eino-Ville Talvala [Wed, 14 Mar 2018 02:10:23 +0000 (19:10 -0700)]
Camera2: Deprecate LENS_RADIAL_DISTORTION, add LENS_DISTORTION
LENS_RADIAL_DISTORTION is inconsistently defined: in some places, it
is documented to operate on the range [-1...1], and in others, on a
range dependent on the camera lens's intrinsic calibration and focal
length.
Since fixing just the definition will not fix any existing devices
that define this value, deprecate the old key and add a new consistent
one to make sure applications only reference the consistent
definition.
Also add support for adding a deprecation description to the metadata
entries, and add descriptions for all the existing deprecated entries.
Test: Adjusted camera CTS passes
Bug:
74641761
Change-Id: I410cef73974bdd02f89051812730424b50fb9430
TreeHugger Robot [Thu, 15 Mar 2018 22:17:22 +0000 (22:17 +0000)]
Merge "camera: Add links for aeState" into pi-dev
Chien-Yu Chen [Thu, 15 Mar 2018 18:17:20 +0000 (11:17 -0700)]
camera: Add links for aeState
Bug:
74976641
Test: Build
Change-Id: Id9dcef6796cc13487bdf76eb514a2cb72d999081
android-build-team Robot [Thu, 15 Mar 2018 07:26:52 +0000 (07:26 +0000)]
Snap for
4656203 from
d89fe920203391241a700fba5d8764288c79b05b to pi-release
Change-Id: I27a176c0c4d35bbd54a41693a420a9f079430b52
Jakub Pawlowski [Wed, 14 Mar 2018 17:19:26 +0000 (10:19 -0700)]
Add audio_is_hearing_aid_out_device
Bug:
69623109
Change-Id: Ie0e41e4d30f669eedf8011dd0e717c19ee54ca13
android-build-team Robot [Sun, 11 Mar 2018 08:26:25 +0000 (08:26 +0000)]
Snap for
4647811 from
0debd9d1de8ff2d6787b63bd8dca5da0efd95888 to pi-release
Change-Id: Id14ff01a9a306dcc79d118b0f8b3605f0107715d
TreeHugger Robot [Fri, 9 Mar 2018 03:53:44 +0000 (03:53 +0000)]
Merge "Add Hearing Aid HAL name definition" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 18:06:49 +0000 (18:06 +0000)]
Merge "audio HAL: Add missing input channel masks" into pi-dev
android-build-team Robot [Thu, 8 Mar 2018 08:25:59 +0000 (08:25 +0000)]
Snap for
4641295 from
5a54b42c31ee5a0d45ae30d50c38ab91763135e6 to pi-release
Change-Id: I6c7d63eb1de67ddf0f671978bc56c40615cb4a06
Jean-Michel Trivi [Wed, 7 Mar 2018 23:10:36 +0000 (15:10 -0800)]
Valid audio formats: add xHE-AAC and AAC-ELD
Bug:
71430241
Test: only once we have decoder
Change-Id: If390ff854e3089a50e21db06758f26308beb258b
Mikhail Naganov [Wed, 7 Mar 2018 18:57:39 +0000 (10:57 -0800)]
audio HAL: Add missing input channel masks
The following masks added for input: 2.0.2, 2.1.2, 3.0.2, 3.1.2
Add utility function 'audio_channel_mask_in_to_out' for deriving
a corresponding output channel mask from an input mask.
Remove temporary AUDIO_OUTPUT_FLAG_INCALL_MUSIC definition.
Bug:
38184704
Bug:
63901775
Test: make
Change-Id: If84a3e4942163f4cd6417486d601ac9a7b5b2068
TreeHugger Robot [Wed, 7 Mar 2018 18:36:48 +0000 (18:36 +0000)]
Merge "system/audio.h: Add EAC3-JOC and MAT to "valid formats"" into pi-dev
Mikhail Naganov [Wed, 7 Mar 2018 01:35:24 +0000 (17:35 -0800)]
system/audio.h: Add EAC3-JOC and MAT to "valid formats"
Update audio_is_valid_format to recognize EAC3-JOC and MAT
Bug:
38184704
Bug:
63901775
Test: make
Change-Id: I19def058a1bc0f8d16937e1ec53e9de51919a93b
android-build-team Robot [Wed, 7 Mar 2018 08:20:57 +0000 (08:20 +0000)]
Snap for
4638586 from
f971c08b6a404bd59d9ad0b3b22d287b4413131d to pi-release
Change-Id: Ib3c67b3802c52fef60e24d8f39fbbdd0fcb52c88
Kevin Rocard [Fri, 23 Feb 2018 18:01:56 +0000 (10:01 -0800)]
Audio V4: Update audio.h to V4.0
Exported the audio/common/4.0/types.h to audio-base.h.
As all system only values are removed in 4.0 but the headers
are still shared between vendor and system,
add those values back protected by the macro
AUDIO_NO_SYSTEM_DECLARATIONS.
This macro is defined for vendor libraries.
audio.h used to have *_CNT and *_MAX values in its enum
mostly for enum iteration.
This was not compatible with Treble as it denied any enum
inheritance.
*_CNT and *_MAX are now implemented with constants that can
be updated and are not part of the HIDL API.
Bug:
38184704
Test: compile
Change-Id: I5f99ccc9ce262b3addb15cd5034a885c9ab4cedf
Merged-In: I5f99ccc9ce262b3addb15cd5034a885c9ab4cedf
Cherry-picked from master
Signed-off-by: Kevin Rocard <krocard@google.com>
Jakub Pawlowski [Fri, 23 Feb 2018 21:53:07 +0000 (13:53 -0800)]
Add Hearing Aid HAL name definition
Bug:
64038649
Test: mm
Change-Id: Ia0d1270b690378c10bb1d4585b7aa4a640cb39fe
android-build-team Robot [Sun, 4 Mar 2018 08:26:18 +0000 (08:26 +0000)]
Snap for
4632767 from
f66768029a8ab6d3872b8525c2cbbca6d4cb751b to pi-release
Change-Id: I044a83f224bdc03dce1beaf0a3d0ff97d8387151
TreeHugger Robot [Sat, 3 Mar 2018 01:33:14 +0000 (01:33 +0000)]
Merge "Camera: Update documentation for AF_REGIONS metadata"
Glenn Kasten [Fri, 2 Mar 2018 19:02:23 +0000 (19:02 +0000)]
Merge "Force calculations involving time to be done as 64-bits"
Elliott Hughes [Fri, 2 Mar 2018 16:55:43 +0000 (16:55 +0000)]
Merge "Add missing free after read device info" am:
384bd00de2 am:
e1087bb8ef
am:
0ee9d6aadf
Change-Id: I802dbee1bcbed3ba79f322bf1d15e6963b046c8f
Elliott Hughes [Fri, 2 Mar 2018 16:49:29 +0000 (16:49 +0000)]
Merge "Add missing free after read device info" am:
384bd00de2
am:
e1087bb8ef
Change-Id: Id673086ab7e8b66c1009dcba7803a971546fc711
Elliott Hughes [Fri, 2 Mar 2018 16:42:45 +0000 (16:42 +0000)]
Merge "Add missing free after read device info"
am:
384bd00de2
Change-Id: I3a3fc3fa6020af36353670bd5f2709031e2e2e01
Elliott Hughes [Fri, 2 Mar 2018 16:36:33 +0000 (16:36 +0000)]
Merge "Add missing free after read device info"
liuchao [Thu, 1 Mar 2018 08:58:29 +0000 (16:58 +0800)]
Add missing free after read device info
alsa_hw_params is not freed before get out
of function profile_read_device_info,calloc
from pcm_params_get in pcm.c
Test: code compilation
Change-Id: Icb1163d3dc213939243d26f57f8d22ca4edb1159
Glenn Kasten [Mon, 26 Feb 2018 20:04:15 +0000 (12:04 -0800)]
Force calculations involving time to be done as 64-bits
Bug:
73619529
Test: builds OK, no further regressions
Change-Id: I5e56e7143c139c6b56f47f7ebfda8b71152b2421
android-build-team Robot [Sun, 25 Feb 2018 08:23:05 +0000 (08:23 +0000)]
Snap for
4620899 from
082954c2d1ec0f6c5aad76538199c8f81fb7690a to pi-release
Change-Id: Iddaeea805e6fc067f1615b0bb871eb87778e4871
TreeHugger Robot [Fri, 23 Feb 2018 18:47:56 +0000 (18:47 +0000)]
Merge "camera: Add OisSamples synthetic key"
Chien-Yu Chen [Thu, 15 Feb 2018 20:34:30 +0000 (12:34 -0800)]
camera: Add OisSamples synthetic key
Add a synthetic OisSamples key containing timestamps and
shifts.
Test: CTS
Bug:
64847201
Change-Id: Ic9c4f773d4ccae483f022ed68b0d3a9590af1e0c
Glenn Kasten [Wed, 21 Feb 2018 20:46:26 +0000 (12:46 -0800)]
Add audio_bytes_per_frame()
Test: tested by use in AudioTrack.cpp
Change-Id: I97a731ef80f66c32c08c97a2de7d2ae6717e5739
android-build-team Robot [Sun, 18 Feb 2018 08:28:23 +0000 (08:28 +0000)]
Snap for
4610834 from
6916b4fbf7c2941ad28204eef9557421a578e6ec to pi-release
Change-Id: Ib61574b00b579f41726347a34ed6f8b25632d8dd
TreeHugger Robot [Fri, 16 Feb 2018 01:34:00 +0000 (01:34 +0000)]
Merge "camera: Update logical multi-camera requirement"
android-build-team Robot [Thu, 15 Feb 2018 08:27:02 +0000 (08:27 +0000)]
Snap for
4605948 from
6c3586362874755adc33fafee242372da40ac0bb to pi-release
Change-Id: Ia3c76438d91ba0d07c8477338e15a1eca0a25e77
TreeHugger Robot [Wed, 14 Feb 2018 20:25:38 +0000 (20:25 +0000)]
Merge "camera: Remove physical requests streaming restriction"