Commit Graph

6464 Commits

Author SHA1 Message Date
Jaewan Kim
de2bbb322b MediaSession2: Add reset() to the MediaPlayerBase
This would be used in response to
  - MediaController2#play()
  - KEYCODE_MEDIA_STOP

Bug: 64098437
Test: passed MediaComponentTest
Change-Id: I7cd4d855d5e1bf8e4260a9b920f30dfe2eea44e1
2018-03-02 18:03:42 +09:00
Hyundo Moon
2410a0dd31 Merge "Move MediaItem2 Builder to updatable" 2018-03-02 08:22:20 +00:00
TreeHugger Robot
2803e978d0 Merge "MediaMetadata2: Supplement Javadoc of each key" 2018-03-02 06:20:24 +00:00
TreeHugger Robot
5130fdb0ac Merge "cas: explicitly define possible key id values" 2018-03-01 18:50:18 +00:00
TreeHugger Robot
8f7aa97fa9 Merge "MediaPlayer2: clean up APIs" 2018-03-01 07:28:35 +00:00
Jean-Michel Trivi
38008955e3 Merge "AudioPolicy: support for add/remove AudioMix without unregistering" 2018-03-01 07:00:39 +00:00
TreeHugger Robot
3b0014dcad Merge "MediaSession2: Unhide setAudioFocusRequest" 2018-03-01 05:11:24 +00:00
Jean-Michel Trivi
af576a0e4f AudioPolicy: support for add/remove AudioMix without unregistering
System API for a registered AudioPolicy to attach or detach
  AudioMix without having to unregister, and then registering
  the new mix configuration.

Bug: 63906162
Test: AudioPolicyTest

Change-Id: Ib2fea8aa034d3f7b498e76dc1fc51c1ea508d3a2
2018-02-28 21:06:20 -08:00
Wei Jia
1789cc7f82 MediaPlayer2: clean up APIs
Make MediaPlayer2 derived from MediaPlayerBase
Test: MediaPlayer2 plays
Bug: 63934228
Change-Id: Ib31e3196ad65c694f778a8a79277e53017a7026f
2018-02-28 19:52:13 -08:00
TreeHugger Robot
c7c1ce8012 Merge "MediaSession2: Refine APIs" 2018-03-01 03:39:31 +00:00
Sungsoo Lim
12a1f62745 MediaSession2: Unhide setAudioFocusRequest
Bug: 64098437
Test: make update-api
Change-Id: I9244719e1a771ab7b420a95af6ba43faef7b352c
2018-03-01 12:31:52 +09:00
Sungsoo Lim
aa080a80a6 MediaSession2: Refine APIs
Bug: 64098437
Test: passed MediaComponentTest
Change-Id: I40e1ef141e47d17e2bfa0a689a680b45a3d73b03
2018-03-01 10:38:33 +09:00
TreeHugger Robot
4f7c46585d Merge "NEW API: Add Image.getHardwareBuffer()" 2018-03-01 01:26:14 +00:00
Mathias Agopian
3e88ed82e5 NEW API: Add Image.getHardwareBuffer()
This mirror the corresponding NDK API. For some
reason this was missing from the java version
of Image.

Bug: 73784759
Test: manual
Change-Id: Iafa6dedda809fe38ea4453d9873d1ba886f88481
2018-02-28 22:23:54 +00:00
Jean-Michel Trivi
e00f31b3f2 Ringtone: unhide looping and volume control
Also clean up whitespace in file.

Bug: 22182606
Test: adb shell clrgt --loop true --volume 50
Change-Id: I937b678f72b4a47b0f02b3124669e2de5e743033
2018-02-28 12:57:55 -08:00
Chong Zhang
cd53855311 cas: explicitly define possible key id values
Remove cas header from media jni headers, and define flags
for PES header extraction.

bug: 73898003

test: CTS MediaCasTest, MediaDrmClearkeyTest

Change-Id: I2a512e2dbeb8be53a64bfa0b89254032c7341fa2
2018-02-28 10:57:15 -08:00
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
Hyundo Moon
9edf2ca33e Move MediaItem2 Builder to updatable
This CL also removes the public constructor of MediaItem2, which was
suggested by API reviewers.

Bug: 73971203
Test: Passed MediaBrowser2Test (CTS)
Change-Id: If82c2795a4f205b9dfd4db11a173433359d1b352
2018-02-28 16:27:38 +09:00
Hyundo Moon
72706118cf MediaMetadata2: Supplement Javadoc of each key
The Javadoc of the METADATA_KEY_* does not contain type information.
This CL adds '@see' in each key so that the developer can easily notice
what method should be used.

Bug: 73877547
Test: Builds successfully
Change-Id: I04f1b0badc1b6e7af6cb04923ef4f59328248b74
2018-02-28 15:57:11 +09: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