OSDN Git Service

android-x86/system-media.git
5 years agoMerge "Camera: Add support for camera HEIC output"
Shuzhen Wang [Thu, 7 Feb 2019 19:15:32 +0000 (19:15 +0000)]
Merge "Camera: Add support for camera HEIC output"

5 years agoMerge "Camera: Add SECURE camera capability."
Jayant Chowdhary [Tue, 5 Feb 2019 17:55:02 +0000 (17:55 +0000)]
Merge "Camera: Add SECURE camera capability."

5 years agoCamera: Add support for camera HEIC output
Shuzhen Wang [Sat, 29 Dec 2018 02:50:53 +0000 (18:50 -0800)]
Camera: Add support for camera HEIC output

To support HEIC, camera framework converts a HEIC stream to HAL
internal YUV_420_888/IMPLEMENTATION_DEFINED stream and
JPEG_APPS_SEGMENTS BLOB stream, and encode them into HEIC image via
HEIC/HEVC codec.

Test: testHeic CTS test
Bug: 79465976
Change-Id: I768c73df784d07d38a9db0024291064e52697800

5 years agoaudio: add utility to convert attributes flags to output flags
Eric Laurent [Sat, 2 Feb 2019 00:47:19 +0000 (16:47 -0800)]
audio: add utility to convert attributes flags to output flags

Test: make.
Change-Id: Idd99ec78eee6fe6adc18ec49f87f624d1bb34d2f

5 years agoBalance: Refine class, add ramping, fix multichannel position bug
Andy Hung [Mon, 28 Jan 2019 23:41:17 +0000 (15:41 -0800)]
Balance: Refine class, add ramping, fix multichannel position bug

Test: Change Balance through Settings, play audio
Bug: 28390736
Change-Id: I5619256cb0a7e124551a267525834d2cfffaf1c5

5 years agoCamera: Add SECURE camera capability.
Jayant Chowdhary [Fri, 25 Jan 2019 01:47:05 +0000 (17:47 -0800)]
Camera: Add SECURE camera capability.

Bug: 123046494

Test: builds

Change-Id: I88ae3a92bead06c17f18387491f97fa490cbe777
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
5 years agoMerge "Effects: add new effect volume flag"
Jasmine Cha [Tue, 29 Jan 2019 00:57:44 +0000 (00:57 +0000)]
Merge "Effects: add new effect volume flag"

5 years agoMerge "Camera: Add dynamic depth tags"
TreeHugger Robot [Mon, 28 Jan 2019 22:21:46 +0000 (22:21 +0000)]
Merge "Camera: Add dynamic depth tags"

5 years agoAdd Audio Attributes initializer
Francois Gaffie [Thu, 6 Dec 2018 17:07:13 +0000 (18:07 +0100)]
Add Audio Attributes initializer

Test: make

Change-Id: I1101aa74f35b6e08626cddc33937fecf62bfeb31
Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
5 years agoEffects: add new effect volume flag
Jasmine Cha [Fri, 25 Jan 2019 06:54:59 +0000 (14:54 +0800)]
Effects: add new effect volume flag

Add new effect flag for monitoring requested volume from
audio framework.

Bug: 123251705
Test: on/off equalizer on spotify/google music
      switch songs with equalizer

Change-Id: If007ee4a2fdac56636440c010a4b3e8b526de721
Signed-off-by: Jasmine Cha <chajasmine@google.com>
5 years agoMerge "audio: update 3 channel configuration"
Eric Laurent [Fri, 25 Jan 2019 00:56:36 +0000 (00:56 +0000)]
Merge "audio: update 3 channel configuration"

5 years agoMerge "audio_utils: Add Balance class"
Andy Hung [Thu, 24 Jan 2019 17:45:10 +0000 (17:45 +0000)]
Merge "audio_utils: Add Balance class"

5 years agoaudio_utils: Add Balance class
Andy Hung [Fri, 18 Jan 2019 23:49:12 +0000 (15:49 -0800)]
audio_utils: Add Balance class

Test: Change Balance through Settings, play audio
Bug: 28390736
Change-Id: Ic6264abecdd2d536416164cdb71ce76b3a0a0aff

5 years agoMerge "Camera: Support dynamic physical camera switch"
Shuzhen Wang [Thu, 24 Jan 2019 01:55:20 +0000 (01:55 +0000)]
Merge "Camera: Support dynamic physical camera switch"

5 years agoMerge "audio: add new audio formats"
TreeHugger Robot [Thu, 24 Jan 2019 00:12:25 +0000 (00:12 +0000)]
Merge "audio: add new audio formats"

5 years agoMerge "audio: Add new audio formats"
TreeHugger Robot [Wed, 23 Jan 2019 23:05:25 +0000 (23:05 +0000)]
Merge "audio: Add new audio formats"

5 years agoMerge "Add default code reviewers into OWNERS" am: 4408a5c8b0 am: fce3eb8cc0
Chih-hung Hsieh [Wed, 23 Jan 2019 22:25:37 +0000 (14:25 -0800)]
Merge "Add default code reviewers into OWNERS" am: 4408a5c8b0 am: fce3eb8cc0
am: 754a394d16

Change-Id: I8ee7e7209960b17fb88912039f9c6105522f5b1e

5 years agoMerge "Add default code reviewers into OWNERS" am: 4408a5c8b0
Chih-hung Hsieh [Wed, 23 Jan 2019 22:19:44 +0000 (14:19 -0800)]
Merge "Add default code reviewers into OWNERS" am: 4408a5c8b0
am: fce3eb8cc0

Change-Id: Ife84beef695b86fc20777d70d52eadd7ae7014b9

5 years agoMerge "Add default code reviewers into OWNERS"
Chih-hung Hsieh [Wed, 23 Jan 2019 22:14:29 +0000 (14:14 -0800)]
Merge "Add default code reviewers into OWNERS"
am: 4408a5c8b0

Change-Id: I18e38f78645d5792a7f856b1c6156a4c2f90f74c

5 years agoMerge "Add default code reviewers into OWNERS"
Chih-hung Hsieh [Wed, 23 Jan 2019 22:01:37 +0000 (22:01 +0000)]
Merge "Add default code reviewers into OWNERS"

5 years agoAdd default code reviewers into OWNERS
Chih-Hung Hsieh [Wed, 23 Jan 2019 06:05:10 +0000 (22:05 -0800)]
Add default code reviewers into OWNERS

Bug: 33166666
Test: gerrit uploader
Change-Id: I9fd5d368df3b06f6252f30f886fd3d6e2b423156

5 years agoaudio: update 3 channel configuration
Aniket Kumar Lata [Sat, 19 Jan 2019 00:39:28 +0000 (16:39 -0800)]
audio: update 3 channel configuration

Update 3 channel config to 2.1 channel mask
i.e. 3 channel = Left + Right + Low Frequency.

Bug: 123063163
Test: make
Change-Id: I3ea887c17e6266a64af4c82fa3bca3530e082f09

5 years agoCamera: Support dynamic physical camera switch
Shuzhen Wang [Mon, 19 Nov 2018 20:15:18 +0000 (12:15 -0800)]
Camera: Support dynamic physical camera switch

- Add mainPhysicalCameraId dynamic metadata for dynamic physical camera
switch.
- Clarify requirement for combination of optical and digital zoom.
- Specify camera behavior when underlying main physical camera Id
changes.

Test: Camera CTS on Blueline
Bug: 77915333
Change-Id: Ife2352048d19589595e4551b41c0308eb0ef4e8e

5 years agoaudio: add new audio formats
Eric Laurent [Tue, 22 Jan 2019 20:50:45 +0000 (12:50 -0800)]
audio: add new audio formats

Add audio format for LHDC Bluetooth codec.

Bug: 120395342
Test: make
Change-Id: I60e3efd3428cec1a93393d437f8acb056b46ebb2

5 years agoaudio: Add new audio formats
Aniket Kumar Lata [Fri, 18 Jan 2019 21:56:03 +0000 (13:56 -0800)]
audio: Add new audio formats

Add AAC_LATM*, CELT and APTX_ADAPTIVE to the list
of audio formats and return these as valid formats
from audio_is_valid_format.

Bug: 123082414
Test: make
Change-Id: Ie3f945afe65f13dda612507413f3788488a8bc10

5 years agoMerge "Add audio device type AUDIO_DEVICE_IN_HDMI_ARC"
TreeHugger Robot [Fri, 18 Jan 2019 17:35:46 +0000 (17:35 +0000)]
Merge "Add audio device type AUDIO_DEVICE_IN_HDMI_ARC"

5 years agoAdd audio device type AUDIO_DEVICE_IN_HDMI_ARC
Nick Chalko [Tue, 23 Oct 2018 22:23:41 +0000 (15:23 -0700)]
Add audio device type AUDIO_DEVICE_IN_HDMI_ARC

ag/5358988

Bug:117967786
Test: flashall on an atom
Change-Id: Ia24ea233d0cc0b7a531df8fc57b78160ffc508b5

5 years agoMerge "Adding Audio HAL V5: Direction API"
Paul Mclean [Thu, 17 Jan 2019 21:34:33 +0000 (21:34 +0000)]
Merge "Adding Audio HAL V5: Direction API"

5 years agoAdding Audio HAL V5: Direction API
Paul McLean [Wed, 12 Dec 2018 17:59:22 +0000 (09:59 -0800)]
Adding Audio HAL V5: Direction API

Bug: 119137468
Test: Testbed App

Change-Id: If8ca8bcdebff9ad9fb544efeefb0ccfe6e511ca0

5 years agoMerge "add new audio sources for audio capture"
Eric Laurent [Wed, 16 Jan 2019 23:57:57 +0000 (23:57 +0000)]
Merge "add new audio sources for audio capture"

5 years agoadd new audio sources for audio capture
Eric Laurent [Wed, 16 Jan 2019 02:26:06 +0000 (18:26 -0800)]
add new audio sources for audio capture

This commit adds the following audio capture sources:
- AUDIO_SOURCE_VOICE_PERFORMANCE: for real time live performances like Karaoke.
- AUDIO_SOURCE_ECHO_REFERENCE: for capturing the reference signal to suppress by an echo
canceller. Protected by privileged permission CAPTURE_AUDIO_OUTPUT.

Also added device AUDIO_DEVICE_IN_ECHO_REFERENCE selected when the requested
capture source is AUDIO_SOURCE_ECHO_REFERENCE.

Bug: 118203066
Test: CTS tests for audio capture
Change-Id: I78ff0394db280d1efa261ec955da67b0205124ac

5 years agoaudio: Add destination device spec to record_track_metadata
Mikhail Naganov [Tue, 15 Jan 2019 21:44:11 +0000 (13:44 -0800)]
audio: Add destination device spec to record_track_metadata

This reflects the change in the HIDL API for V5.0 and allows
passing the destination device via stream's update_sink_metadata.

Bug: 120859615
Test: audio still works
Change-Id: Ib36dc4d3519b6d90b0cc4a0b7211e51291c60e0c

5 years agoCamera: Add dynamic depth tags
Emilian Peev [Fri, 4 Jan 2019 17:49:37 +0000 (17:49 +0000)]
Camera: Add dynamic depth tags

Add necessary tags for advertising dynamic depth
stream support.

Bug: 109735087
Test: Android builds
Change-Id: I2fa05913bbf84d578f839234c8406e8e24481b5c

5 years agoMerge "Camera: Expose physical camera Ids to ndk"
TreeHugger Robot [Fri, 21 Dec 2018 18:23:35 +0000 (18:23 +0000)]
Merge "Camera: Expose physical camera Ids to ndk"

5 years agoCamera: Expose physical camera Ids to ndk
Shuzhen Wang [Sat, 8 Dec 2018 01:50:58 +0000 (17:50 -0800)]
Camera: Expose physical camera Ids to ndk

Test: Newly added NDK CTS and VNDK test pass
Bug: 115532726
Bug: 120566141
Change-Id: Ice9829597c29004a6e8466767ff99c72a98d634a

5 years agoMerge "Camera: Add mandatory stream combinations tag"
TreeHugger Robot [Fri, 14 Dec 2018 10:03:06 +0000 (10:03 +0000)]
Merge "Camera: Add mandatory stream combinations tag"

5 years agoMerge "Add channel mask for haptic channel."
TreeHugger Robot [Tue, 11 Dec 2018 17:33:03 +0000 (17:33 +0000)]
Merge "Add channel mask for haptic channel."

5 years agoCamera: Add mandatory stream combinations tag
Emilian Peev [Wed, 14 Nov 2018 17:50:18 +0000 (17:50 +0000)]
Camera: Add mandatory stream combinations tag

Camera clients should be able to retrieve and easily
reference the supported mandatory stream combinations.

Bug: 111593096
Test: Camera CTS
Change-Id: I4df8658610cd2105d692e15b5cf179d452860377

5 years agoAdd channel mask for haptic channel.
jiabin [Mon, 5 Nov 2018 18:43:03 +0000 (10:43 -0800)]
Add channel mask for haptic channel.

Bug: 111454766
Test: Manually test
Change-Id: Idf17d8135f1c6df0c6a8c4615a907991d97c402a

5 years ago[automerger skipped] Merge "DO NOT MERGE" am: f68c60e2fa -s ours am: cb2eeb892c...
Xin Li [Thu, 6 Dec 2018 00:32:53 +0000 (16:32 -0800)]
[automerger skipped] Merge "DO NOT MERGE" am: f68c60e2fa  -s ours am: cb2eeb892c  -s ours
am: 23284ffc38  -s ours

Change-Id: I93193a14f3ccf7d31363c0ff4de27d9aac8ab604

5 years ago[automerger skipped] Merge "DO NOT MERGE" am: f68c60e2fa -s ours
Xin Li [Thu, 6 Dec 2018 00:07:25 +0000 (16:07 -0800)]
[automerger skipped] Merge "DO NOT MERGE" am: f68c60e2fa  -s ours
am: cb2eeb892c  -s ours

Change-Id: I64fbef1e4f553989365ed258e7f638fa0b7535bc

5 years ago[automerger skipped] Merge "DO NOT MERGE"
Xin Li [Wed, 5 Dec 2018 23:44:07 +0000 (15:44 -0800)]
[automerger skipped] Merge "DO NOT MERGE"
am: f68c60e2fa  -s ours

Change-Id: I00f07f0975256cf1051ec97a65554b636ffe3c1d

5 years agoMerge "DO NOT MERGE"
Treehugger Robot [Wed, 5 Dec 2018 23:02:54 +0000 (23:02 +0000)]
Merge "DO NOT MERGE"

5 years agoDO NOT MERGE
Xin Li [Wed, 5 Dec 2018 19:46:57 +0000 (11:46 -0800)]
DO NOT MERGE

Merge pie-platform-release (PPRL.181105.017, history only) into master

Bug: 118454372
Change-Id: I6109be939408ae64609d5c52a59a54b3edb2d9f3

5 years agoMerge "Camera: Fix MONO and NIR metadata version"
TreeHugger Robot [Thu, 29 Nov 2018 06:38:47 +0000 (06:38 +0000)]
Merge "Camera: Fix MONO and NIR metadata version"

5 years agoMerge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
Bill Yi [Thu, 29 Nov 2018 02:35:04 +0000 (18:35 -0800)]
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release

Change-Id: I2a2f16f7ac0e74e3dd03ee4a81299d46050e99fb

5 years agoMerge "audio policy: add application states"
Eric Laurent [Wed, 28 Nov 2018 18:08:24 +0000 (18:08 +0000)]
Merge "audio policy: add application states"

5 years agoCamera: Fix MONO and NIR metadata version
Shuzhen Wang [Tue, 20 Nov 2018 23:03:13 +0000 (15:03 -0800)]
Camera: Fix MONO and NIR metadata version

metadata version should be 3.4, not 3.5

Test: Compile
Bug: 70216652
Change-Id: Ic0fcf9752be6a57982a3be851c7903a38a0f284e

5 years agoMerge "audio_utils code cleanup"
Glenn Kasten [Thu, 15 Nov 2018 21:19:04 +0000 (21:19 +0000)]
Merge "audio_utils code cleanup"

5 years agoaudio_utils code cleanup
Glenn Kasten [Tue, 30 Oct 2018 16:01:36 +0000 (09:01 -0700)]
audio_utils code cleanup

Add missing comments at end of #if
Include order
Include what you use
Fix whitespace at EOF

Test: builds OK
Change-Id: I6740fb4d6f2cb86b38a3905a82448bc982b408cc

5 years agofifo API additions and comment
Glenn Kasten [Tue, 30 Oct 2018 16:02:07 +0000 (09:02 -0700)]
fifo API additions and comment

fifo() returns the associated FIFO object.
obtain() has now default value for count parameter of SIZE_MAX.
Update comments.

Test: not yet
Change-Id: I394ce058984dfc779f031e338a0bb9f3ee8e6173

5 years agoaudio policy: add application states
Eric Laurent [Tue, 13 Nov 2018 01:49:52 +0000 (17:49 -0800)]
audio policy: add application states

Add enum for application state used by new concurrent capture policy.
From the capture policy standpoint, an application can be:
 - IDLE: not allowed to record in which case it will receive silence
 - FOREGROUND: runs a foreground service and allowed to record
 - TOP: has a visible UI component: allowed to record and has higher
priority than FOREGROUND apps for use case selection

Test: manual test with solotester app and Assistant, Duo and Camera apps
Bug: 111438757
Change-Id: I677174765430b180742ccf1d0d12ff90799059a8

5 years agoCamera: Clarify monochrome camera metadata support
Shuzhen Wang [Mon, 15 Oct 2018 19:00:13 +0000 (12:00 -0700)]
Camera: Clarify monochrome camera metadata support

- Add new CFA pattern for monochrome cameras
- Clarify metadata tags related to CFA patterns

Test: metadata-generate and read docs
Bug: 70216652
Change-Id: I798ec473c18fe5ee36fd948a5914ba0b0df731b1

5 years agoMerge "Converting sound trigger v2.2 getModelState to be asynchronous"
Michael Dooley [Mon, 12 Nov 2018 19:27:39 +0000 (19:27 +0000)]
Merge "Converting sound trigger v2.2 getModelState to be asynchronous"

5 years agoMerge "audio_route: check no used before mixer reset"
TreeHugger Robot [Sat, 10 Nov 2018 03:13:40 +0000 (03:13 +0000)]
Merge "audio_route: check no used before mixer reset"

5 years agoAdd test for minifloat
Glenn Kasten [Thu, 8 Nov 2018 16:32:01 +0000 (08:32 -0800)]
Add test for minifloat

Test: this is it
Change-Id: I278b72b95ad2d51e361b62a3c30a0b52cf9d7663

5 years agoaudio_route: check no used before mixer reset
HW Lee [Wed, 17 Oct 2018 09:32:14 +0000 (17:32 +0800)]
audio_route: check no used before mixer reset

The audio_route_update_path is used for enabling/disabling audio paths
by HAL, and all mixer controls will be reset in a path when the path is
disabled by HAL. However, some mixer controls are used by multiple audio
paths then such disabling operation might cause the failure on other
paths. To prevent from resetting the used controls, add the active count
for checking if the control can be reset before actually setting the
mixer control.

Bug: 117310706
Bug: 118646089
Test: VoIP (FB Messenger/Hangouts/Skype)
Change-Id: I9c25e9a9651fe27052b52155801ab54ec19156ee
Signed-off-by: HW Lee <hwlee@google.com>
5 years agoMerge "Add signed minifloat: sample"
Glenn Kasten [Thu, 8 Nov 2018 20:43:49 +0000 (20:43 +0000)]
Merge "Add signed minifloat: sample"

5 years agoAdd signed minifloat: sample
Glenn Kasten [Sun, 18 May 2014 20:36:37 +0000 (13:36 -0700)]
Add signed minifloat: sample

Test: vendor/box
Change-Id: I93d3f854d671730f6c0c7aa3997df70e8f6bea4b

5 years agoConverting sound trigger v2.2 getModelState to be asynchronous
mike dooley [Wed, 7 Nov 2018 14:54:52 +0000 (15:54 +0100)]
Converting sound trigger v2.2 getModelState to be asynchronous

Test: built android with checkbuild flag

Change-Id: I8635e8303adaddcaed000a1943ed3da58b1c7104
Bug-Id: 70206501

5 years agoMerge "Camera: Add support for recommended stream configurations"
Shuzhen Wang [Wed, 7 Nov 2018 22:54:01 +0000 (22:54 +0000)]
Merge "Camera: Add support for recommended stream configurations"

5 years agoMerge "Camera: Add Y8/RAW10/RAW12 formats support"
Shuzhen Wang [Wed, 7 Nov 2018 05:54:37 +0000 (05:54 +0000)]
Merge "Camera: Add Y8/RAW10/RAW12 formats support"

5 years agoMerge "audio_utils: implement SF_FORMAT_PCM_U8 for libsndfile"
Glenn Kasten [Mon, 5 Nov 2018 22:41:27 +0000 (22:41 +0000)]
Merge "audio_utils: implement SF_FORMAT_PCM_U8 for libsndfile"

5 years agoMerge "audio_utils: add memcpy_to_i32_from_u8"
Glenn Kasten [Mon, 5 Nov 2018 15:56:41 +0000 (15:56 +0000)]
Merge "audio_utils: add memcpy_to_i32_from_u8"

5 years agoaudio_utils: implement SF_FORMAT_PCM_U8 for libsndfile
Glenn Kasten [Tue, 30 Oct 2018 16:03:58 +0000 (09:03 -0700)]
audio_utils: implement SF_FORMAT_PCM_U8 for libsndfile

Test: wavecopy in vendor/box
Change-Id: I33a87f0b2edcffc8222a31b97977b0fad671fa42

5 years agoaudio_utils: add memcpy_to_i32_from_u8
Glenn Kasten [Tue, 30 Oct 2018 16:02:38 +0000 (09:02 -0700)]
audio_utils: add memcpy_to_i32_from_u8

Test: primitives_tests
Change-Id: Ia23393b9832bda2968096adbb91ca165d788d8e7

5 years agoCamera: Add Y8/RAW10/RAW12 formats support
Shuzhen Wang [Thu, 27 Sep 2018 22:50:01 +0000 (15:50 -0700)]
Camera: Add Y8/RAW10/RAW12 formats support

- Add Y8, RAW10, and RAW12 formats in metadata definition.
- Update camera doc for newly added Y8 format.

Test: metadata-generate, and read text.
Bug: 116806633
Bug: 70216652
Change-Id: I1983ec4bdb0d880fc3b69b2591877d159506ebe2

5 years ago[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am...
Bill Yi [Thu, 25 Oct 2018 02:52:34 +0000 (19:52 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 6eefbec125  -s ours am: 3da3c58978  -s ours
am: 178d7fd23c  -s ours

Change-Id: I1f3a506efc7c01d222ab50091b77624de76eab5d

5 years ago[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am...
Bill Yi [Thu, 25 Oct 2018 02:06:34 +0000 (19:06 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 6eefbec125  -s ours
am: 3da3c58978  -s ours

Change-Id: I4ce9ba74bdec1ea7dc17aa52a1a8fe40230f1acb

5 years ago[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 23:39:32 +0000 (16:39 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 6eefbec125  -s ours

Change-Id: If7a4024ecba2879ee6eac79794664a26aa2ecfba

5 years agoMerge pie-platform-release to aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 21:48:20 +0000 (14:48 -0700)]
Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I1169742007fab68dbf94b6f81bf042bbca0d6a3f

5 years ago[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE...
Bill Yi [Wed, 24 Oct 2018 17:38:37 +0000 (10:38 -0700)]
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 68f2df2c0b  -s ours
am: efd2f7360d  -s ours

Change-Id: I08696604ac7f7e8fd9447bdca374df0f1715f247

5 years ago[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 17:25:22 +0000 (10:25 -0700)]
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: 68f2df2c0b  -s ours

Change-Id: I20847649fe71330bd0410c9ceda904e732ae5b69

5 years agoMerge pi-platform-release to stage-aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 16:07:59 +0000 (09:07 -0700)]
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

Change-Id: I6f867f25fe9d3beb9ef3521e465e11cf5008c3fb

5 years agoCamera: Add support for recommended stream configurations
Emilian Peev [Tue, 18 Sep 2018 13:01:55 +0000 (14:01 +0100)]
Camera: Add support for recommended stream configurations

Hal must be able to recommend efficient stream configurations
for common client use cases. Add the necessary
static metadata keys.

Bug: 64029608
Test: Camera CTS
Change-Id: I843401de407ab7327fc9e0d6365f2d27b9cdb435

5 years ago[automerger skipped] Merge "audio: update switch to use FALLTHROUGH_INTENDED" am...
Andy Hung [Sat, 13 Oct 2018 03:30:34 +0000 (20:30 -0700)]
[automerger skipped] Merge "audio: update switch to use FALLTHROUGH_INTENDED" am: 1c93a71111 am: 547f28c3c8
am: 34c5b9f7bd  -s ours

Change-Id: I5b989c1d45327cb3a8f954fda570290b1828bb57

5 years agoMerge "audio: update switch to use FALLTHROUGH_INTENDED" am: 1c93a71111
Andy Hung [Sat, 13 Oct 2018 03:26:02 +0000 (20:26 -0700)]
Merge "audio: update switch to use FALLTHROUGH_INTENDED" am: 1c93a71111
am: 547f28c3c8

Change-Id: Ib90d3fb4337114f264eb350bf9c6fa66745bf48b

5 years agoMerge "audio: update switch to use FALLTHROUGH_INTENDED"
Andy Hung [Sat, 13 Oct 2018 03:21:33 +0000 (20:21 -0700)]
Merge "audio: update switch to use FALLTHROUGH_INTENDED"
am: 1c93a71111

Change-Id: Ib53434afba888f9974099b8f85a83c50c244dcb6

5 years agoMerge "audio: update switch to use FALLTHROUGH_INTENDED"
Treehugger Robot [Sat, 13 Oct 2018 03:06:18 +0000 (03:06 +0000)]
Merge "audio: update switch to use FALLTHROUGH_INTENDED"

5 years agoaudio: update switch to use FALLTHROUGH_INTENDED
Andy Hung [Tue, 9 Oct 2018 20:55:11 +0000 (13:55 -0700)]
audio: update switch to use FALLTHROUGH_INTENDED

Test: compile, sanity
Bug: 117509050
Change-Id: I1394e22621af6519b6679353f31f06561ffeacad
Merged-In: I1394e22621af6519b6679353f31f06561ffeacad
(cherry picked from commit 74213cb95cce829cc2e7534a9572f1236709b5fe)

5 years agoCamera: Trivial doc update to fix typo
Shuzhen Wang [Thu, 11 Oct 2018 17:17:33 +0000 (10:17 -0700)]
Camera: Trivial doc update to fix typo

Test: autogenerate and read docs
Change-Id: Icbf03361d8cd47ae931c70ddb39e1c11655b290b

5 years agoMerge "Camera: Trivial doc update" am: 2b5539f5e5 am: 15767f82fd
Shuzhen Wang [Thu, 11 Oct 2018 21:53:41 +0000 (14:53 -0700)]
Merge "Camera: Trivial doc update" am: 2b5539f5e5 am: 15767f82fd
am: 541dc41c26

Change-Id: Iee524a47ffcc2f76993ed24d0f8e2452790b2ea7

5 years agoMerge "Camera: Trivial doc update" am: 2b5539f5e5
Shuzhen Wang [Thu, 11 Oct 2018 21:34:54 +0000 (14:34 -0700)]
Merge "Camera: Trivial doc update" am: 2b5539f5e5
am: 15767f82fd

Change-Id: I69629ce209b6b05002808e8a4e39e63c72e2dfd9

5 years agoMerge "Camera: Trivial doc update"
Shuzhen Wang [Thu, 11 Oct 2018 21:16:40 +0000 (14:16 -0700)]
Merge "Camera: Trivial doc update"
am: 2b5539f5e5

Change-Id: I1a7f1b8bfff17c720aee800a73ff8f883dc68b1e

5 years agoMerge "Camera: Trivial doc update"
Shuzhen Wang [Thu, 11 Oct 2018 21:02:32 +0000 (21:02 +0000)]
Merge "Camera: Trivial doc update"

5 years agoCamera: Trivial doc update
Shuzhen Wang [Thu, 11 Oct 2018 00:58:13 +0000 (17:58 -0700)]
Camera: Trivial doc update

5 years agoaudio: Use C++17 fallthrough attribute
Andy Hung [Wed, 10 Oct 2018 20:36:50 +0000 (13:36 -0700)]
audio: Use C++17 fallthrough attribute

Test: compile and sanity
Bug: 117509050
Change-Id: I04de10c7b21f7d644c8365080bc4db58045ae4fd

5 years agoaudio: update switch to use FALLTHROUGH_INTENDED
Andy Hung [Tue, 9 Oct 2018 20:55:11 +0000 (13:55 -0700)]
audio: update switch to use FALLTHROUGH_INTENDED

Test: compile, sanity
Bug: 117509050
Change-Id: I1394e22621af6519b6679353f31f06561ffeacad

5 years agoMerge "FdToString: Implement read/poll based timeout"
TreeHugger Robot [Tue, 2 Oct 2018 17:10:10 +0000 (17:10 +0000)]
Merge "FdToString: Implement read/poll based timeout"

5 years agoFdToString: Implement read/poll based timeout
Andy Hung [Thu, 27 Sep 2018 00:55:30 +0000 (17:55 -0700)]
FdToString: Implement read/poll based timeout

Appears in some cases wakeup of threads blocked on fds
may be lost in hwbinder.

Test: continuous reboot +400 times (per bug), unit test
Bug: 116211629
Bug: 116873928
Change-Id: I1f122ed5743a60a1bcc994527e79bec1a21a6de4

5 years agoCamera: add buffer management API key
Yin-Chia Yeh [Mon, 17 Sep 2018 18:52:08 +0000 (11:52 -0700)]
Camera: add buffer management API key

Also do s/metadata_properties.xsd/metadata_definitions.xsd as
the file has been renamed

Test: compile
Bug: 109829698
Change-Id: I79444ee279378e2ca8ab9a4b2efeda012a21f2c7

5 years agoMerge "Camera: Allow camera HAL to not independently expose physical cameras"
Shuzhen Wang [Thu, 13 Sep 2018 19:57:48 +0000 (19:57 +0000)]
Merge "Camera: Allow camera HAL to not independently expose physical cameras"

5 years agoMerge "Camera: Add support for 'permission_needed' tag property"
TreeHugger Robot [Thu, 13 Sep 2018 17:22:28 +0000 (17:22 +0000)]
Merge "Camera: Add support for 'permission_needed' tag property"

5 years agoCamera: Add support for 'permission_needed' tag property
Emilian Peev [Wed, 15 Aug 2018 17:20:27 +0000 (18:20 +0100)]
Camera: Add support for 'permission_needed' tag property

Metadata definitions should support an optional 'permission_needed'
property. By default the value must be set to 'false'.

Bug: 112160024
Test: Manual using application,
adb shell /data/nativetest64/camera_client_test/camera_client_test
--gtest_filter=CameraCharacteristicsPermission.TestCameraPermission
Camera CTS
Change-Id: I8b19b103060ae7ca20f818687dff535afd79a159

5 years agoMerge "Camera: Add camera_metadata tests to presubmit"
Eino-Ville Talvala [Wed, 12 Sep 2018 17:36:48 +0000 (17:36 +0000)]
Merge "Camera: Add camera_metadata tests to presubmit"

5 years agoCamera: Allow camera HAL to not independently expose physical cameras
Shuzhen Wang [Thu, 6 Sep 2018 00:01:23 +0000 (17:01 -0700)]
Camera: Allow camera HAL to not independently expose physical cameras

Test: make offline-sdk-docs
Bug: 79523700
Change-Id: Ia7d3141793f2f3fd891b99076effec5f2854f566

5 years agoCamera: Add camera_metadata tests to presubmit
Eino-Ville Talvala [Wed, 22 Aug 2018 21:49:28 +0000 (14:49 -0700)]
Camera: Add camera_metadata tests to presubmit

- Fix alignment crashes in validate_metadata when
  alignment is not a multiple of 4
- Add camera_metadata_tests into TEST_MAPPING

Test: atest in system/media/camera
Change-Id: Ib44bb829156f5225c3f2c2181b6f508a1f689dfd

5 years ago[automerger skipped] Merge changes from topic "b113052379-cp-from-pi-dev-p2" am:...
Ryan Prichard [Fri, 7 Sep 2018 04:48:42 +0000 (21:48 -0700)]
[automerger skipped] Merge changes from topic "b113052379-cp-from-pi-dev-p2" am: f259bd9630 am: c8982bcc68  -s ours
am: aac9f6c448  -s ours

Change-Id: Ic1869a998a52f88af4875e655803136b8d905712

5 years ago[automerger skipped] Camera: Documentation updates for calibration and distortion...
Eino-Ville Talvala [Fri, 7 Sep 2018 04:48:30 +0000 (21:48 -0700)]
[automerger skipped] Camera: Documentation updates for calibration and distortion correction am: ef76f7db05 am: 57cbfe6d9b  -s ours
am: 48e9a17c04  -s ours

Change-Id: If2cdb2d359c5aa36e15b7da6fd780b9c83a44e62

5 years ago[automerger skipped] Merge changes from topic "b113052379-cp-from-pi-dev-p2" am:...
Ryan Prichard [Thu, 6 Sep 2018 21:52:07 +0000 (14:52 -0700)]
[automerger skipped] Merge changes from topic "b113052379-cp-from-pi-dev-p2" am: f259bd9630
am: c8982bcc68  -s ours

Change-Id: Id3b1b1a0728ce84adbd48a4e44f8b6ef5b001b95