Jaewan Kim
c9871326dd
Merge "MediaSession2: Implement PlaylistParams replacements" into pi-dev am: 328df91d99
...
am: 05ccd347d1
2018-03-16 07:05:14 +00:00
Jaewan Kim
2d7cfda523
Merge "MediaSession2: Remove MediaSession2#registerPlayerEventCallback()" into pi-dev am: eb8e914ea7
...
am: d28a13b41e
2018-03-16 05:03:07 +00:00
Jaewan Kim
f4abf4a0fe
Merge "MediaSession2: Remove onPlaylistChanged() without metadata" into pi-dev am: 9cc144850f
...
am: 94454404a5
2018-03-16 04:51:33 +00:00
Jaewan Kim
f10ca2f960
MediaSession2: Implement PlaylistParams replacements
...
This includes following changes
- Remove PlaylistParams
- Implement PlaylistParams replacements. Here's the list.
- get/setShuffleMode()
- get/setRepeatMode()
- Note: Playlist metadata APIs are already submitted (b/74174649)
Bug: 74116823, Bug: 74118768
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I0267ffeaf92257eb7b81ffc8b6a3f40b5a2f6f9c
2018-03-16 12:21:29 +09:00
Hyundo Moon
9182a7964a
Merge "MediaSession2: Convert DataSourceDesc to MediaItem2 in MyPlayerEventCallback" into pi-dev am: b0179a3a44
...
am: 0cbac17c98
2018-03-16 03:04:54 +00:00
Wei Jia
15bae53fe0
Merge "MediaPlayer2Impl: fix null object reference." into pi-dev am: 2d76c3ce82
...
am: ce07768acf
2018-03-16 02:10:01 +00:00
Jaewan Kim
8e17db5554
MediaSession2: Remove MediaSession2#registerPlayerEventCallback()
...
Bug: 74157064
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: Ia976c0ebe9f2b7eff0ae603db96ab106aa045cbc
2018-03-16 10:59:32 +09:00
Jaewan Kim
15fc050432
MediaSession2: Remove onPlaylistChanged() without metadata
...
Bug: 74174728
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I84495aa19bc03009c81cdefdf8e65fbff4b7bcb6
2018-03-16 10:52:18 +09:00
Hyundo Moon
b0179a3a44
Merge "MediaSession2: Convert DataSourceDesc to MediaItem2 in MyPlayerEventCallback" into pi-dev
2018-03-16 00:18:41 +00:00
TreeHugger Robot
2d76c3ce82
Merge "MediaPlayer2Impl: fix null object reference." into pi-dev
2018-03-15 22:54:49 +00:00
TreeHugger Robot
991ae64ffe
Merge "fix slow get caps -- DO NOT MERGE" into pi-dev
2018-03-15 21:40:32 +00:00
Wei Jia
371144fcc2
MediaPlayer2Impl: fix null object reference.
...
Test: cts tests pass
Bug: 74204684
Change-Id: I906eeb9d907ae1a798be585c54126f02eb66448f
2018-03-15 11:26:37 -07:00
Chong Zhang
a0b72a6cdd
fix slow get caps -- DO NOT MERGE
...
When get caps is called on an MediaCodec object, try to
use the codec info for that MediaCodec first as it should
be available during codec construction. Only when that
somehow failed go and initialize the full MediaCodecList,
as building the entire list could be very slow.
And when cloning the CodecCapabilities from MediaCodecInfo,
copy the fields directly and the fields (other than the ones
modifiable by client) are immutable after construction.
bug: 74073607
Test:
CTS media post submit:
cts-tradefed run cts-dev --module CtsMediaTestCases --compatibility:module-arg CtsMediaTestCases:include-annotation:android.platform.test.annotations.RequiresDevice
Change-Id: I4ae5f2431da8528e1eca093c5cfb98abcb4a5bbf
(cherry picked from commit 90d7304a83
2018-03-15 18:17:53 +00:00
Wei Jia
af69920572
Merge "MediaPlayer2Impl: fix several functions" into pi-dev am: 50f118a121
...
am: 036f9d1436
2018-03-15 16:05:51 +00:00
TreeHugger Robot
50f118a121
Merge "MediaPlayer2Impl: fix several functions" into pi-dev
2018-03-15 15:40:10 +00:00
Hyundo Moon
e14acb53fa
MediaSession2: Convert DataSourceDesc to MediaItem2 in MyPlayerEventCallback
...
This CL adds a hidden API getMediaItem() in MediaPlaylistAgent.
Bug: 74506462
Test: Passed CTS
Change-Id: I1aefd7e47e1881fe14fcd1cc681095a6130624cf
2018-03-15 20:37:35 +09:00
Jaewan Kim
5772194a6f
Merge "MediaSession2: Implement skipTo APIs" into pi-dev am: a01d80b97e
...
am: a1e87d864b
2018-03-15 10:47:07 +00:00
Jaewan Kim
68c774a1ee
MediaSession2: Implement skipTo APIs
...
This implements following APIs from both session and controller.
- skipToPlaylistItem()
- skipToNextItem()
- skipToPreviousItem()
Bug: 74175632
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I47d94346c997314ff39797bac3034aa507058036
2018-03-15 15:49:58 +09:00
Wei Jia
096d97ac3e
MediaPlayer2Impl: fix several functions
...
Test: MediaPlayer2 plays
Bug: 74204684
Change-Id: I0e4fbd2915f2a726a6016c13f47e7d1433593c74
2018-03-14 14:46:24 -07:00
Jaewan Kim
b8a4df9d40
Merge "MediaSession2: Refactor incoming binder calls to the MediaSession2Stub" into pi-dev am: 3b8eedcb34
...
am: c06466a8c1
2018-03-14 10:53:42 +00:00
Jaewan Kim
009c393ca1
MediaSession2: Refactor incoming binder calls to the MediaSession2Stub
...
This CL refactors methods in MediaSession2Stub that handles incoming
binder calls from the controller by adding methods to do followings
in one place.
1. Check if the session hasn't closed.
2. Check if the controller is allowed for the command
3. Call SessionCallback#onCommandRequest() for APIs that would be
sent directly to the MediaPlayerBase or MediaPlaylistAgent if
allowed.
This CL also adds missing command code for setRating().
Bug: 74581821
Test: Run CTS tests with MediaComponents/runcts.sh
Change-Id: I9b96e26b7644cff3c54269773590c73ff30f956c
2018-03-14 10:02:36 +09:00
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
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
