summaryrefslogtreecommitdiff
path: root/media/java
AgeCommit message (Collapse)Author
2022-03-15Merge SP2A.220305.013Haamed Gheibi
Bug: 220074017 Change-Id: Idfdd94e902f656ac65a2a75dfdd199f6f85ba472
2021-12-27Merge "media: allow excluding arbitrary codecs from REGULAR_CODECS list." ↵Ramesh Garimella
into s-keystone-qcom-dev
2021-12-23media: allow excluding arbitrary codecs from REGULAR_CODECS list.Lajos Molnar
This can be done by adding the 'special-codec' feature as a required feature to media_codecs.xml, e.g. <MediaCodec name="..." type="..."> ... <Feature name"special-codec" required="true" /> </MediaCodec> This feature is not exposed to applications, and is only used to exclude a codec from the REGULAR_CODECS list. Bug: 197577115 Bug: 196518411 Bug: 191944087 Test: CtsVideoTestCases and manual testing with a modified media_codecs.xml Change-Id: Ica5510bbe7e781f25ca329535d2ba771afbdb263 (cherry picked from commit daa879ac687bdbcb9594a5fc5c811a4c7c66ac44) CRs-Fixed: 3099105 Change-Id: Ic7a863838f5db3326306e5bb95b4eb9b092ceead
2021-12-22Merge s-mpr-2021-12-05Eric Arseneau
Change-Id: Ic2889f5eb531008340529eadc36ec8efc62b1984
2021-12-13Merge mpr-2021-11-05Eric Arseneau
Change-Id: If7c68a17857eee4194f28413b938d5647820162c
2021-09-24MediaCodecInfo: do not alter performance points for 32-bit processes (2)Wonsik Kim
CRs-Fixed: 3042895 Bug: 191343377 Test: atest CtsMediaTestCases:MediaCodecListTest Change-Id: I1ce70dadfeaf2e7989339e4564a1dba37b3203b6 (cherry picked from commit bd9dce3c194b3eb496aedb5629e9f6d97dcd58ed)
2021-09-23DO NOT MERGE: Revert "Reset app routes when global a2dp state changed"Sungsoo Lim
This reverts commit 07e40316f8641c8579181bfe3bd918e7636dee70. Bug: 193831720, Bug: 168093983, Bug: 156549746 Test: manual Change-Id: I86df6f9f1d672c455cd0aedc58012b3335659479 (cherry picked from commit 6d4a00b17a89e073b01f98d7149ca9da4d6e09b6)
2021-09-23DO NOT MERGE: Revert "Call route selected/unselected callbacks"Sungsoo Lim
This reverts commit 6adeb2c9f140d6cacd28d8eaf188370794494189. Bug: 193831720, Bug: 168093983 Test: manual Change-Id: I0c0c3ac9ed63bafe419c8a127772d4042abbab89 (cherry picked from commit 89d28318a038de80a32e9337e2f7f7d196b7665a)
2021-09-07Clean up ownership in frameworks/base/Santiago Seifert
This is a cherrypick of aosp/1804116. Bug: 197217250 Change-Id: I04bee764bf50734523ff2210d30ed052dcb036bd Merged-In: I04bee764bf50734523ff2210d30ed052dcb036bd Test: No code changes done.
2021-08-25Notification playback: pause on releaseJean-Michel Trivi
When releasing a MediaPlayer outside of a playback completion (back to back notifications), pause and wait 100ms before releasing the player. Bug: 193832902 Test: create back-to-back notifications, check for glitch Change-Id: Ib8baba4bf2b41e75b526e8490b6c2f31c85c193c (cherry picked from commit c69743ea169f8e0c87ecb48d6d9e81a1286605ee)
2021-08-20Notification playback: pause on releaseJean-Michel Trivi
When releasing a MediaPlayer outside of a playback completion (back to back notifications), pause and wait 100ms before releasing the player. Bug: 193832902 Test: create back-to-back notifications, check for glitch Change-Id: Ib8baba4bf2b41e75b526e8490b6c2f31c85c193c
2021-08-11Merge SP1A.210811.001Brian Orr
Change-Id: I5aa7cf27a3a3cc16830c9947a826e30a0da481c4
2021-08-06Merge SP1A.210803.001Scott Lobdell
Change-Id: I09253f8614e9ee85a59460f3ef25f17dd98cac80
2021-08-04Send the HotwordDetectionService UID to AudioPolicyAhaan Ugale
This change follows the pattern of how the IME UID is set. The UID is stored in AudioService and re-sent there if the audio server dies. Fix: 194368677 Test: manual - hotword works when another app is using the mic and in Auto projection mode; also after restarting the process or killing audio server Test: atest HotwordDetectionServiceBasicTest Change-Id: I325cb33d17387e62302967b261b6fe61086d8893
2021-07-31Merge "Don't return selected routes as transferable" into sc-devKyunglyul Hyun
2021-07-30Don't return selected routes as transferableKyunglyul Hyun
MediaRouter2Manager returned selected routes as "transferable" routes. This CL fixes it. Bug: 194370296 Test: manually Change-Id: I85e0e94bd38e07ee1a99369e9de5a4564aee6d58
2021-07-29Fix fd leak while bypassing transcoding in media APIsZim
To call the media service while bypassing transcoding there are 4 file descriptors involved: A: The original file descriptor the app owns and is responsible for closing B: Dupe of A, to pass into the MediaStore API as an input to receive a non-transoding fd C: The output from the MediaStore API D: Final fd owned by the media service, after C gets duped over binder as part of setDataSource We were leaking (B) and (C). Now we close them appropriately. See I0124ec8fbd0471237e99bab321f903544f8fe1f8 for another 2 fd leak fix in MediaProvider Test: atest TranscodeTest Test: Manual with 'adb shell lsof | grep <filename>' Bug: 194828489 Bug: 179804072 Change-Id: I978257bbc4a8f6813b6e6a5ce22124257204f432 Merged-In: I978257bbc4a8f6813b6e6a5ce22124257204f432
2021-07-27Merge SP1A.210723.002Scott Lobdell
Change-Id: I220cdfc5cb9db40162fd33f400a54591018d54cf
2021-07-23Change default value from NONE to UNKNOWNshubang
Bug: 194523273 Test: atest MediaMetricsAtomTests Change-Id: Ib5b96db02089f3b785507c7f5fd822bcb68f35ea
2021-07-23Merge SP1A.210715.002Scott Lobdell
Change-Id: I65e2b7db097927b87c9c4023015c754033c62086
2021-07-22Merge "Describe Video Encoding Floor" into sc-devRay Essick
2021-07-19Merge "Add PCM float profile if extended precision PCM shows but not pcm ↵TreeHugger Robot
float." into sc-dev
2021-07-16Add PCM float profile if extended precision PCM shows but not pcm float.jiabin
This is required for backwards compatibility. This ensures pre-S apps that look for pcm float continue to see that encoding if the device supports extended precision integers. Test: atest AudioManagerTest Bug: 193747274 Change-Id: Ia244bdcd51520dd082a292baab54f1795ccccaea
2021-07-16Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-devKriti Dang
2021-07-14Tuner APIs: add locks to avoid crashes caused by NPEshubang
Bug: 193604292 Test: atest android.media.tv.tuner.cts.TunerTest Change-Id: I08aaf38489ab7ea29f99e416b0e1082a3d0ee249
2021-07-14Merge SP1A.210709.002Haamed Gheibi
Change-Id: I4610885d5d770d858895057cdd9fea387a5e33dd
2021-07-14Make AudioManager.getReportedSurroundFormats a TestApiKriti Dang
Access to the API needed from a tunnel mode CTS test. TestAPIs dont work in CTS test if they intrenally call AudioSystem. Changing getSurroundFormats and getReportedSurroundFormats to call AudioService instead of AudioSystem. Bug: 189823767 Test: atest android.media.cts.DecoderTest#testTunneledAudioPTSGapsAc3 Change-Id: If6287743f57b77d0eb2639e4a2e9409c7d778f06 Merged-In: If6287743f57b77d0eb2639e4a2e9409c7d778f06
2021-07-12Merge "Add unregisterClient in instance close." into sc-devTreeHugger Robot
2021-07-12Add unregisterClient in instance close.Henry Fang
bug: 193109848 Test: atest android.media.tv.tuner.cts Change-Id: I4e15cc482c4900d12d55a1d8527da0c41a356f88
2021-07-09Describe Video Encoding FloorRay Essick
New prose in MediaCodec and MediaRecorder describing the behavior. Bug: 192086134 Test: make docs Change-Id: I004688adcbd731b4ed0461628ce4cdb6b7035561
2021-07-09Cache weak reference for static context.jiabin
Use weak reference to cache static context to avoid leak. Test: atest RingtoneManagerTest Test: atest RequestPinItemTest Bug: 192995480 Change-Id: Idbfc9bd0c93ddb40693989c0d09719af24363f1d
2021-07-09Merge SP1A.210624.001Scott Lobdell
Change-Id: I96a39cdca22771b76e89caebd53ed52416005092
2021-07-02Merge "Add context in AudioManager.hasHapticChannels." into sc-devJiabin Huang
2021-07-02Add context in AudioManager.hasHapticChannels.jiabin
A context will be required for resolving a Uri. Using the context in AudioService may not always work and it may cause not oneway binder call issue. In that case, using the context in RingtoneManager could help. In AudioManager, caching a static context so that it can be used when there is not context provided. Test: atest RingtoneManagerTest Bug: 187842281 Change-Id: Ia2f514cb8f821926cf3d353cf912a44aeb584ab6
2021-07-01Merge "Revert^2 "trancoding: lazy-start transcoding service"" into sc-devHangyu Kuang
2021-07-01Revert^2 "trancoding: lazy-start transcoding service"Hangyu Kuang
db10bbab0890a233e76c259cb60e9c02016186c2 Bug: 187271658 Test: atest MediaTranscodeManagerTest; unit tests Change-Id: I69ab6302d1e0febe1a015944d2d5058d869af4ff
2021-06-30Merge "AudioFormat: document that 24BIT is little-endian" into sc-devTreeHugger Robot
2021-06-30Merge "Hide non transferable routes" into sc-devKyunglyul Hyun
2021-06-29AudioFormat: document that 24BIT is little-endianPhil Burk
Bug: 190724856 Test: read resulting autodocs Change-Id: Iedd34eb89e6cf26ec8bea05b376447181eeea0d9
2021-06-28media: allow 0 video encoder profiles and levels.Lajos Molnar
Some of the new encoder profile and level values are 0, so allow them to be set. StagefrightRecorder already supports 0 values, and MediaRecorderTest also already tests negative value for failure. Bug: 192317919 Test: atest android.hardware.camera2.cts.RecordingTest\#testBasicEncoderProfilesRecording Change-Id: I9d286ee84c004b21830d743ad46804be456f2bc6
2021-06-28Hide non transferable routesKyunglyul Hyun
As non-transferable routes don't look valid targets as "seamless transfer", this CL hides those from the output switcher. Bug: 189803271 Test: Manually Change-Id: If2dc86e9a8e1af323e282ae65f70b04c52b996a6
2021-06-21Merge SP1A.210616.001Daniel Norman
Change-Id: I9acdc955f698dbebb8fad19cfd5cb71fcdd27b45
2021-06-21MTP: Skip runtime thumbnail generation for Android HostJames Wei
Android Host is not capable to deal with the long processing time for runtime thumbnail generation. Skip runtime thumbnail generation for Android Host but keep no impact to other Host Bug: 188752500 Test: atest MtpTests Test: atest MtpServerTest Test: atest MtpServiceTests Test: manual test on Windows 10 File Explorer Test: manual test on Android Host Files App Change-Id: I24ed3bb29c5a6912398a9e00e7748fd406cf6a64
2021-06-17Merge SP1A.210604.001Brian Orr
Change-Id: I5200ee05285ae422d5e9c1c00f45709a5d6188be
2021-06-15Merge "Call route selected/unselected callbacks" into sc-devTreeHugger Robot
2021-06-15Call route selected/unselected callbacksSungsoo Lim
Bug: 168093983 Test: manually Change-Id: Id48870052f1d3fefb8bdbf1b7ba3636c7138b53d
2021-06-14Fix inconsistency in ringtone listakansha.shukla
Sometimes when ringtone from external storage gets same _id as any ringtone of internal volume, getRingtonePosition(..) matches with the internal one firstly, and the ringtone shown is wrong. Solution is to match the URI of ringtone instead of the _ID so that correct ringtone is chosen. Bug: 172878342 Change-Id: I8fc3e936fe89308d4697eda42088e4fd533ce47c Merged-In: I8fc3e936fe89308d4697eda42088e4fd533ce47c
2021-06-14Merge "Allow HotwordDetectionService access to audioflinger." into sc-devAhaan Ugale
2021-06-08Merge "Bind provider services when necessary" into sc-devKyunglyul Hyun
2021-06-08Bind provider services when necessaryKyunglyul Hyun
The media router service bound media route provider services only when there was a discovery request. This prevented output switcher to work when there are only legacy media router clients (i.e. apps that didn't enable MR2) This CL makes the media router service binds media route provider services when the MediaRouter2Manager#startScan is called so that the output switcher can show cast sessions created by the providers. This CL also changes communication between the media router service and the provider services as cast sessions can be created/released even when the media router service is disconnected from media route provider. Bug: 176774510 Test: manually Change-Id: I481e1aa8f9dcc136cbf5788b9f66540708665af2