Commit Graph

6457 Commits

Author SHA1 Message Date
TreeHugger Robot
7f1bceb325 Merge "MediaPlayerBase API" 2018-02-28 16:36:23 +00:00
TreeHugger Robot
58c83fa7c8 Merge "Unhide VideoView2 APIs" 2018-02-28 10:43:38 +00:00
TreeHugger Robot
dc66a1d891 Merge "Unhide MediaControlView2 APIs" 2018-02-28 10:28:25 +00:00
Insun Kang
b785faa1d7 Unhide VideoView2 APIs
Test: make update-api
Bug: 64293205
Change-Id: Ie57e3ea78dd623fc095c1ad5f270f3b97320f155
2018-02-28 08:45:37 +00:00
Jean-Michel Trivi
c3a438f65b MediaPlayerBase API
Define as an abstract class the high level interface for
  media players. Consumers are MediaSession2, providers
  are MediaPlayer2, which will extend this class.

Bug: 64098437
Test: to be in MediaPlayer2 tests once it extends MPB
Change-Id: Id0d0fcb6d1b377a0e05a4a8e3d659e12a58fc45e
2018-02-27 22:53:25 -08:00
TreeHugger Robot
7f88497514 Merge "Dynamics Processing Effect" 2018-02-28 06:19:35 +00:00
Jin Seok Park
a64d4b98b5 Unhide MediaControlView2 APIs
Test: make update-api
Bug: 64293205
Change-Id: Ia202a7fc1f8733cc2d95d13e7126916affe4f52e
2018-02-28 05:06:10 +00:00
rago
46a92d90df Dynamics Processing Effect
Adding Dynamics Processing Effect api and configuration helpers.

Bug: 64161702
Bug: 38266419

Test: manual testing and CTS test ag/3662965
Change-Id: I993e1621011a16596aa00ea049fa8681463e8551
2018-02-28 03:13:45 +00:00
Jaewan Kim
6cc1a5de46 MediaSession2: Unhide APIs
Bug: 64098437
Test: make update-api
Change-Id: Ib73a32b422502cef324869356d56acaa7c48b219
2018-02-27 09:58:03 +09:00
Jaewan Kim
004ff3f579 MediaMetadata2: Add radio frequency and callsigns
This is request from the Android Auto Embeded, where the Android is
running on the car kit and needs support radio application

Test: Run all MediaComponents tests once
Change-Id: I09780878ac3a1075c79f51879ffb76913a8215a2
2018-02-26 22:41:44 +09:00
TreeHugger Robot
6094f7fb58 Merge "Remove MediaSession2Record" 2018-02-26 11:58:16 +00:00
Hyundo Moon
9649f25ab4 MediaBrowser2: Fix naming inconsistencies
This CL modifies following APIs:

1. getLibraryRoot() related
 - onGetRoot => onGetLibraryRoot
 - onGetRootResult => onGetLibraryRootDone

2. getItem() related
 - onLoadItem => onGetItem
   - Also renamed argument: itemId => mediaId
 - onItemLoaded => onGetItemDone

3. getChildren() related
 - notifyChildrenChanged/onChildrenChanged
   - Renamed argument: childCount => itemCount
 - onLoadChildren => onGetChildren
 - onChildrenLoaded => onGetChildrenDone

4. getSearchResult() related
 - onLoadSearchResult => onGetSearchResult
 - onSearchResultLoaded => onGetSearchResultDone

Bug: 73711101
Test: Passed MediaBrowser2Test
Change-Id: Ic8d6530d3913d9becdaada32283e9fe1f7e534a9
2018-02-26 11:03:38 +09:00
Sungsoo Lim
117c7f727f Remove MediaSession2Record
Test: passed MediaComponentsTest
Change-Id: I787c20f3c44f481960203699af563109a022e3d4
2018-02-26 09:22:54 +09:00
TreeHugger Robot
a72cab84cf Merge "Add information of microphone on peripheral for mic enumeration APIs." 2018-02-23 22:55:50 +00:00
jiabin
589a236acf Add information of microphone on peripheral for mic enumeration APIs.
Bug: 64038649
Test: run cts
Change-Id: If66747359b6544d239898fc16fbf1d99002b6402
2018-02-23 10:04:35 -08:00
Jin Seok Park
b9f6febce4 MediaControlView2: Add Support for Ad
Add APIs for getting/setting MediaMetadata2 in oder to add support
for Advertising media type.

Bug: 73136129
Test: run VideoViewTest.apk
Change-Id: Iab8e23c1f02f4e2df62a6732112b233541f8f35c
2018-02-23 05:33:33 +00:00
TreeHugger Robot
431df70cc7 Merge "MediaPlayer2: use long type for media time." 2018-02-23 03:21:27 +00:00
Andre Eisenbach
13956ba9ab Merge "Add AudioManager.setHearingAidDeviceConnectionState" am: c3e842fde8 am: 670ecc2279
am: 54f104e84c

Change-Id: I145b732008e979b7c9762e366620f9fd6c15a97f
2018-02-22 23:18:27 +00:00
Andre Eisenbach
54f104e84c Merge "Add AudioManager.setHearingAidDeviceConnectionState" am: c3e842fde8
am: 670ecc2279

Change-Id: I9a7a7712d750581cec4131489bca7071ad64ceee
2018-02-22 23:02:15 +00:00
Wei Jia
1288759965 MediaPlayer2: use long type for media time.
add getAudioAttributes
add srcId for DRM callbacks
remove setNextMediaPlayer
Test: MediaPlayer2 plays
Bug: 63934228
Change-Id: Ibc890a9cb2a29ab58ae7eed25f41e96e04ccafcc
2018-02-22 21:55:08 +00:00
Jakub Pawlowski
10c906121b Add AudioManager.setHearingAidDeviceConnectionState
This will be used by Bluetooth to notify audio framework when Hearing
Aid is connected or disconnected.

Bug: 69623109
Test: mm
Change-Id: I5664d8bd20e36601eea815c0d6e55c3b1d49e4ea
2018-02-22 20:31:07 +00:00
Chong Zhang
07be0313c9 MediaMuxer: clear file content when writing to existing file
bug: 73546869
Change-Id: I7f38ecef1035f1190effae38634d21a3a18cc09f
2018-02-22 18:51:54 +00:00
Jakub Pawlowski
1e73cdc45c Add Hearing Aid output device
This output is used to send audio to Hearring Aid device.

Bug: 69623109
Test: mm
Change-Id: I6ffdb0a404efb645592624612c7ebc187fb933a6
2018-02-22 00:01:50 +00:00
Jaewan Kim
ef2a534d68 MediaSession2: Add a way to notify errors between session and player
This is proposed during the offline meeting

Test: Run all MediaComponents tests once
Change-Id: I3ebd6284792a934bf1411a447e65970ad53a1f42
2018-02-22 02:02:43 +09:00
Jaewan Kim
d4fdc622e5 MediaSession2: Implement MediaLibrarySession#notifyChildrenChanged()
Test: Run all MediaComponents tests once
Bug: 72787989
Change-Id: I5bdcb8460109831fb5349d1437b775f8f7b7ddf0
2018-02-22 02:01:49 +09:00
Jaewan Kim
acdbf49ac3 MediaSession2: Implement subscribe/unsubscribe
Bug: 72786292
Test: Run all MediaComponents tests
Change-Id: I0871f883d638292fb75b2bd8c9bd4d680e4a1d0b
2018-02-22 02:00:34 +09:00
Hyundo Moon
bdf077bd92 MediaSession2: Remove rating style from session
Bug: 73615699
Test: Passed MediaController2Test
Change-Id: Icc35bf982e0943ba7586003bf30dd6dfa90d747e
2018-02-22 02:00:23 +09:00
TreeHugger Robot
efee606e86 Merge "MediaSession2: Remove SessionPlayer2" 2018-02-21 16:32:37 +00:00
Hyundo Moon
c25293e532 MediaBrowser2: Rearrange API arguments in relevant order
Test: Passed MediaBrowser2Test
Change-Id: Ic7a9955235e77d9d9bd9f59ac70987c1d6e61140
2018-02-21 19:46:26 +09:00
Jaewan Kim
af25316e28 MediaSession2: Remove SessionPlayer2
MediaPlayer2 will provide implementation of MediaPlayerInterface

Test: Run all MediaComponents test once
Change-Id: Iecdbbcd0cbbdb191cdb228cf09d828565e13fc3d
2018-02-21 18:50:32 +09:00
TreeHugger Robot
437680c4ff Merge "MediaLibrarySession: Add notifySearchResultChanged" 2018-02-21 03:41:55 +00:00
Hyundo Moon
cfc3ab2ea4 Merge "MediaController2: Implement setRating()" 2018-02-21 01:35:40 +00:00
TreeHugger Robot
0f5fd79a96 Merge "VideoView2: Remove redundant listeners" 2018-02-21 00:27:13 +00:00
TreeHugger Robot
b729375d47 Merge "MediaFormat: declare key for AAC decoder DRC effect type" 2018-02-20 22:58:34 +00:00
Hyundo Moon
e08c97a38d MediaLibrarySession: Add notifySearchResultChanged
Bug: 72786724
Test: Passed MediaBrowser2Test
Change-Id: I3b232e1f959aa2d56fdc1caa46bf8d2775262bf1
2018-02-20 14:16:50 +09:00
Insun Kang
a35d1b1946 VideoView2: Remove redundant listeners
Bug: 73598418
Test: build
Change-Id: Ibc79fde985a98c2323c2c63feef874a90e084652
2018-02-20 01:31:35 +09:00
Hyundo Moon
a2be62f25b MediaController2: Implement setRating()
Bug: 73146284
Test: Passed MediaController2Test
Change-Id: Iaff4f5b58d0bbd7105a39763cd6fee7c6c621df8
2018-02-19 16:07:53 +09:00
Jean-Michel Trivi
bba1e9f24d MediaFormat: declare key for AAC decoder DRC effect type
Bug: 71430241
Test: CTS AAC decoder test

Change-Id: I077bdccf2b3ce935feaa6f14c75640d2f20affb7
2018-02-16 21:04:48 -08:00
Jeff Sharkey
2ab510ee24 Merge "Add RequiresFeature annotation." 2018-02-16 20:45:41 +00:00
Jeff Sharkey
98af2e4fec Add RequiresFeature annotation.
Certain APIs require that a device have a specific feature to operate
correctly, so start annotating them.

Test: builds, boots
Bug: 72284763
Change-Id: Ie2f30284bdfdb6acc4067f434eba3b5433837606
Exempt-From-Owner-Approval: simple annotations
2018-02-16 20:45:22 +00:00
TreeHugger Robot
7ed04f9590 Merge "MediaPlayer2: initial code for playlist support" 2018-02-16 17:06:17 +00:00
TreeHugger Robot
a426f9e5a7 Merge "Audio recording sources: annotate permissions" 2018-02-16 03:49:16 +00:00
Wei Jia
de0c3979ce MediaPlayer2: initial code for playlist support
Test: MediaPlayer2 plays
Bug: 63934228
Change-Id: I6bb8be8c2bda9221e252e54c14b95107eccf4e00
2018-02-15 16:53:18 -08:00
Jean-Michel Trivi
f11d805d30 Audio recording sources: annotate permissions
Annotate permissions for REMOTE_SUBMIX and HOTWORD.
Note that REMOTE_SUBMIX was defined before the notion
  of @SystemApi, hence its presence in SDK despite the
  need for system permission.

Bug: 72176464
Test: make online-system-api-sdk-docs
Change-Id: I315d584f06870b1e778d73a9f9415d201fe87af7
2018-02-15 15:55:44 -08:00
Jean-Michel Trivi
ebc80c8c46 AudioPolicy: media dynamic mix is fixed volume
Bug: 70859923
Test: gts-tradefed run-gts -m GtsGmscoreHostTestCases -t 'com.google.android.gts.audio.AudioHostTest#testTwoChannelCapturing'
Change-Id: Ie9a30e2607ae4ae9a9dd128e3bd80d7582eb381e
2018-02-15 15:05:00 -08:00
TreeHugger Robot
24c2b4e956 Merge "MediaSession: Rename mCallbackHandler to mCallback" 2018-02-14 03:58:51 +00:00
Sungsoo Lim
bdcb3080b4 MediaSession: Rename mCallbackHandler to mCallback
Support library uses reflection to the variable, mCallback, of
MediaSession. In order not to break the existing support lib
behavior on P devices, we need to keep the name.

Bug: 72979099
Test: version-compat-tests on P device
Change-Id: I5fd6c786d6a988777b94a3eb4f23d885202daa2a
2018-02-14 11:00:07 +09:00
Eric Laurent
92ab9f1c6b Merge "Add audioserver state callback" 2018-02-13 23:46:11 +00:00
TreeHugger Robot
2f711fec15 Merge "JAudioTrack: Create StreamEventCallback in MediaPlayer2Impl" 2018-02-13 11:25:32 +00:00
Hyundo Moon
d277683657 MediaBrowser2: Add search related methods
This CL adds following APIs:
 - BrowserCallback#onSearchResultChanged
 - BrowserCallback#onSearchResultLoaded (previously onSearchResult)
 - MediaLibrarySessionCallback#onLoadSearchResult

This CL also fixes conflicting @NonNull/@Nullable annotations in
MediaItem2 methods.

Bug: 72786724
Test: Builds successfully
Change-Id: Ica90ca6b47f33cd3d457a28598a035a00d144dfa
2018-02-13 17:04:33 +09:00