Commit Graph

7249 Commits

Author SHA1 Message Date
Sungsoo Lim
728e13b7b9 Add MediaItem2
Bug: 121216661
Test: build
Change-Id: I7dfd36bbc1feeeb0a80641940579b3d6187bd2f2
2018-12-19 15:03:49 +09:00
Jeff Sharkey
e8b3d96bc6 Merge "Improve thumbnail generation utilities." 2018-12-18 22:04:40 +00:00
Jeff Sharkey
32f6c7c097 Improve thumbnail generation utilities.
The existing APIs were pretty limited by only accepting a "kind"
value, so improve them to accept an arbitrary size, and offer a way
to cancel requests when no longer needed.

The older APIs were a mix of both public and @UnsupportedAppUsage,
so mark them all both public and deprecated so we can clearly steer
developers towards better options.  (The deprecated methods are
implemented using the new APIs internally for sanity.)

Use modern ImageDecode internally, which is more robust than
BitmapFactory.  Add CTS to confirm that we generate thumbnails of
reasonable sizes.

Bug: 119887587
Test: atest android.media.cts.ThumbnailUtilsTest
Change-Id: I4ca35569ad5c661b327a0cb24a48ebc21f6087b7
2018-12-18 10:03:10 -07:00
TreeHugger Robot
77a8a387f0 Merge "MediaPlayer2: add DataSourceDesc for source dependent API's" 2018-12-18 02:02:40 +00:00
Dongwon Kang
f51deea70e Merge "Remove unusued code; MediaPlayerBase and MP.set|getBufferingParams" 2018-12-18 01:24:35 +00:00
Dongwon Kang
5fbf64934f Remove unusued code; MediaPlayerBase and MP.set|getBufferingParams
Test: build
Bug: 112766913
Change-Id: I999a637a1cb47a28a032478f3c56ab0645837f92
2018-12-17 13:34:33 -08:00
Wei Jia
78a88fcba4 MediaPlayer2: add DataSourceDesc for source dependent API's
Test: cts
Bug: 112549021
Change-Id: Iecdb8cecc21abfdb906f30f93f3a5d02c2d8e16a
2018-12-17 10:57:06 -08:00
Jin Seok Park
864323beba Merge "AML: Remove unbundling MediaMetadata in MediaSessionRecord" 2018-12-17 05:04:04 +00:00
Jin Seok Park
a13857321f AML: Remove unbundling MediaMetadata in MediaSessionRecord
In order to record a log when MediaMetadata is unparceled in the
system process, MediaMetadata calls Bundle#setDefusable when it
is initialized. In order to avoid unnecessarily making
Bundle#setDefusable a public API, this CL removes the unparceling
instance in MediaSessionRecord by extracting the necessary
information inside MediaSession and sending them to
MediaSessionRecord separately.

Bug: 119789387
Test: Build
Change-Id: I7d44fd05250a291bd8d64850cc3c6f47236f9f62
2018-12-16 17:49:49 +09:00
Wei Jia
acf2796db9 DataSourceCallback: fix java docs
Test: make offline-sdk-docs
Bug: 112549021
Change-Id: I4c082f3e9547a768f9327cfaf874f3bba0dab8bf
2018-12-14 11:16:30 -08:00
Eric Laurent
7674052684 AudioEffect: make effect descriptor parcelable
Make AudioEffect.Descriptor class parcelable so that a list of
active effects can be included into AudioRecordingConfiguration.

Note: AudioEffect.Descriptor class was made final but it is OK as it
was never consumed by any SDK API.

Bug: 111438757
Test: make
Change-Id: I238b4ea47c613fd2abacc8729d9baf31423283a4
2018-12-13 10:49:51 -08:00
TreeHugger Robot
b3c1557892 Merge "AudioPresentation: add toString method" 2018-12-12 21:44:44 +00:00
Dongwon Kang
24b90d3bab Merge "Add media2 build target to prevent hidden API usage in MediaPlayer2" 2018-12-12 21:20:26 +00:00
TreeHugger Robot
04c132139f Merge "Add AudioPresentation selection support for MediaCodec" 2018-12-12 17:54:40 +00:00
Ray Essick
447bedc7fa Merge "Opus Encoding plumbing" 2018-12-12 17:18:57 +00:00
Adrian Roos
e77ff79fdb Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi" 2018-12-12 13:43:34 +00:00
TreeHugger Robot
f7e01a4ac4 Merge "Add API for querying haptic playback support." 2018-12-12 02:32:28 +00:00
Dongwon Kang
43c88f346e Add media2 build target to prevent hidden API usage in MediaPlayer2
The only hidden API usuage, c-tor of TimedText, is temporarily commented
out.

Test: make media2
Bug: 112766913
Change-Id: I6330724e65bb42db678f23134677dfd8675a3970
2018-12-11 18:30:27 -08:00
jiabin
66f9e72e27 Add API for querying haptic playback support.
Bug: 111454766
Test: Manually test
Change-Id: Ic6a0aba877a417faf8ff0c9f2e7b0ea99e3d7fbf
2018-12-12 00:07:47 +00:00
ybai
5e05320c72 Add AudioPresentation selection support for MediaCodec
Bug: 119312182
Test: compile
Change-Id: I5cfc577b681ea6dcc1692abf71837fd5f41616ea
2018-12-11 12:46:21 -08:00
Adrian Roos
66f859135b API: Clean up redundant and ineffective usages of SystemApi and TestApi
Everything that is marked SystemApi or TestApi, but not @hide is still
part of the public SDK, it is therefore not sound to have that combination.

In the future, specifing such a combination will be considered an error
to prevent inadvertently exposing SystemApi and TestApi as public API.

Bug: 115333477
Change-Id: Ibd5d6a22862fdbc1e20a1cb3925280f5a682edea
Test: METALAVA_PREPEND_ARGS="--error UnhiddenSystemApi" m checkapi
Exempt-From-Owner-Approval: API cleanup
2018-12-11 20:38:02 +01:00
Mikhail Naganov
d42695defd AudioPresentation: add toString method
Found it useful to have this method for debugging.
App developers should be able to use it, too.

Bug: 63901775
Bug: 119312182
Test: atest android.media.cts.MediaExtractorTest#testGetAudioPresentations
Change-Id: I3b984abad979df7730aafd95ee4627b740184552
2018-12-11 10:30:21 -08:00
TreeHugger Robot
3ec349a400 Merge "Add AudioTrack.isDirectPlaybackSupported method" 2018-12-11 13:54:38 +00:00
TreeHugger Robot
45dbe4ed82 Merge "Add eac3-joc MIME type" 2018-12-11 10:29:05 +00:00
Andy Hung
d10a82edfe Merge "AudioFormat: Add getFrameSizeInBytes" 2018-12-10 23:50:58 +00:00
TreeHugger Robot
833960a416 Merge "Add MediaCodec constants for HDR10+" 2018-12-10 20:54:39 +00:00
Orion Hodson
b6a49777b7 Merge "Remove ScopedBytes use" am: 422fa22456 am: 7c58021208
am: 2e09a6b61a

Change-Id: Ieda76179a3e533230d14d19a4fef84e3b8f55394
2018-12-10 02:51:17 -08:00
Orion Hodson
2e09a6b61a Merge "Remove ScopedBytes use" am: 422fa22456
am: 7c58021208

Change-Id: I8c552ea28fa7fb5577a7932c599a0f615df28125
2018-12-09 12:16:36 -08:00
Treehugger Robot
422fa22456 Merge "Remove ScopedBytes use" 2018-12-09 19:36:28 +00:00
Andy Hung
fd8859d03e AudioFormat: Add getFrameSizeInBytes
Test: Check docs, CTS AudioFormatTest
Bug: 116723648
Change-Id: I87a2c34df5fa36a4ebce61942c7654419068d6a9
2018-12-07 17:19:08 -08:00
Andy Hung
d0e81d2fb7 Merge "AudioFormat: Make member variables final for immutable class" 2018-12-08 00:30:03 +00:00
TreeHugger Robot
fc4fc2c9e3 Merge "MediaTimestamp: add Builder" 2018-12-07 23:27:56 +00:00
Adrian Roos
b7136fcc5a Merge "Revert "AML: Make MediaSessionManager.createSession() as @SystemApi"" 2018-12-07 22:08:52 +00:00
Adrian Roos
d6d5ee736f Revert "AML: Make MediaSessionManager.createSession() as @SystemApi"
This reverts commit 0852ebab41.

Reason for revert: Return and parameter types of added SystemApi are not themselves part of the API.

Bug: 119749862
Change-Id: I9f89abc25d2f3f6cff60c2465fca8e471e7f1f2a
2018-12-07 14:11:51 +00:00
TreeHugger Robot
abe028ab5b Merge "MediaPlayer2: fix sdk docs" 2018-12-07 05:48:59 +00:00
Hyundo Moon
04f55a3391 Merge "AML: Unhide 4-params constructor of RemoteUserInfo" 2018-12-07 02:24:57 +00:00
Andy Hung
7d8aa3f36c AudioFormat: Make member variables final for immutable class
Test: CTS AudioFormatTest
Bug: 120626200
Change-Id: I56f9b569546622e4ababa306b0f5bb6cad2b1d4a
2018-12-06 16:14:52 -08:00
Wei Jia
efb8cd1337 MediaTimestamp: add Builder
Test: cts
Bug: 112549021
Change-Id: I696fea67407c5a9b8fd4e2e17ac88c26be05a157
2018-12-06 14:59:29 -08:00
Michael Chan
2de156d15f Add AudioTrack.isDirectPlaybackSupported method
The method checks whether the provided AudioFormat can be played
via currently connected output devices w/o SRC or downmixing
by the framework.

Bug: 120044865
Test: atest CtsMediaTestCases:AudioTrackTest#testIsDirectPlaybackSupported
Change-Id: I63e8334a60d48c17999f500d87360f9c71185dfb
2018-12-06 14:41:03 -08:00
Wei Jia
2e47eea512 MediaPlayer2: fix sdk docs
Test: make offline-sdk-docs
Bug: 112549021
Change-Id: I422da92262428b63934e4268001903dfdf01836b
2018-12-06 12:52:08 -08:00
Chong Zhang
6e4fa27afd Add MediaCodec constants for HDR10+
bug: 118507186

Change-Id: I742b93ba4475fb82b7a9f9aaf237f43cfa66a915
2018-12-06 10:42:24 -08:00
Hyundo Moon
b505f0aab3 AML: Unhide 4-params constructor of RemoteUserInfo
Bug: 119752205
Test: make update-api
Change-Id: Idabdd68a335afae58392ef3bb357991d10718a97
2018-12-06 11:58:46 +09:00
TreeHugger Robot
eb8464dc0a Merge "MediaPlayer2: unhide MediaPlayer2 and related classes." 2018-12-06 01:08:26 +00:00
TreeHugger Robot
67caf70322 Merge "SubtitleData: add Builder in SubtileData and TimedMetaData" 2018-12-06 01:05:15 +00:00
Robert Shih
cbfc0b405c Merge "MediaPlayer2: per-source native drm prepare/release" 2018-12-05 19:37:02 +00:00
Yanning Bai
cdf22ef7cb Add eac3-joc MIME type
Bug: 120549104
Test: make
Change-Id: I443af3f50cb3f2a00ccce1bb8f222f63b1522cb8
2018-12-05 10:28:49 -08:00
Jakub Pawlowski
15a81d7f78 JavaDoc fix
Test: make offline-sdk-docs
Change-Id: I0ae64b0b7c2d46d6b196ae98beecd4cf4e910db2
2018-12-05 13:47:29 +00:00
Jakub Pawlowski
b0b3a64a37 Java doc fix: @throw -> @throws
Test: compile javadoc
Change-Id: I243b824d0573470455d297c6d45a14e1b503e8ff
2018-12-05 10:58:28 +01:00
Hyundo Moon
8d2cfac24a Merge "AML: Make MediaSessionManager.createSession() as @SystemApi" 2018-12-05 06:48:30 +00:00
Jeff Sharkey
9246fc7616 Merge "Stop indexing location metadata." 2018-12-05 05:46:18 +00:00