Hyundo Moon
c52575993d
Merge "MediaSession2: Replace PlaybackState2" into pi-dev am: 15d3ba624c
...
am: f0e87128bf
2018-03-13 12:39:52 +00:00
Hyundo Moon
15d3ba624c
Merge "MediaSession2: Replace PlaybackState2" into pi-dev
2018-03-13 12:03:55 +00:00
Christofer Åkersten
8f5d49c242
Merge "Ensure members are non-null in callback" into pi-dev am: f0927b0726
...
am: 1c5d9b5b7d
2018-03-13 11:31:50 +00:00
Hyundo Moon
c006dc2a85
MediaSession2: Replace PlaybackState2
...
This CL removes PlaybackState2 and replaces it with other APIs.
Bug: 74370608, Bug: 73971431
Test: Passed CTS
Change-Id: Ifa16b1d551957ab4bb06979ddf29b18772093035
2018-03-13 17:05:55 +09:00
Jaewan Kim
dfa75dcbcf
Merge changes from topics "session2_additem", "session2_playlistmetadata", "session2_getplaylist" into pi-dev am: c3efa17bdd
...
am: f3919e0046
2018-03-13 07:09:55 +00:00
Jaewan Kim
6b221d3d2b
MediaSession2: Implement update/getPlaylistMetadata() am: dc5ab8095a
...
am: 1334c37ef9
2018-03-13 07:04:15 +00:00
Jaewan Kim
943103d2db
MediaSession2: Implement get/setPlaylist() am: 25db3cdb93
...
am: 1217c67aca
2018-03-13 06:59:51 +00:00
Christofer Åkersten
623122cd98
Ensure members are non-null in callback
...
Bug: 74570008
Test: runtest-cts-MediaComponents -r 100
Change-Id: I59590afae4e67fa8a90f8a7b4a6be58ce54e2806
2018-03-13 06:23:34 +00:00
Chong Zhang
e40d35fa08
Merge "heif: add option for specifying bitmap pixel format" into pi-dev am: 8807436378
...
am: 7986a16651
2018-03-13 06:18:56 +00:00
Jaewan Kim
1334c37ef9
MediaSession2: Implement update/getPlaylistMetadata()
...
am: dc5ab8095a
2018-03-13 05:12:26 +00:00
Jaewan Kim
1217c67aca
MediaSession2: Implement get/setPlaylist()
...
am: 25db3cdb93
2018-03-13 05:05:29 +00:00
Jaewan Kim
c3efa17bdd
Merge changes from topics "session2_additem", "session2_playlistmetadata", "session2_getplaylist" into pi-dev
...
* changes:
MediaSession2: Implement add/remove/replacePlaylistItem()
MediaSession2: Implement update/getPlaylistMetadata()
MediaSession2: Implement get/setPlaylist()
2018-03-13 04:30:50 +00:00
Dongwon Kang
80b7543b86
Merge "Make MP2 operations asynchronous and send matching notifications" into pi-dev am: 2b83982b2b
...
am: 6841b48541
2018-03-13 03:38:02 +00:00
Jaewan Kim
8562fd9504
MediaSession2: Implement add/remove/replacePlaylistItem()
...
Bug: 73149584
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I29804f52eaca45de21fd66634e4eeee2c72a9a25
2018-03-13 11:59:18 +09:00
Jaewan Kim
dc5ab8095a
MediaSession2: Implement update/getPlaylistMetadata()
...
Bug: 74174649
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I3ac2dabfc7f532bf7d7262940e3dc309e97fd45a
2018-03-13 11:55:55 +09:00
Jaewan Kim
25db3cdb93
MediaSession2: Implement get/setPlaylist()
...
Bug: 74326040
Test: Run CtsMediaTests for MediaSession2
Change-Id: Ib799c03edd2f79c6f9ffa989aea1137018ec55b3
2018-03-13 11:48:30 +09:00
TreeHugger Robot
8807436378
Merge "heif: add option for specifying bitmap pixel format" into pi-dev
2018-03-13 02:29:25 +00:00
TreeHugger Robot
2b83982b2b
Merge "Make MP2 operations asynchronous and send matching notifications" into pi-dev
2018-03-13 00:09:02 +00:00
Chong Zhang
f65d9e23a8
Merge "heif: add definition for HEVC Main Still Picture profile" into pi-dev am: f78a08c2d9
...
am: 48676f190a
2018-03-12 22:02:24 +00:00
Chong Zhang
a89f6e1bb2
heif: add option for specifying bitmap pixel format
...
Add an option similar to BitmapFactory.Options to the bitmap
extraction APIs added in P to allow the app to specify bitmap's
pixel format. MediaMetadataRetriever's old getFrameAtTime()
only allows extraction in RGB565, for image use case the bitdepth
could be too low.
Also change return type of getFramesAtIndex to List as
Lint is complaining about returning raw arrays.
bug: 63633199
bug: 73886998
Change-Id: I40f0a421c767483e32c7744180dc5a187681e066
2018-03-12 21:23:00 +00:00
Chong Zhang
f78a08c2d9
Merge "heif: add definition for HEVC Main Still Picture profile" into pi-dev
2018-03-12 19:40:00 +00:00
Dongwon Kang
69d2d51a59
Make MP2 operations asynchronous and send matching notifications
...
Test: testPlayVideo & testEventCallback & testPlaylist
Bug: 74204782
Change-Id: I7a0f7d1ba5334c68380ef928294dc52cae76c185
2018-03-12 11:33:34 -07:00
Wonsik Kim
8da96bdfcb
Merge "Implement CodecProfileLevel.{equals|hashCode}" into pi-dev am: 89a2b6c560
...
am: 077a828c66
2018-03-12 18:31:39 +00:00
TreeHugger Robot
4c2ef0271a
Merge "Move display id into MotionEvent"
2018-03-12 18:02:43 +00:00
TreeHugger Robot
89a2b6c560
Merge "Implement CodecProfileLevel.{equals|hashCode}" into pi-dev
2018-03-12 17:45:57 +00:00
Wei Jia
445198cc76
Merge "MediaPlayer2Impl: fix getBufferedPosition" into pi-dev am: 2e94d509b3
...
am: 5d129b909d
2018-03-10 08:38:37 +00:00
Marco Nelissen
95f468d032
Merge "Rework thumbnail cleanup" into oc-mr1-dev am: b20a329f4c am: 6db0f4dac8
...
am: 18001f79e5
2018-03-10 06:32:44 +00:00
Mikhail Naganov
6b2394899f
Audio presentation: Docs & Testability fixes
...
Fix some minor issues in JavaDocs. Make some methods visible
for tests.
No public API changes.
Bug: 63901775
Test: cts-tradefed run cts -m CtsMediaTestCases
Change-Id: If3e4d0ac0878408cfa552406a011869b9b8c606e
2018-03-09 17:04:05 -08:00
TreeHugger Robot
2e94d509b3
Merge "MediaPlayer2Impl: fix getBufferedPosition" into pi-dev
2018-03-10 01:00:35 +00:00
Marco Nelissen
6db0f4dac8
Merge "Rework thumbnail cleanup" into oc-mr1-dev
...
am: b20a329f4c
2018-03-09 23:00:20 +00:00
Wei Jia
c3725a94bb
MediaPlayer2Impl: fix getBufferedPosition
...
Test: MediaPlayer2 plays
Bug: 74204684
Change-Id: Ide7c2ebe7e29c16d427a8aa6aa4b0384e8a2539f
2018-03-09 14:50:04 -08:00
Wonsik Kim
62b01c7d26
Implement CodecProfileLevel.{equals|hashCode}
...
Bug: 74435947
Test: atest CtsMediaTestCases:MediaCodecListTest
Change-Id: Ia77182538c5a151bb561f7d273f7cbaa29671a4c
2018-03-09 19:15:39 +00:00
Hyundo Moon
93370a3f45
Merge "MediaSession2: Ensure NonNull/Nullable for parameters of public methods" into pi-dev am: 5cef8984ba
...
am: 2006407144
2018-03-09 14:51:52 +00:00
Jaewan Kim
3004860bc9
Merge "MediaSession2: Implement MediaSession2#updatePlayer()" into pi-dev am: 790a31ee31
...
am: 9331c2d555
2018-03-09 09:42:38 +00:00
Hyundo Moon
5cef8984ba
Merge "MediaSession2: Ensure NonNull/Nullable for parameters of public methods" into pi-dev
2018-03-09 08:28:08 +00:00
Wei Jia
85dee97df4
Merge "MediaPlayer2Impl: fix getPlayerState." into pi-dev am: af6cb35749
...
am: 004f53709d
2018-03-09 07:55:09 +00:00
Hyundo Moon
c896d9d7e6
MediaSession2: Ensure NonNull/Nullable for parameters of public methods
...
Bug: 73863865
Test: runtest-MediaComponents
Change-Id: Id40f221ae60b1e63afd9ff71950589fe13a7f526
2018-03-09 14:00:11 +09:00
TreeHugger Robot
790a31ee31
Merge "MediaSession2: Implement MediaSession2#updatePlayer()" into pi-dev
2018-03-09 04:37:29 +00:00
TreeHugger Robot
af6cb35749
Merge "MediaPlayer2Impl: fix getPlayerState." into pi-dev
2018-03-09 03:10:41 +00:00
Jean-Michel Trivi
ab2e956360
New intent for microphone mute change notification
...
AudioManager: define ACTION_MICROPHONE_MUTE_CHANGED.
AudioService:
- broadcast intent when setMicrophoneMute() is called
with FLAG_RECEIVER_REGISTERED_ONLY.
- remove outdated (invalid) comments.
Bug: 70857126
Test: m -j ; make -j offline-sdk-docs ; make -j cts ; \
cts-tradefed run cts-dev -m CtsMediaTestCases -t android.media.cts.AudioManagerTest#testMicrophoneMuteIntent
Change-Id: I7391522f0195d06592e4f853e9b672fdec66d37a
Merged-In: I7391522f0195d06592e4f853e9b672fdec66d37a
2018-03-08 22:04:21 +00:00
Wei Jia
be6e3024bd
MediaPlayer2Impl: fix getPlayerState.
...
Test: MediaPlayer2 plays
Bug: 74204684
Change-Id: Ib27930287485f074be6a8df4a90fb78023153ccd
2018-03-08 13:56:42 -08:00
Marco Nelissen
6d2096f388
Rework thumbnail cleanup
...
Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
2018-03-08 21:46:15 +00:00
Sungsoo Lim
8c9939908b
Merge "Make MediaPlaylistAgent updatable" into pi-dev am: 5f0fb0c8fa
...
am: 4108911411
2018-03-08 12:37:20 +00:00
Sungsoo Lim
b9c5b5c066
Merge "VideoView2: Remove setRouteAttributes" into pi-dev am: 3bfe2b15b8
...
am: 81594cc2ed
2018-03-08 11:09:41 +00:00
Jaewan Kim
71467d42e2
Merge "MediaSession2: Clean up TODOs under frameworks/base" into pi-dev am: c23ee7639b
...
am: a0e1b5bbf8
2018-03-08 09:22:57 +00:00
Jaewan Kim
9af5bc8370
MediaSession2: Implement MediaSession2#updatePlayer()
...
Bug: 74364873
Test: Run MediaSession2Test in CTS
Change-Id: I5161c0d771afd5036e2c09b2cc2a165f80c534f7
2018-03-08 18:11:55 +09:00
Sungsoo Lim
5f8a8ee0e5
Make MediaPlaylistAgent updatable
...
Bug: 74366050
Test: build
Change-Id: Iea8e4d9b6a11393bd837da90394d95529fdbe5eb
2018-03-08 17:28:23 +09:00
Sungsoo Lim
ec75d51e74
VideoView2: Remove setRouteAttributes
...
Being consistent, create route player internally and do not expose it
since VideoView2 creats a MediaPlayer inside and do not expose it.
Bug: 72527212
Test: manually with VideoViewTest
Change-Id: I6db3bc668f6ab77587fed49b2d34611bc3c30465
2018-03-08 13:55:21 +09:00
Jaewan Kim
525c88c2b7
MediaSession2: Clean up TODOs under frameworks/base
...
This change includes
- Addressed trivial TODOs (takes less than 1min)
- Renamed playlist controller to playlist agent
- Renamed mplc to playlistAgent
- Renamed mpb to player
- Assigned buganizer issues for TODOs
Bug: 74361045
Test: Run MediaComponentsTest
Change-Id: I45e97081b5a3f24988c3daadd007edcb51be5288
2018-03-08 13:54:34 +09:00
Jean-Michel Trivi
3ec338d06d
Merge "AudioService: don't send BECOMING_NOISY when dyn policy affects media" into pi-dev am: 4e532f59dc
...
am: f686a34d6a
2018-03-07 22:30:28 +00:00
