Commit Graph

7809 Commits

Author SHA1 Message Date
TreeHugger Robot
1ef70c3781 Merge "AudioService: implement de-registration (release) of recorders" into qt-dev 2019-05-09 18:26:30 +00:00
TreeHugger Robot
8af653e8b2 Merge "Fix AudioRecordingConfiguration.anonymizedCopy method" into qt-dev 2019-05-09 16:28:30 +00:00
Mikhail Naganov
cfe4c2627e AudioService: implement de-registration (release) of recorders
Clients must unregister themselves when client-side AudioRecord
goes away. This allows removing the tracking record sooner than
the client app goes away.

"DEATH" event has been renamed to "RELEASE". Client death is handled
the same way as regular release.

Bug: 123312504
Test: start and stop audio recording, check "dumpsys audio"
Change-Id: I6a9578b29ab3c41bac2bf4c823224276efbe1beb
2019-05-09 09:25:45 -07:00
Hyundo Moon
bb07e9bc5c Remove MediaParceledListSlice
Bug: 132233794
Test: atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
      atest CtsMediaTestCases:android.media.cts.MediaBrowserTest;
      atest CtsMediaTestCases:android.media.cts.MediaSessionManagerTest;
      atest CtsMediaTestCases:android.media.cts.MediaSession2Test;
      atest CtsMediaTestCases:android.media.cts.MediaController2Test;
      atest CtsMediaTestCases:android.media.cts.MediaSession2ServiceTest;
Change-Id: I0a5c576b3fc9d2e236256d8f9f4e992914b147be
2019-05-09 17:11:44 +09:00
Kevin Rocard
b14fdecc4e Do not try to unregister APC multiple time
If audioRecord.release() is called explicitly, APC DP is released.
When the AudioRecord.finalizer() is called by the JVM, the APC DP would
be released again, leading to misleading error message.

Bug: 131064451
Test: call AudioRecord release and check that the finalizer do not log a
      release failure
Change-Id: Ia7092274ea8ac8e0a6754dfe2541f823f650384d
Signed-off-by: Kevin Rocard <krocard@google.com>
2019-05-08 23:37:31 +00:00
Mikhail Naganov
fc27a5cf69 Fix AudioRecordingConfiguration.anonymizedCopy method
Client port ID must not be anonymized as it is used by
AudioRecord class to filter out the corresponding
recording configuration.

Bug: 123312504
Bug: 131756086
Test: atest CtsMediaTestCases:AudioRecordTest#testAudioRecordInfoCallback
      atest CtsMediaTestCases:AudioRecordTest#testGetActiveRecordingConfiguration

Change-Id: I3e32395e9df107db76cfc940fecda8d066c05d97
2019-05-08 17:21:50 +00:00
Winson Chiu
8197beee18 Merge "Call MediaStore#scanFile directly in RingtoneManager" into qt-dev 2019-05-07 17:21:16 +00:00
Hyundo Moon
fefe5c7ff1 Merge "Enhance Javadoc of playback speed related APIs" into qt-dev 2019-05-07 05:13:24 +00:00
Winson
295336f6e8 Call MediaStore#scanFile directly in RingtoneManager
Reproduced the failing case, even without thread pool changes.
Since RingtoneManager was blocking on the call anyways, changing it
to use the synchronous scanFile method directly should be fine.

Bug: 131882699

Test: manual add MP3 with RingtonePickerActivity

Change-Id: I53b49ed17403cda93ecfefb6985133b161a96983
2019-05-06 17:06:02 -07:00
Robert Shih
c9b5dfcf80 Merge "MediaCodec: save MediaCrypto ref until reset/release" into qt-dev 2019-05-03 18:20:16 +00:00
Hyundo Moon
7d8de6909a Enhance Javadoc of playback speed related APIs
This CL also makes throw IllegalArgumentException when controller
tries to set the speed to zero.

Bug: 131873534
Test: atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
      atest CtsMediaTestCases:android.media.cts.MediaBrowserTest;
      atest CtsMediaTestCases:android.media.cts.MediaSessionManagerTest;
Change-Id: I78f775df369de48b1ebda66fdb6e251b6e0865c1
2019-05-03 14:19:58 +09:00
TreeHugger Robot
b037feb130 Merge "Fix can't create thumbnail and wrong orientation issue" into qt-dev 2019-05-02 05:01:15 +00:00
TreeHugger Robot
935f4e8d4b Merge "AudioAttributes: fix setInternalLegacyStreamType()" into qt-dev 2019-05-02 00:37:32 +00:00
Eric Laurent
e6c8972013 AudioAttributes: fix setInternalLegacyStreamType()
Make sure that the content type is always properly set from
legacy stream type in the case where the product strategy matching
this legacy stream type does not specify it.

Bug: 129506383
Test: playback with Youtube and check content type with audio service
dumpsys

Change-Id: Ibaac0edc21bc44a56c632fb420b94deee710869d
2019-05-01 14:24:40 -07:00
Lajos Molnar
01f8b0f44c Merge "media: make CodecCapabilities PerformancePoints hashable" into qt-dev 2019-05-01 20:01:26 +00:00
Robert Shih
f9f07c780f MediaCodec: save MediaCrypto ref until reset/release
Bug: 121191296
Test: MediaCodecTest
Change-Id: I9c13a7c0aef379a09575d3e802944d94712b48a1
2019-05-01 11:59:24 -07:00
Tomoharu Kasahara
bc99e9202e Make min/max sampling rate configurable
Platform may support lower or higher sample rate but
it's limited with the fixed value.
This change makes it possible to configure min/max
limit by system properties.

Bug: 30483830
Test: Use MediaCodecInfo for the codec which has higher
 sampling rate.

Change-Id: Ifb6da86d21b530fb908e68bdb71474aee4d1b581
2019-04-29 10:31:49 -07:00
Lajos Molnar
c79f2cb253 media: make CodecCapabilities PerformancePoints hashable
- this allows them to be used in HashSets, etc.

Bug: 131430634
Change-Id: I4279a5fc0572857c2b840fd5a1ac0aa3e1b746ee
2019-04-29 10:18:05 -07:00
Lajos Molnar
6de33e1ca7 Merge "media: MediaCodecInfo: remove PerformancePoint logs" into qt-dev 2019-04-29 16:44:41 +00:00
Ivan Chiang
6da7b0adcc Fix can't create thumbnail and wrong orientation issue
- When MediaMetadataRetriever can't create the thumbnail of some
  HEIF files, attempt decoding it from ExifInterface.

- ImageDecoder can't create the thumbnail with getThumbnailBytes
  from ExifInterface in some cases. It will occur DecodeException:
  Failed to create image decoder with message 'unimplemented'Input
  contained an error. Attempt to decoding the full image in these
  cases.

- Use orientation from ExifInterface to transform the thumbnail to
  right orientation.

Test: manual
Test: atest ThumbnailUtilsTest
Bug: 130775874
Fix: 130446058
Change-Id: Icd0726ec49fe85651150736199c3caa184fa1a3f
2019-04-29 21:18:57 +08:00
Hyundo Moon
4338969838 Use ParceledListSlice in MediaSessionManager#getSession2Tokens
Bug: 126474946
Test: atest CtsMediaTestCases:android.media.cts.MediaSession2Test;
      atest CtsMediaTestCases:android.media.cts.MediaController2Test;
      atest CtsMediaTestCases:android.media.cts.MediaSession2ServiceTest;
      atest CtsMediaTestCases:android.media.cts.MediaSessionManagerTest;
Change-Id: Ia364853d6cf638ab7128c64693b6a8cc6063036a
2019-04-29 17:00:23 +09:00
Ray Essick
777341dadd Merge "Extend MediaCodecInfo to support AV1 decoder" into qt-dev 2019-04-27 19:15:27 +00:00
Andy Hung
2d87d7a4ba Merge "MediaCodec: Fix documentation on float raw audio buffers" into qt-dev 2019-04-26 23:50:32 +00:00
Andy Hung
cc6bc4b383 MediaCodec: Fix documentation on float raw audio buffers
Test: make docs, check html
Bug: 131423214
Change-Id: If2d6f78cc5f77a5c7b5b8b936ae9f3216387561e
2019-04-26 15:34:57 -07:00
Kevin Rocard
337f8ce4fd Propagate to apps capture opt-in
Allows public apps to detect if playback have opted-out of being
capture.

Bug: 129948989
Test: atest AudioPlaybackConfigurationTest
Change-Id: Id2c2ad195e5fdeba89926dcdbbe9fa22c2d25891
Signed-off-by: Kevin Rocard <krocard@google.com>
2019-04-26 21:52:29 +00:00
Rakesh Kumar
a839a21243 Extend MediaCodecInfo to support AV1 decoder
Test: cts-tradefed run commandAndExit cts-dev -m CtsMediaTestCases \
 -t android.media.cts.DecoderTest#testAV1HdrStaticMetadata
Bug: 123756486

Change-Id: I1f4e1d30aab764dabc5d33339a7e862e8017e5ed
2019-04-26 13:55:03 -07:00
Lajos Molnar
27ff6911e8 media: MediaCodecInfo: remove PerformancePoint logs
Bug: 131425771
Change-Id: I0b26410fe97d579ab761f27aa9b7585df52fc108
2019-04-26 12:28:52 -07:00
Mikhail Naganov
a00883db12 AudioService: Track client app recording activity
Update RecordActivityMonitor to use events sent from clients
about their recording activity and coalesce them with
configuration update events sent from audioserver (APM). This
allows providing a high-level view on the recording
configurations consistent with client expectations.

For recorders that are managed entrirely on the server side
(AAudio MMAP) all events do contain configs. These recorders
do not have an associated death handler and need to be cleared
on audioserver restart.

Clearing client-managed trackers on audioserver restart is not
needed anymore. Clients will either continue
recording (AudioRecord handles IAudioRecord re-instantation) or
stop recording and notify AudioService about that.

Bug: 123312504
Test: android.media.cts.AudioRecordingConfigurationTest
      AudioRecordTest#testAudioRecordInfoCallback
      MediaRecorderTest#testAudioRecordInfoCallback
      manual testing using Oboe and Solo test apps

Change-Id: I4718f983c2d90e9c3e7480719a24bd187df7f80a
2019-04-24 15:13:48 -07:00
Jean-Michel Trivi
22ad8a5eb9 Merge "AudioAttributes: fix regression with setLegacyStreamType in Builder" into qt-dev 2019-04-24 16:54:32 +00:00
Jean-Michel Trivi
9f70d4e29b AudioAttributes: fix regression with setLegacyStreamType in Builder
A regression was introduced by commit @6d69bde which caused a new
  Builder instance to be created when using setLegacyStreamType(),
  instead of returning the current one.

Bug: 130274354
Test: atest android.media.cts.AudioAttributesTest#testSetLegacyStreamOnBuilder
Change-Id: Ib66a0beb5f0f4489a6003cb9be6b8313b3318eac
2019-04-24 08:20:17 -07:00
Hyundo Moon
9b72ad0924 Make MediaController#getSessionInfo() as @NonNull
Bug: 131069100
Test: atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
Change-Id: I5ecf04fd090dc684f5c7a84c1375de1639f7b4bd
2019-04-22 23:59:54 +09:00
Jeff Sharkey
6378402da1 Canonicalize default ringtones.
Bug: 130445562
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Ia4dee2f5596147ac50b2393fccb8516cc43b0102
2019-04-17 23:49:57 +00:00
Hongwei Wang
c4a3f5c377 Merge "Allows constructing ECHO REFERENCE AudioRecord" into qt-dev 2019-04-17 22:22:36 +00:00
TreeHugger Robot
f02aabe529 Merge "Treat FLAG_MUTE_HAPTIC separately from mFlags." into qt-dev 2019-04-17 20:30:30 +00:00
Jeff Sharkey
42bf6d8a42 Adjust MTP to reference by specific volume name.
The MediaStore.VOLUME_EXTERNAL volume is a merged view of all storage
devices, and clients working on a specific volume need to focus on
the volume they're interested in.

Bug: 129840030
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I91cee6a96d7f9360e6a93a9a3c389b097b6b9967
2019-04-17 11:16:15 -06:00
Jeff Sharkey
715c495a41 Merge "Canonicalize ringtones before returning." into qt-dev 2019-04-17 02:14:22 +00:00
jiabin
1073ee6330 Treat FLAG_MUTE_HAPTIC separately from mFlags.
For get/set APIs, FLAG_MUTE_HAPTIC is known as a boolean value instead
of a flag. In that case, it should not be changed when calling set flags
API to modify the flags. By doing this, it helps the FLAG_MUTE_HAPTIC is
set correctly.

Bug: 130670988
Test: Manually
Change-Id: I6a507d1f6f82e5ea6520f83279f73f851605c93f
2019-04-16 17:27:41 -07:00
TreeHugger Robot
111ad6a13e Merge "AudioPolicy: more TestApi for ... testing" into qt-dev 2019-04-17 00:22:04 +00:00
TreeHugger Robot
2199664e37 Merge "Remove MiniThumbFile" into qt-dev 2019-04-16 19:53:39 +00:00
Jeff Sharkey
aaa19ced73 Canonicalize ringtones before returning.
Bug: 130475623
Test: none
Change-Id: I6408800290077dfc7d0252a9b23443c3a70d4563
2019-04-16 13:47:37 -06:00
Jean-Michel Trivi
19777d9c49 AudioPolicy: more TestApi for ... testing
Add uid- device affinity APIs in test API.

Bug: 129708340
Test: atest AudioPolicyTest
Change-Id: Iba1eb996758e366994e610617a63254b774bcb17
2019-04-16 12:08:26 -07:00
Jean-Michel Trivi
7e46f59a60 Merge "AudioManager: test API for dynamic audio policy" into qt-dev 2019-04-15 22:46:46 +00:00
Jean-Michel Trivi
4ad4600d75 AudioTrack: offload is not tied to USAGE_MEDIA
Offload support check now supports passing AudioAttributes.
Do not require AudioTrack usage to be USAGE_MEDIA, check of use
  case will be done in AudioSystem.isOffloadSupported().

Bug: 129133576
Test: use offload for USAGE_ASSISTANT
Change-Id: I00065fb936600cfcdf29bc019173699db7ec5a2f
2019-04-15 12:06:19 -07:00
Jean-Michel Trivi
848eab444c Merge "AudioPolicy: fix test API for focus policy" into qt-dev 2019-04-15 16:38:09 +00:00
Kevin Rocard
4bea465dbb Merge "Add getters to AudioPlaybackCaptureConfiguration" into qt-dev 2019-04-15 16:02:07 +00:00
TreeHugger Robot
acf6698f0c Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev 2019-04-15 15:44:32 +00:00
Kevin Rocard
de5cc3c8c1 Add getters to AudioPlaybackCaptureConfiguration
Unfortunately AudioMixingRule being in a different package,
some of its members had to be made public @hide to be used
by AudioPlaybackCaptureConfiguration.

Bug: 129948989
Test: atest AudioAttributesTest
Change-Id: Ie8cdf67aee9ff7cf9144a66d47c301712516cf87
Signed-off-by: Kevin Rocard <krocard@google.com>
2019-04-15 08:35:29 -07:00
TreeHugger Robot
6335a6149a Merge "Add AudioAttributes.getAllowedCapturePolicy" into qt-dev 2019-04-15 09:45:00 +00:00
Kevin Rocard
ffc73ad49f Merge "Add documentation for the APC feature" into qt-dev 2019-04-15 08:00:05 +00:00
TreeHugger Robot
88774ef6eb Merge "DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media route of other apps"" into qt-dev 2019-04-15 05:47:22 +00:00