Commit Graph

8860 Commits

Author SHA1 Message Date
Jaewan Kim
8e7aa79cfa MediaSessionManager: Apply API review
Bug: 138648566
Test: Build
Change-Id: I46c0e32ba409736234af0ab50c7bceadaacd2887
2020-01-28 11:11:31 +09:00
Dichen Zhang
c69b5192a3 Update MediaFormat java doc
Add KEY_DURATION.

Change-Id: I9019e7969262bf83652e0c041130cabf2fcf6d0b
Bug: 142823918
2020-01-27 17:59:09 +00:00
Marco Nelissen
7f43cb9a5b Merge "Fix handling of H.263 level 45" 2020-01-24 19:30:23 +00:00
Marco Nelissen
ded9b059ba Merge "MediaMetadataRetriever: parse genre tags" 2020-01-24 18:36:03 +00:00
Marco Nelissen
2d71602219 Fix handling of H.263 level 45
H.263 level 45 only supports QCIF, so we shouldn't treat it as "higher"
than e.g. level 40, which also supports CIF.

Bug: 147922039
Test: CTS
Change-Id: I4a09b2362829b2f825dae7220155e14f54837b18
2020-01-24 09:04:46 -08:00
Santiago Seifert
418cd1d7f4 Add KEY_CODECS_STRING to MediaFormat
KEY_CODECS_STRING is associated to the codec string of a track.

Bug: 132153067
Bug: 134057371
Test: Pending.
Change-Id: I502f11523d2fe6bc78be7382eaaa91d7234d1db0
2020-01-24 14:41:04 +00:00
Automerger Merge Worker
bb80180230 Merge "Update documentation for TV DVB devices." am: 315e9d65d7 am: 5a55714a9e am: c05f3aaf01
Change-Id: If60dfd998226b6b3685626c70a2cb6bf1be0f0c8
2020-01-24 08:05:33 +00:00
Automerger Merge Worker
c7fa9073aa Merge "TIF: Add content ratings" am: 0a69a874a7
Change-Id: I07e3a41bfea72c0b5a9920b8da8e12f578bdbaba
2020-01-24 04:25:54 +00:00
Kyeongkab.Nam
bbed3d5492 TIF: Add content ratings
Put comments for the newly added DTMB, New Zealand
and Thailand rating strings.

Test: manual
Bug: 112835405
Change-Id: I4b1e8b87efdd675bdcddec86433164518da0f2bf
2020-01-24 02:49:07 +00:00
TreeHugger Robot
8ee04e6610 Merge "clean up content ratings" 2020-01-24 02:34:40 +00:00
Kyeongkab.Nam
9b5437fd6c clean up content ratings
remove periods for consistency.
also resolve the confilict with aosp/741081

Test: manual
Change-Id: Iaba68724432ca6b8d03d7772a60beeedb94a8fe7
2020-01-23 17:11:47 -08:00
Eric Laurent
ba7ef0b1c6 Merge "AudioEffect: add missing values to Descriptor.connectMode" 2020-01-23 23:41:24 +00:00
Eric Laurent
7afef8a2d8 AudioEffect: add missing values to Descriptor.connectMode
AudioEffect.Descriptor.connectMode is a string exposed by SDK
but only some valid values are defined by SDK.
Add missing values for pre and post processing connect modes.

Bug: 136294538
Test: make
Change-Id: I5be02c08945d37fa80eb58ab0a25a0085bb9fb58
2020-01-23 12:20:30 -08:00
nchalko
5a55714a9e Merge "Update documentation for TV DVB devices."
am: 315e9d65d7

Change-Id: Ibcacfcfedbc0fd27d8156dbb2943441339240884
2020-01-23 10:14:49 -08:00
Nick Chalko
aafdda0247 Update documentation for TV DVB devices.
Change-Id: Idcc80691be435e755203e9dd30a439c06ba0a5b5
Test: m framework-all update-api -j
Bug: 148065722
2020-01-23 09:13:02 -08:00
Oscar Azucena
4672efb101 Merge "Added Android user id based audio routing." 2020-01-23 13:32:23 +00:00
TreeHugger Robot
e36db53ade Merge "Unhide getAudioHandle" 2020-01-23 07:50:25 +00:00
Andy Hung
acf452054e Merge "Add TV audio device management APIs." 2020-01-23 07:19:09 +00:00
Hyundo Moon
0acee601f8 Merge "Limit the number of MediaSessions per uid" 2020-01-23 06:37:36 +00:00
shubang
61f47eb340 Unhide getAudioHandle
Test: make;
Bug: 139308734
Change-Id: I125da39637f3020af1afdd54d7ac6d8ec48971fa
2020-01-23 04:50:54 +00:00
Hyundo Moon
745422a6a4 Limit the number of MediaSessions per uid
This CL makes MediaSessionService counts the number of current
MediaSessions per uid, and throw exception to the app if the number
exceeds the limit.

Bug: 143672815
Test: atest MediaSessionTest
Change-Id: Ib3dd0f655d54f9ca436bcc3808e8eba241dfaacc
2020-01-23 13:40:34 +09:00
TreeHugger Robot
2a8fae9828 Merge changes from topic "voiceinteraction-model-enrollment"
* changes:
  async enrollment support AlwaysOnHotwordDetector
  add KeyphraseModelManager
2020-01-23 02:46:50 +00:00
Andy Hung
97aa07f8fc Add TV audio device management APIs.
Updates to AudioManager, AudioDeviceInfo, AudioTrack.

Test: make, boot sanity (functionality stubbed, no effect)
Bug: 133526565
Change-Id: Iba99871a5050a90887c4dd101ae227b1663fe149
2020-01-22 18:26:24 -08:00
Oscar Azucena
76788f0bd0 Added Android user id based audio routing.
Added Android user id based routing. Added API to defined and removed
user id based routing. The APIs are based on the applications uid based
routing. The logic for user id based routing also largely resembles the
application's uid based routing.

Bug: 139365417
Test: atest
com.google.android.gts.audio.AudioHostTest#testUserIdDeviceAffinity
Test: atest AudioPlaybackCaptureTest
Change-Id: I1f458680c96439f047829d5b2a5d1f0d37be60bd
2020-01-23 00:41:59 +00:00
Nicholas Ambur
ef84fc4843 add KeyphraseModelManager
Exposes a set of @SystemApi's allowing the active VoiceInteractionService
to enroll voice models.

Bug: 147159435
Test: manual tested enrollment and unenrollment via bundled
hotwordenrollment application and test app.

Change-Id: I94ef3550df236486401a0a6f9de9d874b9bf9b46
2020-01-22 16:40:13 -08:00
Automerger Merge Worker
11a60a9a7e Merge "Fix equals and hashCode APIs on TvTrackInfo" am: 2e8d16f714 am: 7e6df33644 am: 08c064c6c3
Change-Id: Id27dbd4cca87a6f96fed5dfe078419d4f720bd20
2020-01-23 00:11:28 +00:00
nchalko
7e6df33644 Merge "Fix equals and hashCode APIs on TvTrackInfo"
am: 2e8d16f714

Change-Id: I3a88659ad590b1e7c62840e6d737befa4a7d4ecd
2020-01-22 15:39:05 -08:00
Andy Hung
7f75d36006 Merge "AudioTrack: Add TV Api setters and getters" 2020-01-22 23:30:51 +00:00
TreeHugger Robot
2d74e7f844 Merge "Final cleanup: Add missing fields in SectionSettings and DemuxCaps" 2020-01-22 23:18:57 +00:00
TreeHugger Robot
b44e3d7201 Merge "Use LinearBlock in MediaEvent" 2020-01-22 23:01:13 +00:00
Henry Fang
7b312488e1 Merge "Add Media Format key for Tuner" 2020-01-22 22:15:27 +00:00
Andy Hung
c33c90813f AudioTrack: Add TV Api setters and getters
Test: atest AudioTrackTest#testAudioDescriptionMixLevel
Test: atest AudioTrackTest#testDualMonoMode
Bug: 133526565
Change-Id: Icbdfcec65e3851ca1d3abfc920a572ea45a55c9c
2020-01-22 13:34:49 -08:00
shubang
b3f7b9acd2 Use LinearBlock in MediaEvent
Test: make;
Bug: 139308734
Change-Id: Idcf61d14d3bacd508c0e013ce5bdb8d7bd6d45ca
2020-01-22 13:20:06 -08:00
shubang
3ca5656c33 Final cleanup: Add missing fields in SectionSettings and DemuxCaps
Test: make;
Bug: 139308734
Change-Id: Ie3f37f9c4b47144bc664ebff2ab685feb21eb033
2020-01-22 21:15:08 +00:00
Wonsik Kim
d9e6d584ef Merge "media: MediaCodec buffer API revision" 2020-01-22 19:02:00 +00:00
Henry Fang
6cc8da9138 Add Media Format key for Tuner
Test: manual
bug: 133525759
Change-Id: I083fa5f210b02c56299ef4625491a157131e897e
2020-01-22 10:46:27 -08:00
Kyunglyul Hyun
581fc98d65 MediaRouter: enable transferring from/to BT devices.
The main objective of this CL is to enable selecting BT device.
For that it updates MRM and SystemMediaRoute2Provider such that
  - MRM.getRoutingControllers() returns a list including the system session
  - SystemMediaRoute2Provider marks routes as "transferable"
  - SystemMediaRoute2Provider sets provider id correctly
  - SystemMediaRoute2Provider handles transferToRoute()

Bug: 147979868
Bug: 147122575

Test: atest mediaroutertest
&& manually selecting phone / bt devices from output switcher

Change-Id: I2e2032fd6677f79b9f864c313c40846daa87f113
2020-01-22 20:46:22 +09:00
James Wei
bb3f548234 MTP: Add MTP Thumbnail feature
Add thumbnail support for more supported image & video format

Bug: 117863715
Test: atest MtpTests
Test: manual test on Windows 10 file explorer
Test: manual test on Linux nautilus file browser
Change-Id: Id973db64683dbdb75f1fe97cae8439bab6cdcb57
2020-01-22 09:38:59 +00:00
TreeHugger Robot
f8cb8930bc Merge "Add isDocumentType in MediaFile and fix test case fail" 2020-01-22 06:52:34 +00:00
Hayden Gomes
d59b90acc0 Merge changes from topic "system_usages"
* changes:
  Add API for setting supported system usages
  Adding System Usages to AudioAttributes
2020-01-22 06:47:58 +00:00
Andy Hung
6f0d16df8c Merge "AudioTrack: Add Codec format change listener" 2020-01-22 06:24:31 +00:00
Amy Zhang
e68e6deb3e Merge "add new acquireTvInputHardware API to allow the clients to pass their priority hints in" 2020-01-22 06:19:40 +00:00
Amy
ed55b9cf30 add new acquireTvInputHardware API to allow the clients to pass their
priority hints in

This change is to allow the TunerResourceManager to manage the
TvInputHardware resources.

Changes are needed in the TvInputHardwareManager implementation to
request resource from TRM instead of directly granting resources to the
client.

Test: manual
Bug: 147380513
Change-Id: Ic33d2ef86ffcc14607de621ef0f70ae4ade5c70e
2020-01-22 06:19:16 +00:00
Andy Hung
b7149a1d19 AudioTrack: Add Codec format change listener
Add AudioMetadata to handle codec format changes.

Test: atest AudioMetadataTest
Test: atest AudioTrackTest#testCodecFormatChangedListener
Test: atest android.media.cts.UtilsTest
Bug: 133526565
Change-Id: I2bf7c6981c75848c6af914237557da2bf10de3b1
2020-01-21 20:04:32 -08:00
Kyeongkab.Nam
b30b38506b Fix equals and hashCode APIs on TvTrackInfo
Current hashCode API cares only for mId and it returns same values
even if other member variables are different.
To avoid for returning same values between different TvTrackInfo of
each program, hashCode API should care all variables used on
equals API. Note that mId is defined as unique only in the same
program.

Test: build
Change-Id: I4d72f6ce80141d92f86e548804e1f0257ed6fcfb
2020-01-22 11:10:32 +09:00
Wonsik Kim
ccb7ac6b65 media: MediaCodec buffer API revision
Bug: 136283874
Test: atest CtsMediaTestCases:MediaCodecBlockModelTest
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: I3fb163be67112b28fa9998493b359f12d096e759
2020-01-21 17:43:53 -08:00
shubang
ef400ab347 Unhide more methods of Tuner.java
Test: make;
Bug: 139308734
Change-Id: I5d5896cc610048cce0e98050a68b3933da1906f3
2020-01-21 15:43:13 -08:00
shubang
9fa4f6fe90 Unhide Frontend related methods in Tuner.java
Test: make;
Bug: 139308734
Change-Id: I1cb68c6e8915091509765bcc3ffcd875480caf31
2020-01-21 15:33:30 -08:00
shubang
d63e313e32 Unhide FrontendSettings part 2
and FrontendCapabilities

Test: make;
Bug: 139308734
Change-Id: I1481b758df49319dd34484548797534e3c46627d
2020-01-21 15:17:07 -08:00
Nick Chalko
454f6eb824 Merge "Unhide scan methods and classes." 2020-01-21 17:10:03 +00:00