Commit graph

4760 commits

Author SHA1 Message Date
TreeHugger Robot
6accb1de92 Merge "camera 3_4: Fix compilation errors" 2018-01-24 23:10:34 +00:00
Dmitry Shmidt
9df082e933 camera 3_4: Fix compilation errors
Compile Error:
hardware/libhardware/modules/camera/3_4/camera.cpp:502:9: error: non-constant-expression cannot be narrowed from type 'std::__1::vector<camera3_stream_buffer, std::__1::allocator<camera3_stream_buffer> >::size_type' (aka 'unsigned long') to 'uint32_t' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]
        request->output_buffers.size(),
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Test: Add to device.mk
        USE_CAMERA_V4L2_HAL := true
        PRODUCT_PACKAGES += camera.v4l2
      mma

Change-Id: Ia6bbd6bac06540214d2c6167a8826f3f4c946e57
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2018-01-24 12:34:00 -08:00
TreeHugger Robot
a6e13b1c1d Merge "[HWC] Add setLayerFloatColor API." 2018-01-24 18:19:19 +00:00
Peiyong Lin
fd05d13edc [HWC] Add setLayerFloatColor API.
This patch adds the struct of float color, and setLayerFloatColor API so that
SurfaceFlinger can set the layer color with more bits on each channel.
Currently the display calibration tool require 10-bits support.

BUG: 69970838
Test: make locally and applied on device
Change-Id: I8bab335cc4fbc41a3eb18306a8831d1e9a9a219a
2018-01-24 18:12:41 +00:00
Kevin Rocard
52a0dad79c Merge "Revert "Audio V4: Split system and vendor Audio.h"" 2018-01-24 06:26:16 +00:00
Kevin Rocard
c6ec9486d8 Revert "Audio V4: Split system and vendor Audio.h"
This reverts commit fc9e212f01.

Reason for revert: Breaks multiple devices

Change-Id: I816671fd92246f85c97d00819858a74e36e2929d
2018-01-24 06:04:27 +00:00
TreeHugger Robot
a03b72961d Merge "Camera3: Add new MOTION_TRACKING template enums" 2018-01-24 04:36:33 +00:00
Kevin Rocard
904511aaa2 Merge "Audio V4: Split system and vendor Audio.h" 2018-01-24 04:04:47 +00:00
Eino-Ville Talvala
cc1aa87b19 Camera3: Add new MOTION_TRACKING template enums
Bug: 70565622
Bug: 63629224
Test: Builds, CTS passes
Change-Id: I927776d042b74013cf24c342b107a5aee1ad26a2
2018-01-23 00:23:32 -08:00
Shuzhen Wang
8662c46d71 Merge "camera3: Extend camera capture request for multiple cameras" 2018-01-23 00:36:16 +00:00
Eino-Ville Talvala
34a97f80e2 Add camera-specific OWNER
Test: Builds
Change-Id: I86a08e487745640858028dd24f01e8f2c35aebca
2018-01-22 22:33:54 +00:00
Kevin Rocard
fc9e212f01 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>
2018-01-20 21:39:40 -08:00
Emilian Peev
92261ffa2e camera3: Extend camera capture request for multiple cameras
The legacy camera 3.5 API should allow clients to set individual
settings for specific physical cameras that are part of
a logical multi-camera. 'camera3_capture_request_t' must
include additional arrays containing the required settings
and corresponding camera ids.

Test: Manual using camera application,
camera_client_test
Bug: 64691172

Change-Id: I634f1d5b87a6d97c5a35b8ea633c7a6c22793eaf
2018-01-19 17:28:28 +00:00
Shuzhen Wang
bf39eb54de camera3: Add logical camera support in HAL 3.5
- Add ability to specify the camera id to which a particular camera3_stream belongs.
- Update documentation about the camera characteristics of logical camera.

Test: Camera2.apk and GoogleCamera.apk
Bug: 64691172
Change-Id: Ie2e235e8bc8124596785db8dad25549bec4232aa
2018-01-18 16:53:49 -08:00
Hongwei Wang
1a9044eded Removes deprecated audio property in vehicle hal
Bug: 72054677
Test: lunch gcar_emu-x86 && m -j
Change-Id: Ia70bf17e0343704c5ca3468ad86145e7078696f7
2018-01-18 21:01:13 +00:00
TreeHugger Robot
b11abc155b Merge "Add KM_ALGORITHM_TRIPLE_DES to keymaster_defs.h" 2018-01-17 23:14:11 +00:00
Frank Salim
343f309e0a Add KM_PURPOSE_WRAP to keymaster_defs for wrapped key import
AndroidKeymaster depends on keymaster_defs and needs the new
purpose for secure key import.

Test: system/keymaster/tests/android_keymaster_tests

Change-Id: I8ab6d9756689342bc5865861c89c5ccc87179454
2018-01-16 13:43:29 -07:00
Shawn Willden
2b55708fbb Add KM_ALGORITHM_TRIPLE_DES to keymaster_defs.h
Test: system/keymaster unit tests
Change-Id: I1ed56e543b657155c9194bc30616747d51aef7df
2018-01-16 09:08:51 -07:00
Prashanth Swaminathan
28e0f76353 v4l2 camera: port ARC++ image processing code
Utiltizes ARC++ image processing code to perform the conversion between
the camera format and the requested format from the framework. In order
to support USB devices which may not implement the required formats,
conversion between YUYV/MJPEG to the request format is done on-the-fly.

TEST: All existing unit tests pass. Tested manually with the camera
sample APK, preview/video/capture in both JPEG and YUV formats. Tested
on the RPi v2 Camera, the Logitech C270 and the 180 degree Fisheye USB
camera.
Bug: 37708856, Bug: 69983918
Exempt-From-Owner-Approval: This HAL is owned by AT team.
Change-Id: I1a54581d1170fa3270036ec366fb613fe587a094
2018-01-10 12:39:23 +09:00
TreeHugger Robot
f78d716b89 Merge "Support native camera resolutions" 2018-01-04 06:31:28 +00:00
Josh Gao
9eb0a7b073 Merge "Don't TEMP_FAILURE_RETRY on close." am: e1c003dc11 am: 7f4b73fb1a
am: 619653d7b1

Change-Id: I1f896a59da33be27a5d81362a6a1897f0ec277cf
2017-12-29 00:29:48 +00:00
Josh Gao
619653d7b1 Merge "Don't TEMP_FAILURE_RETRY on close." am: e1c003dc11
am: 7f4b73fb1a

Change-Id: I4ebddbdb360c6c0ce6acede11badc38dc6a228ed
2017-12-29 00:26:46 +00:00
Josh Gao
7f4b73fb1a Merge "Don't TEMP_FAILURE_RETRY on close."
am: e1c003dc11

Change-Id: I0694ca58e011969346047b0c2cd5762714d3038d
2017-12-29 00:23:44 +00:00
Treehugger Robot
e1c003dc11 Merge "Don't TEMP_FAILURE_RETRY on close." 2017-12-29 00:19:21 +00:00
Josh Gao
09a3af5e11 Don't TEMP_FAILURE_RETRY on close.
close always succeeds, even if it was interrupted and "fails" with
EINTR. Retrying will either close a nonexistent fd or stomp on another
thread's newly opened file descriptor.

Bug: http://b/20501816
Test: treehugger
Change-Id: I706d5e8027e60b13f23f9488fdf5cf7cef7b3d3b
2017-12-28 14:21:32 -08:00
Dan Willemsen
844c74a750 Merge "Convert to Android.bp" am: 90e0a80af3 am: 243ba5e7b2
am: 90955e6a6a

Change-Id: I8e4e8c784b4e6630b7d062c4238d8c885111df30
2017-12-28 19:38:41 +00:00
Dan Willemsen
90955e6a6a Merge "Convert to Android.bp" am: 90e0a80af3
am: 243ba5e7b2

Change-Id: I8776702856a3fbfee5e316cf4eb04c99b2ef8c4d
2017-12-28 19:35:39 +00:00
Dan Willemsen
243ba5e7b2 Merge "Convert to Android.bp"
am: 90e0a80af3

Change-Id: Iad8ff5ed73ab4d7739e03962aa3ad6d6aa3e0361
2017-12-28 19:32:39 +00:00
Dan Willemsen
90e0a80af3 Merge "Convert to Android.bp" 2017-12-28 19:30:04 +00:00
Dan Willemsen
86e247ae89 Convert to Android.bp
See build/soong/README.md for more information

Test: mmma hardware/libhardware
Change-Id: Ibb7e2af9d55f581e951d8996cea5e52cd0766b04
2017-12-27 11:05:29 -08:00
Jaesung Chung
932d4dddd9 Support native camera resolutions
This CL makes camera HAL support native camera resoultions up to
3280x2464, which is the maximum camera resolution of RPi3's camera
module version two.

Bug: 69983703
Test: Verified with ThingsCameraQA.apk
Exempt-From-Owner-Approval: V4L2 camera HAL is owned by iot team.
Change-Id: I303e763e87bdfc5ae81d398aac8be0730e57b05d
2017-12-26 03:09:59 +00:00
TreeHugger Robot
6e63df7e51 Merge "camera: Bump device version to 3.5" 2017-12-22 19:18:45 +00:00
Chih-hung Hsieh
fbb4c361fb Merge "Allow warnings in modules/camera/3_4." am: 1d83294190 am: 37724db429
am: 94202cf12e

Change-Id: I714a5fcd60d00f2811d15be614229fa25d50ef85
2017-12-20 02:06:55 +00:00
Chih-hung Hsieh
94202cf12e Merge "Allow warnings in modules/camera/3_4." am: 1d83294190
am: 37724db429

Change-Id: If9cfc40c749bff7d11303543994fde9e2067838b
2017-12-20 02:04:24 +00:00
Chih-hung Hsieh
37724db429 Merge "Allow warnings in modules/camera/3_4."
am: 1d83294190

Change-Id: Ia309376d278d301efe087819705a61683824199d
2017-12-20 02:01:53 +00:00
Chih-hung Hsieh
1d83294190 Merge "Allow warnings in modules/camera/3_4." 2017-12-20 01:56:55 +00:00
Chih-Hung Hsieh
87ef6ef33d Allow warnings in modules/camera/3_4.
* This directory still has many warnings to fix.

Bug: 66996870
Test: normal build
Change-Id: I0e05b78eca9d58dc9081bb3810f5ccabadfc21a7
Exempt-From-Owner-Approval: quick fix for broken build
2017-12-19 17:52:51 -08:00
Chih-Hung Hsieh
3a549d438b Merge "Fix compiler warnings." am: 2623d1370f am: 8f7122a989
am: 28d9d65ffb

Change-Id: I981642310f1a0b7b49315d437c47a8070747fe6d
2017-12-20 00:19:36 +00:00
Chih-Hung Hsieh
28d9d65ffb Merge "Fix compiler warnings." am: 2623d1370f
am: 8f7122a989

Change-Id: Ia01a7af4254c05e41a0edde9b386ec6087dbc5b2
2017-12-20 00:17:38 +00:00
Chih-Hung Hsieh
8f7122a989 Merge "Fix compiler warnings."
am: 2623d1370f

Change-Id: I0905307275eb260a5ec762aa1ed101c00db36468
2017-12-20 00:15:08 +00:00
Treehugger Robot
2623d1370f Merge "Fix compiler warnings." 2017-12-20 00:08:36 +00:00
Chih-Hung Hsieh
5c0702fb58 Fix compiler warnings.
* Remove unused local variables, functions, and private fields.

Bug: 66996870
Test: normal build
Change-Id: I3a5d6035a61be1b846dc8df3807088d2ca5dc4a3
2017-12-19 13:42:15 -08:00
Chih-hung Hsieh
8a08e5eb54 Merge "Remove unused variables/labels to eliminate compile warnings." am: 0763ee2450 am: 162b68c26e
am: 6c8907b0ad

Change-Id: I29d361184a514cbecc658709e2a8ea08b0e3a20f
2017-12-19 01:53:29 +00:00
Chih-hung Hsieh
6c8907b0ad Merge "Remove unused variables/labels to eliminate compile warnings." am: 0763ee2450
am: 162b68c26e

Change-Id: I8ee42bb8fb7d3f1bdab46e77e2dbdfb6fded55ec
2017-12-19 01:51:26 +00:00
Chih-hung Hsieh
162b68c26e Merge "Remove unused variables/labels to eliminate compile warnings."
am: 0763ee2450

Change-Id: I39bf1bd9e6d8a316b9075e0a18091239b25ce989
2017-12-19 01:49:29 +00:00
Chih-hung Hsieh
0763ee2450 Merge "Remove unused variables/labels to eliminate compile warnings." 2017-12-19 01:41:17 +00:00
Chih-Hung Hsieh
3d38c60317 Remove unused variables/labels to eliminate compile warnings.
Test: built and run on Marlin and testing with various USB peripherals.
Bug:70180519
Merged-Id: I68d7d33ffff8983117508e02a76d62c71d708c76
(cherry picked from commit 96c4d3035a)

Change-Id: If2a11bb5e649472d8bc25b5804715d6da48e5330
2017-12-15 14:33:56 -08:00
Dan Albert
9babe2f429 Merge "Include what you use." am: 41f5958522 am: 70ca223c52
am: ed10f123a0

Change-Id: Icba9d1b62b9b1b96c2d46874e5153ce6beb819e8
2017-12-13 03:12:27 +00:00
Dan Albert
ed10f123a0 Merge "Include what you use." am: 41f5958522
am: 70ca223c52

Change-Id: Id361911c52069f66a70f07dfda6c9efa38e87f42
2017-12-13 02:45:21 +00:00
Dan Albert
70ca223c52 Merge "Include what you use."
am: 41f5958522

Change-Id: I2c0b508ce6fe7db9179582580253c0d6cd96a371
2017-12-13 02:08:57 +00:00