OSDN Git Service
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
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 [Mon, 30 Apr 2018 23:05:33 +0000 (23:05 +0000)]
Merge "Add AUDIO_MICROPHONE_CHANNEL_MAPPING_CNT." into pi-dev
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
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>
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
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
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
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
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
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
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
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)
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
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
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
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
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
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
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
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
TreeHugger Robot [Fri, 16 Feb 2018 01:34:00 +0000 (01:34 +0000)]
Merge "camera: Update logical multi-camera requirement"
TreeHugger Robot [Wed, 14 Feb 2018 20:25:38 +0000 (20:25 +0000)]
Merge "camera: Remove physical requests streaming restriction"
Shuzhen Wang [Thu, 25 Jan 2018 21:23:03 +0000 (13:23 -0800)]
camera: Update logical multi-camera requirement
- Require timestamp source of logical and physical cameras to be the
same.
- Clarify requirement for guaranteed raw stream combinations.
Test: Compile, and look at HAL and Java side docs
Bug:
64691172
Change-Id: I8babf5cc47bdef642358a73f9e9e4b66f934e21c
Eino-Ville Talvala [Tue, 6 Feb 2018 00:26:26 +0000 (16:26 -0800)]
Camera: Revise MOTION_TRACKING capability
Simplify the API for the P release.
Also clarify a bit of OIS control text.
Test: Revised Camera CTS passes
Bug:
63629224
Change-Id: Iff5a24a5699fa018e9385924f9d1c7b1cbe39576
Shuzhen Wang [Thu, 8 Feb 2018 20:03:09 +0000 (12:03 -0800)]
Camera: Update documentation for AF_REGIONS metadata
Allow AF_REGIONS in capture result to have non-0 weight if the app sets a
0-weight AF_REGIONS. This is for the case where camera HAL decides what
AF regions are used internally.
Test: Compile
Bug:
29398609
Change-Id: Ia5b4ecabb1493110e26b7476c3574bf8570d88b0
Glenn Kasten [Thu, 8 Feb 2018 20:48:08 +0000 (20:48 +0000)]
Merge "Pull out commonly used constants to <audio_utils/clock.h>"
Emilian Peev [Tue, 6 Feb 2018 16:08:38 +0000 (16:08 +0000)]
camera: Remove physical requests streaming restriction
Individual physical device capture settings should be available
for streaming requests as well.
Bug:
72524845
Test: Camera CTS
Change-Id: Iba27d07adfcde6100088e52336fd91f0c3dc816d
Ricardo Garcia [Fri, 2 Feb 2018 18:40:14 +0000 (18:40 +0000)]
Merge "Fix typos in audio.h"
Mikhail Naganov [Thu, 1 Feb 2018 16:46:07 +0000 (16:46 +0000)]
Merge "Add presentation and program id keys"
rago [Wed, 31 Jan 2018 21:18:37 +0000 (13:18 -0800)]
Fix typos in audio.h
Bug:
64038649
Test: Manual Testing and CTS tests.
Change-Id: I27c897761dec4b7ed103b28818211a30469e4eeb
Glenn Kasten [Fri, 8 Sep 2017 21:54:17 +0000 (14:54 -0700)]
Pull out commonly used constants to <audio_utils/clock.h>
Test: builds OK
Change-Id: Ib1167a6f4ebf4a416c9ca964fc46293e0d0597d4
jiabin [Thu, 25 Jan 2018 00:11:27 +0000 (16:11 -0800)]
Fix error type in microphone characteristics.
We should use device type instead of port type.
Bug:
64038649
Test: Manually test.
Change-Id: I06d3cd05577afefae46a2fce694c91850d9a97b2
Dean Wheatley [Thu, 4 Jan 2018 18:16:17 +0000 (05:16 +1100)]
Add presentation and program id keys
Add keys for presentation selection in HALs for next
generation audio streams.
Bug:
63901775
Test: make
Change-Id: I0c2e839757e8be03f21af3868d9dea38da7075b6
Signed-off-by: Previr Rangroo <prang@dolby.com>
Kevin Rocard [Wed, 24 Jan 2018 06:26:16 +0000 (06:26 +0000)]
Merge "Revert "Audio V4: Split system and vendor Audio.h""
Kevin Rocard [Wed, 24 Jan 2018 06:09:44 +0000 (06:09 +0000)]
Revert "Audio V4: Split system and vendor Audio.h"
This reverts commit
6f04dc59644eaaf8e38fbc5c57578d3216db3adb.
Reason for revert: Breaks multiple devices
Change-Id: I7d447b196b71f72918d94716ba5f16e0ad21db06
Kevin Rocard [Wed, 24 Jan 2018 04:04:47 +0000 (04:04 +0000)]
Merge "Audio V4: Split system and vendor Audio.h"
rago [Tue, 23 Jan 2018 22:03:02 +0000 (14:03 -0800)]
Additional channel mapping data to microphone info structure
Adding channel mapping information to the microphone info
structure.
Bug:
64038649
Test: Manual Testing and Cts integration test
Change-Id: Ic0b6b8bad6cbb4bf906fbd5cd20bac70d5a6c83f
Kevin Rocard [Wed, 17 Jan 2018 23:57:40 +0000 (15:57 -0800)]
Audio V4: Split system and vendor Audio.h
audio.h and its dependencies (audio-effect.h, sound_trigger.h...)
used to be shared between system and vendor code.
This led to multiple problems:
1) Such sharing contradicts the Treble policy of
strict independence of framework and vendor code.
2) When audio.h was changed, every vendor needed to update
its code in the next release. This meant that audio*.h
headers were mostly changed in backward compatible manner.
Nevertheless, for P the HIDL interface and thus the audio.h
interface are changed in backward incompatible way.
(Some enum are becoming 64 bit long).
3) As the headers were common, some API used only by the framework
needed to be visible to the vendors (mostly enum values).
4) Treble policy is to support at least one previous HAL version
As a result the audio*.h headers are now duplicated,
one set for the framework, and one for the vendor.
Each set will evolve independently. After this split,
the framework-only APIs will be removed from the vendor headers
and vice versa.
The split is implements as such:
+ for system code
- NOT moving the libaudio_system_headers
Eg: system/audio.h and system/audio_effects/effect_equalizer.h
are still in system/media/audio
- the legacy audio HAL API that were in libhardware headers
are now in libaudiohal_legacy_headers
Eg: hardware/audio.h and hardware/audio_effect.h
are now in frameworks/av/media/libaudiohal/legacy/
+ for vendor code
- moving libaudio_system_headers and the legacy audio HAL API
that were in libhardware_headers in
android.hardware.audio.common.legacy@2.0
Note that those headers are now versioned, so migrating to a @4.0
HIDL HAL will mean changing the legacy dependency too.
Eg: system/audio.h, system/audio-effect.h, hardware/audio.h
are now in hardware/interfaces/audio/common/2.0/legacy
- the legacy audio effect HAL API that was in libaudioeffects
is now moved in android.hardware.audio.effect.legacy@2.0
Eg: audio_effects/effect*.h are now in
hardware/interfaces/audio/effect/2.0/legacy
- the legacy sound trigger HAL API that were in libhardware_headers
is now moved in android.hardware.soundtrigger.legacy@2.0
Eg: hardware/sound_trigger.h is now in
hardware/interfaces/audio/effect/2.0/legacy
libaudioutil being used by both system and vendor, had
to be renamed for system to libaudioutil_system.
Vendor libs that now depend on the audio.h of a specific
version and are not extensively referenced in non google code,
append @2.0 to their name.
Note that headers that are not expected to change in the 4.0 HAL are
left in all-versions folder to avoid duplication.
This is an implementation detail as the versioned libraries export
the all-versions headers.
Note that strict vendor-system separation is enforced by the
build-system. The system headers are not available for vendor
libs and vice-versa.
Note that this patch is split between numerous git repository (>10),
all the commits having the same Change-id for searchability.
Note that audio_policy.h is no longer exposed to vendors
as the legacy audio policy HAL API was never officially supported.
As a result the audiopolicy stub implementation has been removed.
Test: compile taimen-userdebug walleye-userdebug
sailfish-userdebug marlin-userdebug
gce_x86_phone-userdebug gce_x86_phone
full-eng aosp_arm aosp_x86-eng
Test: check that the emulator booted and played audio
Test: full QA on sailfish-userdebug and taimen-userdebug
Bug:
38184704
Change-Id: I950f4e0a55613d72e32eba31bd563cb5bafe2d1a
Signed-off-by: Kevin Rocard <krocard@google.com>
TreeHugger Robot [Tue, 23 Jan 2018 03:03:31 +0000 (03:03 +0000)]
Merge "camera: Modify AF scene change"
Shuzhen Wang [Tue, 23 Jan 2018 00:36:16 +0000 (00:36 +0000)]
Merge "Camera: Add available physical camera request keys"
TreeHugger Robot [Mon, 22 Jan 2018 23:22:30 +0000 (23:22 +0000)]
Merge "camera: Add OIS data keys"
Nadav Bar [Mon, 22 Jan 2018 23:20:50 +0000 (23:20 +0000)]
Merge "Manually add incall music output flag"
Shuzhen Wang [Mon, 22 Jan 2018 20:30:15 +0000 (20:30 +0000)]
Merge "Camera: Add static metadata for logical camera"
Yin-Chia Yeh [Mon, 22 Jan 2018 19:55:20 +0000 (19:55 +0000)]
Merge "Camera: add new EXTERNAL hardware level"
Nadav Bar [Mon, 22 Jan 2018 19:23:18 +0000 (21:23 +0200)]
Manually add incall music output flag
This change manually adds the AUDIO_OUTPUT_FLAG_INCALL_MUSIC to audio.h.
When HAL v4.0 will be available it will be added to the HAL interfaces
and removed from audio.h.
Bug:
69973354.
Test: tested manually.
Change-Id: I130aa1f91325199552047d348017e54e576a2f91
TreeHugger Robot [Mon, 22 Jan 2018 19:20:32 +0000 (19:20 +0000)]
Merge "Add support of getting all available microphones characteristics."
jiabin [Fri, 5 Jan 2018 21:11:47 +0000 (13:11 -0800)]
Add support of getting all available microphones characteristics.
Bug:
64038649
Test: Run cts and check the print log.
Change-Id: Ic05dffb6e71d03005261972e398484824c01a805
Emilian Peev [Thu, 18 Jan 2018 19:09:57 +0000 (19:09 +0000)]
Camera: Add available physical camera request keys
Add a subset of the available camera request keys that
can be overriden for physical device backing logical
multi-camera.
Test: Compile, and run metadata-generate
Bug:
64691172
Change-Id: I39a825d75f5bff96000729415e4d6f99fbb1fe2d
Shuzhen Wang [Thu, 30 Nov 2017 20:03:37 +0000 (12:03 -0800)]
Camera: Add static metadata for logical camera
Add logical camera capability and corresponding static metadata for
physical camera ids.
Test: Compile, and run metadata-generate
Bug:
64691172
Change-Id: Ifa14db6ce5085e54f6bafdd9060e56c6b99b9ff2
Chien-Yu Chen [Fri, 19 Jan 2018 18:50:17 +0000 (10:50 -0800)]
camera: Modify AF scene change
Change type to byte because int32 and enum cause type mismatch.
Allow DETECT in all AF modes.
Test: CTS
Bug:
64847201
Change-Id: I61e4b37fda8b29a67026cd567d4fa414afe90231
Yin-Chia Yeh [Fri, 19 Jan 2018 19:32:19 +0000 (11:32 -0800)]
Camera: add new EXTERNAL hardware level
Bug:
64874137 63873538
Change-Id: Ida7c14d045c6e9f13c638e2314c76178f8bdecf4
Chien-Yu Chen [Sat, 13 Jan 2018 01:38:00 +0000 (17:38 -0800)]
camera: Add OIS data keys
Test: CTS
Bug:
64847201
Change-Id: I80b94554d886a0eeae5ee247a1f1c4aafb0f4cd7
TreeHugger Robot [Fri, 19 Jan 2018 04:19:23 +0000 (04:19 +0000)]
Merge "camera: Add external flash mode key"
Chien-Yu Chen [Thu, 11 Jan 2018 19:32:52 +0000 (11:32 -0800)]
camera: Add external flash mode key
Test: CTS
Bug:
64847201
Change-Id: Id7d4d1e5a7ce8f3793f36a0a24a2c5118a367fef
Emilian Peev [Wed, 10 Jan 2018 13:47:40 +0000 (13:47 +0000)]
camera: Correct 'availableSessionKeys' version
The hal version of 'availableSessionKeys' should be 3.3 not 3.4 .
Bug:
64450664
Test: Builds, hidl-gen/hidl-doc are happy with the HIDL output
Change-Id: I2af918362de4e5e405a50d202ba400b501d404d0
Eino-Ville Talvala [Thu, 7 Dec 2017 21:12:11 +0000 (13:12 -0800)]
Camera: Add MOTION_TRACKING capability/intent, and lens poseReference
- Add MOTION_TRACKING capability, which defines a camera with accurate
lens calibration values, accurate timestamps relative to the
inertial sensors, and ability to limit exposure time to 20ms.
- Add MOTION_TRACKING capture intent, which limits AE to 20ms max
exposure.
- Add android.lens.poseReference for supporting gyroscope-centered
lens calibration data for MOTION_TRACKING.
- Remove accidental typo in session parameter docs
Test: Builds, hidl-gen/hidl-doc are happy with the HIDL output
Bug:
63629224
Change-Id: I13dd3d2b30899a9fc952639ec168748bae11dc87
Chien-Yu Chen [Wed, 3 Jan 2018 20:04:48 +0000 (12:04 -0800)]
camera: Add device info version
Test: CTS
Bug:
64847201
Change-Id: Ia7b5ca8fc37093afd5a5e29d46d437159bb5c454
Shuzhen Wang [Thu, 28 Dec 2017 21:35:32 +0000 (13:35 -0800)]
Camera: Fix Hidl metadata section generation
- Fix name collision related to metadata section
- Fix fully qualified metadata name for ANDROID_SECTION_COUNT
Test: Run hidl-gen with added new metadata sections
Bug:
71388767
Change-Id: I59bc4494b81b1e7207796f2597cc20516fa64fcd