Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
637,912 Commits 3 Branches 0 Tags
65c23abeabfeb245fa187aa30db77541751f7703
Commit Graph

9997 Commits

Author SHA1 Message Date
Jiabin Huang
88375244d8 Merge "Add short audio descriptor and encapsulation type in AudioProfile." into sc-dev am: ae6711b2a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13784568

Change-Id: I4859329c63608a6679727d9111e2212d5154eca6
 2021-03-26 04:36:12 +00:00
Jiabin Huang
ae6711b2a7 Merge "Add short audio descriptor and encapsulation type in AudioProfile." into sc-dev 2021-03-26 04:08:33 +00:00
Lajos Molnar
f13c0f08ab Merge "media: MediaCodecInfo: add FEATURE_QpBounds" into sc-dev am: 0dfd9df61c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13988808

Change-Id: I6948047d9e42069e03713c80d5cdbf56fd48b1d4
 2021-03-25 23:40:27 +00:00
Ray Essick
24c9ac9d16 Merge "Clean documentation on video QP key semantics." into sc-dev am: 8b790e7bda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13996809

Change-Id: Idef1b0c40f158494aa4a744643dceab11eec1289
 2021-03-25 23:39:35 +00:00
Lajos Molnar
0dfd9df61c Merge "media: MediaCodecInfo: add FEATURE_QpBounds" into sc-dev 2021-03-25 23:34:53 +00:00
Ray Essick
8b790e7bda Merge "Clean documentation on video QP key semantics." into sc-dev 2021-03-25 23:30:47 +00:00
Jean-Michel Trivi
70c19aed15 Merge "Audio focus: test APIs for focus injection" into sc-dev am: bbf30df183 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13985546

Change-Id: I5a8d575c7c1916bc2bb390134c1cc34e26ea764e
 2021-03-25 22:59:14 +00:00
Jean-Michel Trivi
bbf30df183 Merge "Audio focus: test APIs for focus injection" into sc-dev 2021-03-25 22:39:46 +00:00
Lajos Molnar
286a4ee982 Merge "media: add EncoderProfiles" into sc-dev am: 0264323406 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13924167

Change-Id: I2fbc0c4b6429bc45bb4ee5377ffc78bc50a9cbda
 2021-03-25 21:37:57 +00:00
Lajos Molnar
0264323406 Merge "media: add EncoderProfiles" into sc-dev 2021-03-25 21:11:06 +00:00
Jean-Michel Trivi
28602096e7 Audio focus: test APIs for focus injection 
Add new APIs for testing more audio focus behaviors:
- new methods to request/abandon audio focus on a "fake" focus
  owner for which an arbitrary UID can be injected
- new method to query the fade out duration on focus loss

Bug: 169620099
Test: atest AudioFocusTest#testAudioFocusRequestMediaGainLossWithPlayer
Change-Id: I4be4597a994bde99ed5ef98296a4a8a2d1b02d8a
 2021-03-25 10:04:23 -07:00
Lajos Molnar
87f757f205 media: MediaCodecInfo: add FEATURE_QpBounds 
This signals that the encoder supports the KEY_VIDEO_QP_* keys.

Bug: 179554934
Change-Id: If8db5f9bc3b725bb87872fd62c6a7d4cd9e63ab3
 2021-03-25 09:56:46 -07:00
Ray Essick
0b9987c9fd Clean documentation on video QP key semantics. 
Bug: 161486612
Test: build
Change-Id: I60ca046266fb231c12545e6865f2559a2dcf5c37
 2021-03-25 09:49:27 -07:00
Philip Junker
2c2879baa0 Merge "Add IntDef for system sound effect constants" into sc-dev am: 451405eb17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13901314

Change-Id: I7ae738845095fda803ea78155e7dea70ec5343e9
 2021-03-25 09:41:44 +00:00
Philip Junker
451405eb17 Merge "Add IntDef for system sound effect constants" into sc-dev 2021-03-25 09:31:09 +00:00
Hyundo Moon
be7e6788f6 Merge "System MR2: Supplement Javadoc for startScan/stopScan" into sc-dev am: 30b3a36edc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13989586

Change-Id: Id23a5bb09a77ee818e0466cfb06b779585c05a4e
 2021-03-25 08:24:54 +00:00
Hyundo Moon
30b3a36edc Merge "System MR2: Supplement Javadoc for startScan/stopScan" into sc-dev 2021-03-25 08:02:51 +00:00
Lajos Molnar
51f1604fe3 media: add EncoderProfiles 
EncoderProfiles is an extension to CamcorderProfile where multiple video
and or audio profiles can be listed for a given quality level. Also, it
can be generalized to non-camera related profiles, such as transcoding
in the future.

Bug: 171673898
Test: atest CamcorderProfileTest
Change-Id: If39337f7c8bc6c3b9cb771dd321976ce3c8a66ef
 2021-03-24 22:15:55 -07:00
Treehugger Robot
d5677cfaa6 Merge "media: make ParameterDescriptor static" am: 201c39ba90 am: e29ed20fff am: 1632f384c0 am: fa07059fe9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653567

Change-Id: I3e6dbc02b38b7bdb06c6767f707d34ffb401488e
 2021-03-25 04:47:44 +00:00
Treehugger Robot
fa07059fe9 Merge "media: make ParameterDescriptor static" am: 201c39ba90 am: e29ed20fff am: 1632f384c0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653567

Change-Id: I243bb389f22e0f651aef0397f24aee7c12af7ad0
 2021-03-25 04:32:16 +00:00
TreeHugger Robot
ae21000f19 Merge "MediaRouter2: Add RouteDiscoveryPrefernce.EMPTY as @SystemApi" into sc-dev am: 07a84b6cc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13989585

Change-Id: Ife2108d76ddb53be5219a923076e9290c05450b2
 2021-03-25 04:26:46 +00:00
Lajos Molnar
83f1242f7c Merge "media: add CBR_FD video encoding bitrate mode" into sc-dev am: b8f4c0e6a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921806

Change-Id: Ie7e0450288d08bb49cf629668643f9e2b31cf2b7
 2021-03-25 04:07:23 +00:00
Treehugger Robot
1632f384c0 Merge "media: make ParameterDescriptor static" am: 201c39ba90 am: e29ed20fff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653567

Change-Id: I5d7de95191f9da3b23ea1ed6ba3851b2958181fd
 2021-03-25 04:06:08 +00:00
TreeHugger Robot
07a84b6cc8 Merge "MediaRouter2: Add RouteDiscoveryPrefernce.EMPTY as @SystemApi" into sc-dev 2021-03-25 04:05:15 +00:00
Lajos Molnar
b8f4c0e6a5 Merge "media: add CBR_FD video encoding bitrate mode" into sc-dev 2021-03-25 03:47:52 +00:00
Hyundo Moon
9f1cb16d16 System MR2: Supplement Javadoc for startScan/stopScan 
Also does the same for MR2Manager#startScan/stopScan.

Bug: 183605044
Test: Builds successfully
Change-Id: I514c667a686706ff80c1d16619b557fff5ca569b
 2021-03-25 11:23:54 +09:00
Hyundo Moon
14d5a971cb MediaRouter2: Add RouteDiscoveryPrefernce.EMPTY as @SystemApi 
This CL also removes MR2#registerRouteCallback(executor, callback).

Bug: 183656331
Test: Passed CTS
Change-Id: I7cbfed9dd1dd6d92e0d9d012da7aef11a397139f
 2021-03-25 09:41:27 +09:00
Wonsik Kim
f65fcbdbbd media: make ParameterDescriptor static 
Bug: 183242434
Test: builds
Change-Id: Ifed0209d36f6d40b0a9fb95008b74eff5c96c742
 2021-03-24 16:04:41 -07:00
Wonsik Kim
5918878a60 Merge "MediaCodec: add methods to query/subscribe vendor parameters" into sc-dev am: f97b6e5a47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13975421

Change-Id: I55221fca50cfe4e210101123d0609b9123ded07c
 2021-03-24 20:55:13 +00:00
Wonsik Kim
50ce5087fd DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters am: 197e1a7f5e am: 309d58c0cb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646730

Change-Id: Iaec49578abb040e62ab8e9718e2cbb5941888ebc
 2021-03-24 18:53:54 +00:00
Wonsik Kim
8798c8ccbc MediaCodec: add methods to query/subscribe vendor parameters 
Bug: 183242434
Test: atest android.media.cts.MediaCodecTest
Change-Id: Iaef8f8aef564dc8cda84a83f6cc628d87649b43d
 2021-03-24 09:39:02 -07:00
Kriti Dang
cd0f0e2e9e Merge "Expose AudioManager.setSurroundFormatEnabled as public API." into sc-dev am: 59b495a649 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13776615

Change-Id: I3b46aa6f8a7063a42d335e4bf684dda609421206
 2021-03-24 16:04:39 +00:00
Kriti Dang
59b495a649 Merge "Expose AudioManager.setSurroundFormatEnabled as public API." into sc-dev 2021-03-24 15:52:51 +00:00
Philip Junker
dfcb12b34c Add IntDef for system sound effect constants 
Test: m -j86 offline-sdk-docs
Test: atest android.view.cts.SoundEffectConstantsTest
Test: atest android.view.SoundEffectConstantsTest
Bug: 182945031
Change-Id: I8a496144e61e584f633a3950274fbdf0fe146e11
 2021-03-24 14:24:55 +01:00
Kriti Dang
527e66c17c Expose AudioManager.setSurroundFormatEnabled as public API. 
Move manipulation of settings part of API

Bug: 180997010
Tets: atest AudioManagerTest
Test: Tested manually via settings ux

Change-Id: I9c14d38b65b29ed572e88cc2b11b71ae8118d059
 2021-03-24 11:02:12 +01:00
shubang
c56cc00ab8 Change session ID string to ID object 
Based on API review feedback from jmtrivi@ to reduce unexpected
usage of the APIs.

And add some stub APIs

Reference CLs:
MediaDrm ag/13835091 by robertshih@
MediaExtractor: ag/13607751 by aquilescanta@
MediaParser: ag/13714647 by aquilescanta@
MediaRecorder: ag/13545885 by dichenzhang@
AudioTrack & AudioRecord: ag/13712857 by hunga@

Bug: 183095725
Test: pending CTS
CTS-Coverage-Bug: 183366721
Change-Id: I931edf021a5ec6b27a25bc6142a129b92da0fc9a
Merged-In: I931edf021a5ec6b27a25bc6142a129b92da0fc9a
 2021-03-23 22:49:42 -07:00
Shubang Lu
0c1a6e1afe Merge "Change session ID string to ID object" 2021-03-24 05:39:42 +00:00
Wonsik Kim
197e1a7f5e DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters 
Bug: 183242434
Test: atest android.media.cts.MediaCodecTest
Change-Id: Iaef8f8aef564dc8cda84a83f6cc628d87649b43d
 2021-03-24 02:51:59 +00:00
Kyunglyul Hyun
819e240eaf Merge "Media: Add MSM#getMediaKeyEventSession" into sc-dev am: 3a79bcc358 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13719085

Change-Id: Ieb22b327c8632092fce286ccc3862be8d12bc04f
 2021-03-24 01:34:05 +00:00
TreeHugger Robot
786d053f3f Merge "Better format channel masks in AudioProfile.toString()." into sc-dev am: 7d3702cf2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13972334

Change-Id: Ib799175999a95bc24751f50b378703d8c5fac038
 2021-03-24 01:24:25 +00:00
Kyunglyul Hyun
3a79bcc358 Merge "Media: Add MSM#getMediaKeyEventSession" into sc-dev 2021-03-23 23:55:36 +00:00
TreeHugger Robot
7d3702cf2c Merge "Better format channel masks in AudioProfile.toString()." into sc-dev 2021-03-23 22:58:33 +00:00
jiabin
a937979b4d Add short audio descriptor and encapsulation type in AudioProfile. 
Short audio descriptor is defined in HDMI specification 1.4b section 7
that is used to describe the audio capabilities over HDMI.

The encapsulation types represent the encapsulation formats that must be
used when sending the audio data with the format associated with the
AudioProfile to Android.

Bug: 131736540
Bug: 178619392
Test: atest AudioManagerTest
Change-Id: Icc1d02bd1239561f7f3740bf7bd9ecf17fc1420b
 2021-03-23 20:06:43 +00:00
shubang
8f8057ee83 Change session ID string to ID object 
Based on API review feedback from jmtrivi@ to reduce unexpected
usage of the APIs.

And add some stub APIs

Reference CLs:
MediaDrm ag/13835091 by robertshih@
MediaExtractor: ag/13607751 by aquilescanta@
MediaParser: ag/13714647 by aquilescanta@
MediaRecorder: ag/13545885 by dichenzhang@
AudioTrack & AudioRecord: ag/13712857 by hunga@

Bug: 183095725
Test: pending CTS
CTS-Coverage-Bug: 183366721
Change-Id: I931edf021a5ec6b27a25bc6142a129b92da0fc9a
 2021-03-23 19:53:39 +00:00
jiabin
ffea315fa1 Better format channel masks in AudioProfile.toString(). 
Remove trailing ", " when converting channel masks array to string.

Bug: 183425455
Test: make
Change-Id: Iafdc91e13a4abefde6fa52c85402b563a4e1406e
 2021-03-23 17:30:58 +00:00
Kyunglyul Hyun
64971a5106 Media: Add MSM#getMediaKeyEventSession 
Add MediaSessionManager#getMediaKeyEventSession
for system apps to get the current media key event session,
which may be different from the first session in
MediaSessionManager#getActiveSessions().

Bug: 181383356
Test: atest MediaSessionManagerTest
Change-Id: I56ece75e352150693a5658e2660f39b5702d8612
 2021-03-23 14:17:28 +00:00
Guillaume Chelfi
29e2f587fa Merge "Add tunnel mode video peek related APIs" into sc-dev am: 4f576188b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13472392

Change-Id: I85836e2dc5c69cc361f074b922c050a566e1bd40
 2021-03-23 12:47:33 +00:00
TreeHugger Robot
97f611b4f1 Merge "System MR2: Add MediaRouter2#registerRouteCallback(executor, callback)" into sc-dev am: da809dde02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13960213

Change-Id: Ifa54558e8670e291c37e913eeed226406a37c959
 2021-03-23 12:46:09 +00:00
Guillaume Chelfi
4f576188b4 Merge "Add tunnel mode video peek related APIs" into sc-dev 2021-03-23 12:30:33 +00:00
Hyundo Moon
96ab01b44f System MR2: Add MediaRouter2#registerRouteCallback(executor, callback) 
This CL adds registerCallback(executor, callback) as @SystemApi
for system MediaRouter2.

Bug: 183453134
Test: Passed CTS
Change-Id: I50e942714946ae8af7ad69432cefcd8015040d4d
 2021-03-23 09:46:54 +00:00