OSDN Git Service
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
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
TreeHugger Robot [Fri, 22 Dec 2017 19:18:45 +0000 (19:18 +0000)]
Merge "camera metadata: Add support for session parameter keys"
TreeHugger Robot [Fri, 22 Dec 2017 00:16:57 +0000 (00:16 +0000)]
Merge "Camera: 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
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
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
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
Ivan Lozano [Wed, 20 Dec 2017 15:55:06 +0000 (15:55 +0000)]
Merge "Fix 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
Ivan Lozano [Wed, 13 Dec 2017 01:06:40 +0000 (01:06 +0000)]
Merge "Fix integer sanitizer in audio_route_update_path."
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
TreeHugger Robot [Sat, 9 Dec 2017 00:10:34 +0000 (00:10 +0000)]
Merge "Camera: Generate HIDL metadata modules"
Andy Hung [Fri, 8 Dec 2017 04:44:29 +0000 (04:44 +0000)]
Merge "Add adjust_selected_channels for audio conversion"
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
Stephen Li [Thu, 7 Dec 2017 23:56:23 +0000 (23:56 +0000)]
Manually merge changes from giant AOSP topic
Change-Id: I117d92163f035ad486609c0e9a7553a1dd57096f
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
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
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
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
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
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
Xin Li [Wed, 6 Dec 2017 23:18:27 +0000 (23:18 +0000)]
Merge "DO 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
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
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
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
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
Andy Hung [Wed, 22 Nov 2017 01:50:17 +0000 (01:50 +0000)]
Merge "Allow in-place audio primitive operations."
Andy Hung [Tue, 21 Nov 2017 23:41:16 +0000 (23:41 +0000)]
Merge "Update audio primitives to avoid unsigned overflow"
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
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
TreeHugger Robot [Fri, 17 Nov 2017 18:26:34 +0000 (18:26 +0000)]
Merge "audio: 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
TreeHugger Robot [Fri, 17 Nov 2017 01:32:27 +0000 (01:32 +0000)]
Merge "audio: make audio_attributes_t packed"
TreeHugger Robot [Fri, 17 Nov 2017 01:31:08 +0000 (01:31 +0000)]
Merge "Fix audio_config size difference between 32 and 64 bit."
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
TreeHugger Robot [Thu, 16 Nov 2017 18:29:43 +0000 (18:29 +0000)]
Merge "Camera: 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
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>
TreeHugger Robot [Wed, 15 Nov 2017 04:51:31 +0000 (04:51 +0000)]
Merge "audio_utils primitives: Add float clamping memcopy"
Kevin Rocard [Fri, 10 Nov 2017 06:12:51 +0000 (22:12 -0800)]
audio_utils primitives: Add float clamping memcopy
For security reason, float buffers provided by application must be
clamped to FLOAT_NOMINAL_RANGE_HEADROOM.
With the new all float pipeline, float are no longer clamped by their
conversion to fixed point.
This patch adds a function to efficiently clamp a buffer during a
memcopy.
Test: adb shell /system/bin/primitives_benchmark
Test: adb shell /data/nativetest/primitives_tests/primitives_tests --gtest_filter=*Clamping*
Bug:
68099072
Change-Id: I030b247ea29cb94c62d1206c31960f45da2446e6
Signed-off-by: Kevin Rocard <krocard@google.com>
Andy Hung [Tue, 14 Nov 2017 22:38:39 +0000 (22:38 +0000)]
Merge "Added float pointer to audio_buffer_s"
Emilian Peev [Wed, 8 Nov 2017 09:22:47 +0000 (09:22 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb am:
3fdaebe730 am:
9b1ebd3fba am:
a98aeeb454 am:
852082d995 am:
451248f8cf am:
ad0fcdf98e am:
76107db984
am:
620bb1bd8c
Change-Id: I774b39090ec78b021d33e722f41ac625c8d88256
Emilian Peev [Wed, 8 Nov 2017 09:20:56 +0000 (09:20 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb am:
3fdaebe730 am:
9b1ebd3fba am:
a98aeeb454 am:
852082d995 am:
451248f8cf am:
ad0fcdf98e
am:
76107db984
Change-Id: Icf366ee9975281f7721338237000c86788033fb3
Emilian Peev [Wed, 8 Nov 2017 09:18:46 +0000 (09:18 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb am:
3fdaebe730 am:
9b1ebd3fba am:
a98aeeb454 am:
852082d995 am:
451248f8cf
am:
ad0fcdf98e
Change-Id: I39fb59ede8d8d80420d94cdecbf7753fde081b53
Emilian Peev [Wed, 8 Nov 2017 09:17:17 +0000 (09:17 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb am:
3fdaebe730 am:
9b1ebd3fba am:
a98aeeb454 am:
852082d995
am:
451248f8cf
Change-Id: I859f983afd66dedb1b924601cdcd86b0221ae40c
Emilian Peev [Wed, 8 Nov 2017 09:15:17 +0000 (09:15 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb am:
3fdaebe730 am:
9b1ebd3fba am:
a98aeeb454
am:
852082d995
Change-Id: I86ea2b4fc41e72c15ac826a2b26a44f2eff8d595
Emilian Peev [Wed, 8 Nov 2017 09:13:43 +0000 (09:13 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb am:
3fdaebe730 am:
9b1ebd3fba
am:
a98aeeb454
Change-Id: Ic8018da777692c09296dd37e1300273fcd23df15
Emilian Peev [Wed, 8 Nov 2017 09:11:43 +0000 (09:11 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb am:
3fdaebe730
am:
9b1ebd3fba
Change-Id: I7a12ed947dc72e7fdfd36426ca8f849ff6bb0c03
Emilian Peev [Wed, 8 Nov 2017 09:09:44 +0000 (09:09 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb
am:
3fdaebe730
Change-Id: Ie70ae750d490da65efb0c9374390a0c23efc44f4
Emilian Peev [Wed, 8 Nov 2017 09:07:16 +0000 (09:07 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066
am:
c5fe6aefeb
Change-Id: Ib84080a0f82b66249c18bad37bb0cac75dcda40f
Emilian Peev [Wed, 8 Nov 2017 09:05:15 +0000 (09:05 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905
am:
7a854a6066
Change-Id: Ie73f3adb4ea0314d3549ced7aa2be2142499c383
Emilian Peev [Wed, 8 Nov 2017 09:03:10 +0000 (09:03 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407
am:
e1d6665905
Change-Id: Iafcf491f2b32917125541a2da4f262d4a745554c
Emilian Peev [Wed, 8 Nov 2017 09:00:42 +0000 (09:00 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6
am:
6dc0f83407
Change-Id: Ib4986884c9fe83017ee67d544ef6ef549c042cfc
Emilian Peev [Wed, 8 Nov 2017 08:58:10 +0000 (08:58 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf
am:
90045db6e6
Change-Id: Idfc8486d568546bc889cd1456a14ae9861359740
Emilian Peev [Wed, 8 Nov 2017 08:55:39 +0000 (08:55 +0000)]
Camera metadata: Check source metadata size
am:
489bbd13bf
Change-Id: I3664526ef2de813ea2b1c303a53d55246c1b370b
rago [Thu, 2 Nov 2017 22:53:09 +0000 (15:53 -0700)]
Added float pointer to audio_buffer_s
Used for all floating point effect chains
Bug:
63935479
Test: Bufflog dumps, frequency analysis comparison, SoloTester
Change-Id: I70e61e0781e8dce684e8b81b4c8eacee83339277
Emilian Peev [Mon, 6 Nov 2017 10:41:19 +0000 (10:41 +0000)]
Camera metadata: Check source metadata size
Source size passed by client could be smaller than 'camera_metadata_t'.
In this case the cast in 'allocate_copy_camera_metadata_checked()' will
be incorrect and we will try to access invalid heap memory.
Bug:
67782345
Test: Camera CTS
Change-Id: I9582c704f414493978d09ffb603b5e8368cda5ce
Andy Hung [Sat, 28 Oct 2017 03:20:27 +0000 (20:20 -0700)]
Add const qualifiers to alsa device profile.
Test: make
Bug:
68211730
Change-Id: I97e5ca3bded99f7005332b38d9e6aa33a6cc271d
Dan Albert [Thu, 12 Oct 2017 02:22:07 +0000 (02:22 +0000)]
Merge "Add missing includes." am:
b81a57f4a4 am:
56f00a0b6a am:
76aa001add
am:
639ea04ac2
Change-Id: I87abcfe9d5a2c8d599e3340359668f587d3c0086