OSDN Git Service

android-x86/system-media.git
6 years agocamera: Update logical multi-camera requirement
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

6 years agoSnap for 4600820 from baf8047969e6e837c8089cfffa666cd3d291ff6a to pi-release
android-build-team Robot [Tue, 13 Feb 2018 08:34:44 +0000 (08:34 +0000)]
Snap for 4600820 from baf8047969e6e837c8089cfffa666cd3d291ff6a to pi-release

Change-Id: I5c7c8ddfd5dd272567baf9f9a64ad325dfd21040

6 years agoCamera: Revise MOTION_TRACKING capability
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

6 years agoSnap for 4598635 from 57b1a00e26d2c93d40236184776433a3e686e50c to pi-release
android-build-team Robot [Sun, 11 Feb 2018 08:21:12 +0000 (08:21 +0000)]
Snap for 4598635 from 57b1a00e26d2c93d40236184776433a3e686e50c to pi-release

Change-Id: Ifb08d3dcba054bafd8f7ec3f7180c9d0c5ab1c8c

6 years agoCamera: Update documentation for AF_REGIONS metadata
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

6 years agoMerge "Pull out commonly used constants to <audio_utils/clock.h>"
Glenn Kasten [Thu, 8 Feb 2018 20:48:08 +0000 (20:48 +0000)]
Merge "Pull out commonly used constants to <audio_utils/clock.h>"

6 years agocamera: Remove physical requests streaming restriction
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

6 years agoSnap for 4585119 from b156863f3bea4f4c769cd3ebbf5376286ced6482 to pi-release
android-build-team Robot [Mon, 5 Feb 2018 08:23:37 +0000 (08:23 +0000)]
Snap for 4585119 from b156863f3bea4f4c769cd3ebbf5376286ced6482 to pi-release

Change-Id: I080b94bffec96265cf4b003119dfb4ee890fe7b6

6 years agoMerge "Fix typos in audio.h"
Ricardo Garcia [Fri, 2 Feb 2018 18:40:14 +0000 (18:40 +0000)]
Merge "Fix typos in audio.h"

6 years agoMerge "Add presentation and program id keys"
Mikhail Naganov [Thu, 1 Feb 2018 16:46:07 +0000 (16:46 +0000)]
Merge "Add presentation and program id keys"

6 years agoFix typos in audio.h
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

6 years agoPull out commonly used constants to <audio_utils/clock.h>
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

6 years agoSnap for 4565898 from 6675c47787f9df43005bde5156437734d6ca1a30 to pi-release
android-build-team Robot [Thu, 25 Jan 2018 09:06:58 +0000 (09:06 +0000)]
Snap for 4565898 from 6675c47787f9df43005bde5156437734d6ca1a30 to pi-release

Change-Id: I2ce1dfea248e7bbfd406e636cbb4f397a7247e9d

6 years agoFix error type in microphone characteristics.
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

6 years agoAdd presentation and program id keys
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>
6 years agoSnap for 4562879 from f18b90b22caa137bd7903a22b71db51b3e509752 to pi-release
android-build-team Robot [Wed, 24 Jan 2018 08:23:02 +0000 (08:23 +0000)]
Snap for 4562879 from f18b90b22caa137bd7903a22b71db51b3e509752 to pi-release

Change-Id: I37732cd209dfc36755daf5d0a6ac9d71f2062e9e

6 years agoMerge "Revert "Audio V4: Split system and vendor Audio.h""
Kevin Rocard [Wed, 24 Jan 2018 06:26:16 +0000 (06:26 +0000)]
Merge "Revert "Audio V4: Split system and vendor Audio.h""

6 years agoRevert "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

6 years agoMerge "Audio V4: Split system and vendor Audio.h"
Kevin Rocard [Wed, 24 Jan 2018 04:04:47 +0000 (04:04 +0000)]
Merge "Audio V4: Split system and vendor Audio.h"

6 years agoAdditional channel mapping data to microphone info structure
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

6 years agomerge in pi-release history after reset to master
gitbuildkicker [Tue, 23 Jan 2018 22:20:33 +0000 (14:20 -0800)]
merge in pi-release history after reset to master

6 years agomerge in pi-release history after reset to master
gitbuildkicker [Tue, 23 Jan 2018 20:15:04 +0000 (12:15 -0800)]
merge in pi-release history after reset to master

6 years agoSnap for 4560043 from 3f4db9977a6eac3e458a73398525f3025a1708ad to pi-release
android-build-team Robot [Tue, 23 Jan 2018 08:23:32 +0000 (08:23 +0000)]
Snap for 4560043 from 3f4db9977a6eac3e458a73398525f3025a1708ad to pi-release

Change-Id: I695cfa08831cc19864b2613b740e830dc917ab92

6 years agomerge in pi-release history after reset to master
gitbuildkicker [Tue, 23 Jan 2018 06:28:40 +0000 (22:28 -0800)]
merge in pi-release history after reset to master

6 years agoAudio V4: Split system and vendor Audio.h
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>
6 years agoMerge "camera: Modify AF scene change"
TreeHugger Robot [Tue, 23 Jan 2018 03:03:31 +0000 (03:03 +0000)]
Merge "camera: Modify AF scene change"

6 years agoMerge "Camera: Add available physical camera request keys"
Shuzhen Wang [Tue, 23 Jan 2018 00:36:16 +0000 (00:36 +0000)]
Merge "Camera: Add available physical camera request keys"

6 years agomerge in pi-release history after reset to master
gitbuildkicker [Tue, 23 Jan 2018 00:33:23 +0000 (16:33 -0800)]
merge in pi-release history after reset to master

6 years agoMerge "camera: Add OIS data keys"
TreeHugger Robot [Mon, 22 Jan 2018 23:22:30 +0000 (23:22 +0000)]
Merge "camera: Add OIS data keys"

6 years agoMerge "Manually add incall music output flag"
Nadav Bar [Mon, 22 Jan 2018 23:20:50 +0000 (23:20 +0000)]
Merge "Manually add incall music output flag"

6 years agoMerge "Camera: Add static metadata for logical camera"
Shuzhen Wang [Mon, 22 Jan 2018 20:30:15 +0000 (20:30 +0000)]
Merge "Camera: Add static metadata for logical camera"

6 years agoMerge "Camera: add new EXTERNAL hardware level"
Yin-Chia Yeh [Mon, 22 Jan 2018 19:55:20 +0000 (19:55 +0000)]
Merge "Camera: add new EXTERNAL hardware level"

6 years agoManually add incall music output flag
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

6 years agoMerge "Add support of getting all available microphones characteristics."
TreeHugger Robot [Mon, 22 Jan 2018 19:20:32 +0000 (19:20 +0000)]
Merge "Add support of getting all available microphones characteristics."

6 years agoAdd 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

6 years agoCamera: Add available physical camera request keys
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

6 years agoSnap for 4557233 from 6c90ed9338d0599de4f5a26fbdf31a14d0becaae to pi-release
android-build-team Robot [Sun, 21 Jan 2018 08:26:15 +0000 (08:26 +0000)]
Snap for 4557233 from 6c90ed9338d0599de4f5a26fbdf31a14d0becaae to pi-release

Change-Id: Ic8208335ef313031a2ca77426d19c7f7a41a9745

6 years agoCamera: Add static metadata for logical camera
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

6 years agocamera: Modify AF scene change
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

6 years agoCamera: add new EXTERNAL hardware level
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

6 years agocamera: Add OIS data keys
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

6 years agoMerge "camera: Add external flash mode key"
TreeHugger Robot [Fri, 19 Jan 2018 04:19:23 +0000 (04:19 +0000)]
Merge "camera: Add external flash mode key"

6 years agoSnap for 4551672 from 17324ba13c617109f8b6278de37f1331f1e8e121 to pi-release
android-build-team Robot [Thu, 18 Jan 2018 08:25:55 +0000 (08:25 +0000)]
Snap for 4551672 from 17324ba13c617109f8b6278de37f1331f1e8e121 to pi-release

Change-Id: I0e56198bb8395e9a3f90cf7a49b62511ea7e33f2

6 years agocamera: 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

6 years agocamera: Correct 'availableSessionKeys' version
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

6 years agoSnap for 4535700 from 808558e046163c11fb82af52925ce8e5d788991f to pi-release
android-build-team Robot [Wed, 10 Jan 2018 08:28:47 +0000 (08:28 +0000)]
Snap for 4535700 from 808558e046163c11fb82af52925ce8e5d788991f to pi-release

Change-Id: I1dcd37f17a7b5d424c9c7276398ac7720bb70523

6 years agoSnap for 4531101 from 218925a9db3a317136595b9751b4a4297cca0715 to pi-release
android-build-team Robot [Sun, 7 Jan 2018 08:31:43 +0000 (08:31 +0000)]
Snap for 4531101 from 218925a9db3a317136595b9751b4a4297cca0715 to pi-release

Change-Id: Ib53413296d04a5745e35adb63d83b410e3d779ce

6 years agoCamera: Add MOTION_TRACKING capability/intent, and lens poseReference
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

6 years agocamera: Add device info version
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

6 years agoSnap for 4523885 from 5fb920ec5437f3335b6077a73c9f6421aa0d7894 to pi-release
android-build-team Robot [Wed, 3 Jan 2018 08:21:32 +0000 (08:21 +0000)]
Snap for 4523885 from 5fb920ec5437f3335b6077a73c9f6421aa0d7894 to pi-release

Change-Id: I7a6533feaa5d9a32a1bbd95ec689615cab967041

6 years agoCamera: Fix Hidl metadata section generation
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

6 years agoSnap for 4517567 from 094aa577e5d6f3e63c2294bd26a3f18f85f9c65d to pi-release
android-build-team Robot [Sun, 24 Dec 2017 08:34:13 +0000 (08:34 +0000)]
Snap for 4517567 from 094aa577e5d6f3e63c2294bd26a3f18f85f9c65d to pi-release

Change-Id: Id9012dbe14163b8cae35fec405ea87fd05d5e0be

6 years agoMerge "camera metadata: Add support for session parameter keys"
TreeHugger Robot [Fri, 22 Dec 2017 19:18:45 +0000 (19:18 +0000)]
Merge "camera metadata: Add support for session parameter keys"

6 years agoMerge "Camera: Add support for HAL-versioned enum values"
TreeHugger Robot [Fri, 22 Dec 2017 00:16:57 +0000 (00:16 +0000)]
Merge "Camera: Add support for HAL-versioned enum values"

6 years agoCamera: Add support for HAL-versioned enum values
Eino-Ville Talvala [Thu, 7 Dec 2017 21:06:05 +0000 (13:06 -0800)]
Camera: Add support for HAL-versioned enum values

- Add hal_version to enum value fields as well, and add it to various doc outputs
- Improve HIDL metadata generation to work better with hidl-doc, and properly handle
  enum value additions in new hal versions
- Enable HIDL HAL 3.3 output

Test: Builds, hidl-gen/hidl-doc are happy with the HIDL output
Bug: 63629224
Change-Id: I64b31d9e8e6eda41268df0fc95962b52fcce7fee

6 years agoMerge "Fix integer sanitizer in audio_route_update_path." am: a2c091b0f5 am: de301d6bbb
Ivan Lozano [Wed, 20 Dec 2017 16:06:23 +0000 (16:06 +0000)]
Merge "Fix integer sanitizer in audio_route_update_path." am: a2c091b0f5 am: de301d6bbb
am: d7c33dd402  -s ours

Change-Id: I96f98f96ecc73492fa3ec5fb205a991351d621a3

6 years agoMerge "Fix integer sanitizer in audio_route_update_path." am: a2c091b0f5
Ivan Lozano [Wed, 20 Dec 2017 16:04:20 +0000 (16:04 +0000)]
Merge "Fix integer sanitizer in audio_route_update_path." am: a2c091b0f5
am: de301d6bbb

Change-Id: I0167f99b21e47d7cf295e531e77deea5515d1eb6

6 years agoMerge "Fix integer sanitizer in audio_route_update_path."
Ivan Lozano [Wed, 20 Dec 2017 16:01:50 +0000 (16:01 +0000)]
Merge "Fix integer sanitizer in audio_route_update_path."
am: a2c091b0f5

Change-Id: I69fd85d18dd0bd7243924ca9949916593e9fdfd7

6 years agoMerge "Fix integer sanitizer in audio_route_update_path."
Ivan Lozano [Wed, 20 Dec 2017 15:55:06 +0000 (15:55 +0000)]
Merge "Fix integer sanitizer in audio_route_update_path."

6 years agoFix integer sanitizer in audio_route_update_path.
Ivan Lozano [Wed, 6 Dec 2017 21:09:08 +0000 (13:09 -0800)]
Fix integer sanitizer in audio_route_update_path.

Calculating i could sometimes cause an unsigned integer overflow, which
led to runtime errors on integer sanitized builds.

 runtime error: unsigned integer overflow: 0 - 1 cannot be represented in
 type 'unsigned int'

This refactors the loop to avoid the overflow.

Bug: 30969751
Test: Compiles and device boots.
Change-Id: I468d064eda5213fd773a094412cd669fc23617dc
Merged-In: I468d064eda5213fd773a094412cd669fc23617dc

6 years agoSnap for 4500033 from 25cabed6c9a47c6c05a31daac2bfa5bd916ced5f to pi-release
android-build-team Robot [Wed, 13 Dec 2017 08:34:54 +0000 (08:34 +0000)]
Snap for 4500033 from 25cabed6c9a47c6c05a31daac2bfa5bd916ced5f to pi-release

Change-Id: I8a4dc7eb42628214c6c7515518132ceac6f19839

6 years agoMerge "Fix integer sanitizer in audio_route_update_path."
Ivan Lozano [Wed, 13 Dec 2017 01:06:40 +0000 (01:06 +0000)]
Merge "Fix integer sanitizer in audio_route_update_path."

6 years agocamera metadata: Add support for session parameter keys
Emilian Peev [Fri, 17 Nov 2017 13:20:12 +0000 (13:20 +0000)]
camera metadata: Add support for session parameter keys

"availableRequestKeys" can be used by Hals to list any
available capture request keys suitable as session wide
parameters.

Bug: 64450664
Test: Camera CTS
Change-Id: Ia05153abf2e2d5cd4e886307f6f147edd8f31160

6 years agoSnap for 4496165 from 676329b96e7519def7ac08cf2c4b53c4a0424994 to pi-release
android-build-team Robot [Mon, 11 Dec 2017 12:15:22 +0000 (12:15 +0000)]
Snap for 4496165 from 676329b96e7519def7ac08cf2c4b53c4a0424994 to pi-release

Change-Id: I1b5901f18e0d0ab10c40beba363a985c3a2a3289

6 years agoMerge "Camera: Generate HIDL metadata modules"
TreeHugger Robot [Sat, 9 Dec 2017 00:10:34 +0000 (00:10 +0000)]
Merge "Camera: Generate HIDL metadata modules"

6 years agoMerge "Add adjust_selected_channels for audio conversion"
Andy Hung [Fri, 8 Dec 2017 04:44:29 +0000 (04:44 +0000)]
Merge "Add adjust_selected_channels for audio conversion"

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master" am: 7f95a5e31f -s ours am: c4a8bb2083
Xin Li [Fri, 8 Dec 2017 04:32:43 +0000 (04:32 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 7f95a5e31f  -s ours am: c4a8bb2083
am: d7ffb719af  -s ours

Change-Id: Iae682061a0d6ac2d20fdb27dc465391bccc2b9fd

6 years agoManually merge changes from giant AOSP topic
Stephen Li [Thu, 7 Dec 2017 23:56:23 +0000 (23:56 +0000)]
Manually merge changes from giant AOSP topic

Change-Id: I117d92163f035ad486609c0e9a7553a1dd57096f

6 years agoFix integer sanitizer in audio_route_update_path.
Ivan Lozano [Wed, 6 Dec 2017 21:09:08 +0000 (13:09 -0800)]
Fix integer sanitizer in audio_route_update_path.

Calculating i could sometimes cause an unsigned integer overflow, which
led to runtime errors on integer sanitized builds.

 runtime error: unsigned integer overflow: 0 - 1 cannot be represented in
 type 'unsigned int'

This refactors the loop to avoid the overflow.

Bug: 30969751
Test: Compiles and device boots.
Change-Id: I468d064eda5213fd773a094412cd669fc23617dc

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master" am: 7f95a5e31f -s ours
Xin Li [Thu, 7 Dec 2017 19:32:19 +0000 (19:32 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 7f95a5e31f  -s ours
am: c4a8bb2083

Change-Id: I338fcdc0e925551e95e073956e3dc699a9331f78

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Thu, 7 Dec 2017 19:16:30 +0000 (19:16 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: 7f95a5e31f  -s ours

Change-Id: I829dc0994801fdb027764ef0291e36e349fd7212

6 years agoDO NOT MERGE: Merge Oreo MR1 into master am: d481b28a58 -s ours
Xin Li [Thu, 7 Dec 2017 07:23:57 +0000 (07:23 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am: d481b28a58  -s ours
am: 7f1905e2a2

Change-Id: Id20ac9fc2e87bc5a91aa0dcdfffc7c5b003f0249

6 years agoDO NOT MERGE: Merge Oreo MR1 into master
Xin Li [Thu, 7 Dec 2017 04:51:27 +0000 (04:51 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am: d481b28a58  -s ours

Change-Id: I8e2ec84d8e11217b94c2d7bda627be6ba27b3453

6 years agoAdd adjust_selected_channels for audio conversion
Andy Hung [Fri, 1 Dec 2017 21:24:52 +0000 (13:24 -0800)]
Add adjust_selected_channels for audio conversion

Used for multichannel effects.

Test: channels_tests
Bug: 70038539
Change-Id: I9e80d2f0565f3eff8623f01260850c628b18c3a5

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 23:18:27 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"

6 years agoDO NOT MERGE: Merge Oreo MR1 into master
Xin Li [Wed, 6 Dec 2017 19:52:23 +0000 (11:52 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I3bc6715898ae3e9f1b1b98901d419e5101ffbfc4

6 years agoSnap for 4486962 from b8c6828db40f28b1f130b69dd2a3ddf414acd540 to pi-release
android-build-team Robot [Wed, 6 Dec 2017 08:21:53 +0000 (08:21 +0000)]
Snap for 4486962 from b8c6828db40f28b1f130b69dd2a3ddf414acd540 to pi-release

Change-Id: I338c355c55d6fad318f1704df8839b8787930ed8

6 years agoCamera: Generate HIDL metadata modules
Eino-Ville Talvala [Fri, 17 Nov 2017 22:48:20 +0000 (14:48 -0800)]
Camera: Generate HIDL metadata modules

- Add HidlMetadata.mako template for creating HIDL types.hal files
- Add necessary helpers and model properties to easily find sections and entries added in a given
  HIDL version
- Ensure the HIDL version also shows up in the first entry of each section in the camera_metadata
  C headers
- Add HIDL output to metadata-generate (though each new HIDL version needs to have a few lines added)

Bug: 33262893
Test: Verify generated HIDL output manually, build, and HIDL built-in sanity checks.
  Add a few test entries and sections with different HIDL versions to see that generated code is right.
Change-Id: I9ee3b0839bab4b3efed415dab4208bacdbad56b1

6 years agocamera: Add AF scene change
Chien-Yu Chen [Tue, 28 Nov 2017 00:12:38 +0000 (16:12 -0800)]
camera: Add AF scene change

Test: CTS
Bug: 64847201
Change-Id: Ia467978f57fece776c65c85d390030c02bade081

6 years agoSnap for 4476081 from 0ebba4b4d91663d02bd759bdb65ae528e3e78dc7 to pi-release
android-build-team Robot [Thu, 30 Nov 2017 08:49:01 +0000 (08:49 +0000)]
Snap for 4476081 from 0ebba4b4d91663d02bd759bdb65ae528e3e78dc7 to pi-release

Change-Id: I9031a19614d6943cb5dba051fd1f0b8073dc4a42

6 years agoUpdate audio primitives for floating point conversion speed
Andy Hung [Sat, 18 Nov 2017 00:02:19 +0000 (16:02 -0800)]
Update audio primitives for floating point conversion speed

Floats now round-half-up instead of round-half-to-even.
This returns 25% gain in performance for slightly worse rounding.

Also a cosmetic change to convert an if to an add with boolean.

Bug: 69479669
Test: primitives_tests
Change-Id: I15dc17f5732e41594c23831622d0c1642881a711

6 years agoSnap for 4471243 from 62c3d9faa33b2dfc9cc1a6b6c501190005593715 to pi-release
android-build-team Robot [Tue, 28 Nov 2017 08:34:11 +0000 (08:34 +0000)]
Snap for 4471243 from 62c3d9faa33b2dfc9cc1a6b6c501190005593715 to pi-release

Change-Id: I814eba6e8226d959a462df4b287d262985cf5dc3

6 years agoDeprecate ditherAndClamp with memcpy_to_i16_from_q4_27
Andy Hung [Wed, 22 Nov 2017 00:36:41 +0000 (16:36 -0800)]
Deprecate ditherAndClamp with memcpy_to_i16_from_q4_27

Test: primitives_tests
Bug: 69636805
Change-Id: I012d0cab85ce09125bc5c1eed3cdd9e4c9e4ee25

6 years agoSnap for 4464948 from 32954a16d6db2b81ba27039eff44a19db0097f07 to pi-release
android-build-team Robot [Wed, 22 Nov 2017 08:22:44 +0000 (08:22 +0000)]
Snap for 4464948 from 32954a16d6db2b81ba27039eff44a19db0097f07 to pi-release

Change-Id: Ie8c6a5623acfca9fe0a78805a2f45d43639e1dc6

6 years agoMerge "Allow in-place audio primitive operations."
Andy Hung [Wed, 22 Nov 2017 01:50:17 +0000 (01:50 +0000)]
Merge "Allow in-place audio primitive operations."

6 years agoMerge "Update audio primitives to avoid unsigned overflow"
Andy Hung [Tue, 21 Nov 2017 23:41:16 +0000 (23:41 +0000)]
Merge "Update audio primitives to avoid unsigned overflow"

6 years agoSnap for 4459973 from c8df8b0428ea05835bf6c8fcd4c8c39535abc925 to pi-release
android-build-team Robot [Sun, 19 Nov 2017 08:25:27 +0000 (08:25 +0000)]
Snap for 4459973 from c8df8b0428ea05835bf6c8fcd4c8c39535abc925 to pi-release

Change-Id: I7e522a344c931002f573a9bccb9aef712c1c7e29

6 years agoAllow in-place audio primitive operations.
Andy Hung [Fri, 17 Nov 2017 23:54:27 +0000 (15:54 -0800)]
Allow in-place audio primitive operations.

Difference in performance is negligible ~ 2% loss going reverse.

Test: primitives_tests
Bug: 69478507
Change-Id: I39522f45d81956e1108276161ce4a92fc0ab3fba

6 years agoUpdate audio primitives to avoid unsigned overflow
Andy Hung [Fri, 17 Nov 2017 23:46:55 +0000 (15:46 -0800)]
Update audio primitives to avoid unsigned overflow

Test: Native primitive_tests
Bug: 69478245
Change-Id: I5beeecbb06dfd287cb1953ebb7b2208667c84d37

6 years agoMerge "audio: Add constant for MSD HAL service name"
TreeHugger Robot [Fri, 17 Nov 2017 18:26:34 +0000 (18:26 +0000)]
Merge "audio: Add constant for MSD HAL service name"

6 years agoaudio: Add constant for MSD HAL service name
Mikhail Naganov [Thu, 16 Nov 2017 17:41:34 +0000 (09:41 -0800)]
audio: Add constant for MSD HAL service name

The constant is used both by the MSD HAL service to register
itself, and by audioserver in order to discover it.

Bug: 63901775
Test: build
Change-Id: I78a513de501dda1bbd6742298af78de485c7b325

6 years agoMerge "audio: make audio_attributes_t packed"
TreeHugger Robot [Fri, 17 Nov 2017 01:32:27 +0000 (01:32 +0000)]
Merge "audio: make audio_attributes_t packed"

6 years agoMerge "Fix audio_config size difference between 32 and 64 bit."
TreeHugger Robot [Fri, 17 Nov 2017 01:31:08 +0000 (01:31 +0000)]
Merge "Fix audio_config size difference between 32 and 64 bit."

6 years agoaudio: make audio_attributes_t packed
Eric Laurent [Thu, 16 Nov 2017 19:38:34 +0000 (11:38 -0800)]
audio: make audio_attributes_t packed

Make struct audio_attributes packed as it is passed over binder

Test: AudioTrack CTS test
Change-Id: I51b1ef0f035ee078338482514723aaf0fb1de6c2

6 years agoMerge "Camera: Fix up metadata generation, including HIDL gen"
TreeHugger Robot [Thu, 16 Nov 2017 18:29:43 +0000 (18:29 +0000)]
Merge "Camera: Fix up metadata generation, including HIDL gen"

6 years agoSnap for 4455093 from 4db50570f65ca933fe33b347f53dbd9a90f17ea6 to pi-release
android-build-team Robot [Thu, 16 Nov 2017 08:23:31 +0000 (08:23 +0000)]
Snap for 4455093 from 4db50570f65ca933fe33b347f53dbd9a90f17ea6 to pi-release

Change-Id: I4dd91e358fdcb597b8791574c37debc2b9f41e6c

6 years agoCamera: Fix up metadata generation, including HIDL gen
Eino-Ville Talvala [Fri, 10 Nov 2017 23:13:04 +0000 (15:13 -0800)]
Camera: Fix up metadata generation, including HIDL gen

- Merge NDK and SDK metadata definitions back together
  - Add special linkify handling for SDK/NDK alternate names
  - Add ndk/sdk specific notes/details tags
  - Use new tags/link format to merge ndk_metadata_properties docs
    into metadata_properties
- Rename metadata_properties to metadata_definitions for clarity
- Move SDK reference images to /reference/images/camera2/...
- Add HIDL metadata HAL field to entries, defaulting to 3.2
- Output HAL version into docs.html and camera_metadata_tags.h

Outputting new HIDL module defintions for new metadata versions will
be in a later CL.

Bug: 29102963
Bug: 33262893
Test: Builds, manual inspection of resulting generated files
Change-Id: Ib61111ebf3a068fe62b7a3305b6ab462619c39bb

6 years agoDisable audio primitive benchmark on darwin
Kevin Rocard [Wed, 15 Nov 2017 17:09:29 +0000 (09:09 -0800)]
Disable audio primitive benchmark on darwin

The benchmark depends on external/google-benchmark that is disabled on
darwin.
As a result the audio primitive benchmark fails to build on this target
and broke the build.
Test: build sdk_phone_armv7-sdk on the build server
BZ: none, fix broken master
Change-Id: I4f22bf3481749c576e28089480cff8d618a2b7b8
Signed-off-by: Kevin Rocard <krocard@google.com>
6 years agoSnap for 4453288 from 8ad6cea5978252e41f9147d7215a4e415296e0a4 to pi-release
android-build-team Robot [Wed, 15 Nov 2017 08:33:39 +0000 (08:33 +0000)]
Snap for 4453288 from 8ad6cea5978252e41f9147d7215a4e415296e0a4 to pi-release

Change-Id: I0852840a5b6704a686c116d0ae8b9f2fbcaf154b

6 years agoMerge "audio_utils primitives: Add float clamping memcopy"
TreeHugger Robot [Wed, 15 Nov 2017 04:51:31 +0000 (04:51 +0000)]
Merge "audio_utils primitives: Add float clamping memcopy"