Commit Graph

6863 Commits

Author SHA1 Message Date
Wei Jia
f343c4918b Merge "BufferingParams: add annotation @TestApi" into pi-dev am: fb052cc3c0
am: bfd7f564d0

Change-Id: Icc721ee3fd658ab503f60a45f2e8f7fd34e7a1d4
2018-04-11 12:42:48 -07:00
TreeHugger Robot
fb052cc3c0 Merge "BufferingParams: add annotation @TestApi" into pi-dev 2018-04-11 18:01:24 +00:00
Chong Zhang
93cf8b260e Fix missing video caps for HEIC type encoders
Bug: 63633199
Bug: 74343403
Change-Id: If1faff529aadce62566fe45a8b758e574e215154
2018-04-11 10:29:12 -07:00
jiabin
38da6cc167 Merge "Fix mic enumeration CTS fail on marlin." into pi-dev am: 0b5dd8e560
am: 76e69b0812

Change-Id: Id7580ece4bc0da834424f4e21fcae99ac5ae53c1
2018-04-11 09:12:10 -07:00
TreeHugger Robot
0b5dd8e560 Merge "Fix mic enumeration CTS fail on marlin." into pi-dev 2018-04-11 15:46:49 +00:00
Sungsoo Lim
3715ec579a Fix possible NPE in MediaSessionManager
Bug: 77885219
Test: build
Change-Id: Id20dd73f00521beeccd4704f722547ba32bb5722
2018-04-11 17:16:15 +09:00
jiabin
d0be5b212f Fix mic enumeration CTS fail on marlin.
The mic enumeration APIs only support on audio hal v4. Marlin failed due
to on audio hal v2. Make the APIs return mic with unknown
characteristics if the native call fail.

Bug: 77732156
Bug: 77732289
Test: run cts on marlin and walleye
Change-Id: I64b3e6a249ad76b754e841d630e8cf178dde9a86
2018-04-10 14:44:41 -07:00
Wei Jia
5d78d87493 BufferingParams: add annotation @TestApi
Test: CTS test passed
Bug: 77723586
Change-Id: I3811f16380f6465f884d6dd84ce969a0a5886107
2018-04-10 10:45:44 -07:00
Jean-Michel Trivi
fbb05ff5c5 Merge "AudioAttributes: handle unknown usage like media" into pi-dev am: 9dbe4d8e6b
am: 3a8ddbcc8a

Change-Id: Ib46af5746bce8d8cfb1150ccd3e792d3bde6db73
2018-04-09 18:42:50 -07:00
Jean-Michel Trivi
6d38a1b260 AudioAttributes: handle unknown usage like media
In the native audio policy management, the default stream type
  for volume is STREAM_MUSIC, i.e. any player by default is
  considered a "media" player. Do the same for audio attributes
  with regards to suppressible behaviors.

Bug: 74052135
Test: ZenModeHelperTest + see bug
Change-Id: I8f65044807fd3e745f21e031a0aa01a5e6f74cd2
2018-04-09 21:24:25 +00:00
Andy Hung
2ce1cc111f Merge "PlaybackParams: Add @TestApi annotation to access stretch mode" into pi-dev am: 30a0d29107
am: b7b018ef50

Change-Id: Ie62784237193baed9817cb0f468b39e222123300
2018-04-09 10:18:10 -07:00
Andy Hung
8ec4be4be9 PlaybackParams: Add @TestApi annotation to access stretch mode
Required due to CTS access restrictions in P.

Test: CTS ParamsTest
Bug: 77723867
Change-Id: I68b5fbc2096d5d1cb01c60fe1028def5ecfe2959
2018-04-06 19:23:53 -07:00
Jean-Michel Trivi
803a190669 Merge "AudioFocusRequest: getOnAudioFocusChangeListener in test API" into pi-dev am: 301a925597
am: 4a09bab517

Change-Id: Ia3346aa5ec6a4b263120e8a650cf93d32fd19b06
2018-04-06 19:19:35 -07:00
Jean-Michel Trivi
d043c3aba0 AudioFocusRequest: getOnAudioFocusChangeListener in test API
Bug: 77651038
Test: CTS AudioFocusTest
Change-Id: I071057f1ed0ed6c56c16182a48191d763d408ae1
2018-04-06 16:59:21 -07:00
Mikhail Naganov
be9301e9ae Merge "AudioPresentation: Replace @VisibleForTesting with @TestApi" into pi-dev am: d1bc30a405
am: 163b606b0a

Change-Id: Id44d1c49e6f7308498c949a5e42e93a27c0cd32a
2018-04-06 16:33:28 -07:00
Mikhail Naganov
436ee82422 AudioPresentation: Replace @VisibleForTesting with @TestApi
This is to fix CTS tests failures.

Bug: 77715867
Test: make
Change-Id: I99a5ff8fab208a0e1f2e889cb7ad256e6ba08437
2018-04-06 13:30:28 -07:00
Andy Hung
165b66c23b Merge "Merge "Add TestApi annotation to AudioEffect, AudioFormat, VolumeShaper" into pi-dev am: 320c1ade67" into pi-dev-plus-aosp
am: 4568c4b9b8

Change-Id: I3b75a28876b8e9f4d110df2c7f9e6019a49d44b2
2018-04-06 12:08:39 -07:00
Andy Hung
320c1ade67 Merge "Add TestApi annotation to AudioEffect, AudioFormat, VolumeShaper" into pi-dev 2018-04-06 18:19:48 +00:00
Emilian Peev
85f27d43de Merge "media: Populate Image scaling mode in reader and writer" into pi-dev am: 893c5e0c70
am: 0a0bb2b1a0

Change-Id: I7b613ca29e28ee0ccbd35e800a2ba315b044b774
2018-04-06 10:41:31 -07:00
TreeHugger Robot
893c5e0c70 Merge "media: Populate Image scaling mode in reader and writer" into pi-dev 2018-04-06 17:06:44 +00:00
Emilian Peev
750aec6f3b media: Populate Image scaling mode in reader and writer
"ImageReader" and "ImageWriter" must pass information about the
specific buffer scaling mode.

Bug: 76022384
Test: Manual using application,
Camera CTS

Change-Id: I116f00cbf3b1487d8e44661e8fd15e2aa16e6e0d
2018-04-06 13:01:45 +01:00
Chong Zhang
a683dc3e98 Merge "Extract exif data from mp4 extractor if available" into pi-dev am: 0c42369361
am: 5f15f4734c

Change-Id: I6808f79e8e424a95b05b430a6986b949bb2e57a3
2018-04-05 22:41:06 -07:00
TreeHugger Robot
0c42369361 Merge "Extract exif data from mp4 extractor if available" into pi-dev 2018-04-06 05:13:33 +00:00
Andy Hung
3ce023b02e Add TestApi annotation to AudioEffect, AudioFormat, VolumeShaper
Test: AudioEffectTest
Test: AudioRecordTest
Test: AudioTrackTest
Test: AudioTrackSurroundTest
Test: AudioTrack_ListenerTest
Test: BassBoostTest
Test: EnvReverbTest
Test: EqualizerTest
Test: LoudnessEnhancerTest
Test: PresetReverbTest
Test: VirtualizerTest
Test: VisualizerTest
Test: VolumeShaperTest
Bug: 77652246
Bug: 77651563
Bug: 77652497
Change-Id: I3a95cb6834fac0cd0cb88ea3ed0ba028aeddb3f2
2018-04-05 20:28:33 -07:00
Dongwon Kang
4a649366d5 Use system property to get the package name for media update
Also, disabled updatable apk usage on Media2 APIs since
they are hidden and they shouldn't be used in P.

Test: build and boot on aosp and non-aosp build
Bug: 67908547
Change-Id: Ic93cc0f07604020ec47be25725b05af8a9794572
2018-04-05 16:45:05 -07:00
Philip P. Moltmann
19402f557b Remove PendingIntent based soundTrigger
How that we have the SoundTriggerDetectionService we don't need the
pending intent based mechanism anymore.

Test: Checked that ambient music still detects music
Change-Id: If16c59028b31ff7d2e7f4d7f764460ac948ba946
Fixes: 73829108
2018-04-05 16:32:59 -07:00
Marco Nelissen
ed611e913f Merge "Add @TestApi for field needed for test" into pi-dev am: d8a6f0cd94
am: 6f71d5f9e7

Change-Id: Idd27147d0e9a5bce573bca9dc607cbf97125b0bd
2018-04-05 14:16:35 -07:00
TreeHugger Robot
d8a6f0cd94 Merge "Add @TestApi for field needed for test" into pi-dev 2018-04-05 20:41:24 +00:00
Chong Zhang
2cc0a2eca9 Extract exif data from mp4 extractor if available
Query the extractor for the exif data offset and length,
if it's available, read the exif block from the file.
Otherwise, set image dimension and rotation only.

bug: 76149934

Change-Id: I85f24b526fb356a9227941e20807fc96369c8536
2018-04-05 11:25:45 -07:00
Dongwon Kang
5310da6c76 Merge "Add OnMediaTimeDiscontinuity notification" into pi-dev am: b9c661f79f
am: e2759c1bb3

Change-Id: I820c82e5feafbbe35f218458174fb130fc5bdae5
2018-04-05 10:40:57 -07:00
Marco Nelissen
a7de449356 Add @TestApi for field needed for test
Also update truncated comment.
Bug: 13249737
Bug: 77485791
Test: CTS

Change-Id: I1351a6ef28dfd7e881f32830c436315ffdbfffaa
2018-04-05 16:43:06 +00:00
Dongwon Kang
b9c661f79f Merge "Add OnMediaTimeDiscontinuity notification" into pi-dev 2018-04-05 16:33:39 +00:00
Jaewan Kim
e453b47fde Merge "MediaController: Fix annotation of Callback#onPlaybackStateChanged()" into pi-dev am: 8a585a6f1f
am: 6c6a79db4d

Change-Id: If91325b47b8e93ac83c9dc09a70ee0a17e54e66b
2018-04-05 03:27:46 -07:00
TreeHugger Robot
8a585a6f1f Merge "MediaController: Fix annotation of Callback#onPlaybackStateChanged()" into pi-dev 2018-04-05 10:03:22 +00:00
Jaewan Kim
81fd8d22ce Merge "MediaSessionManager: Apply API council review" into pi-dev am: 628f59aa45
am: c0af1dbd9e

Change-Id: I6becde5719f7a92d678d6c322db64537d63d3b82
2018-04-04 22:56:52 -07:00
TreeHugger Robot
628f59aa45 Merge "MediaSessionManager: Apply API council review" into pi-dev 2018-04-05 05:25:15 +00:00
Jaewan Kim
532a992e9b MediaController: Fix annotation of Callback#onPlaybackStateChanged()
PlaybackState can be null and it's annotated as @Nullable in other
places. So we'd better to fix the annotation.

Bug: 77532207
Test: Run CtsMediaTestCases
Change-Id: I8974c6c99d9d188934f74775977631fb7b37e5d2
2018-04-05 11:13:38 +09:00
Jean-Michel Trivi
8618a1bd6f Merge "MediaCodecInfo: define AACObjectXHE profile level" into pi-dev am: 57e4156ee3
am: 38cf6b0f0e

Change-Id: Ic5d74cc30967e6e4656c9b29f26f6af74cacb26f
2018-04-04 17:26:20 -07:00
Jean-Michel Trivi
9a30362790 MediaCodecInfo: define AACObjectXHE profile level
Bug: 71430241
Test: CTS DecoderTest and DecoderTestAacDrc
Change-Id: I03ede882db420eeaa871991d1d5cba8955b2cdba
2018-04-04 14:16:40 -07:00
Dongwon Kang
2fab5bfb7b Add OnMediaTimeDiscontinuity notification
Test: MediaPlayerTest
Bug: 63934228
Change-Id: I1914f32867416c5c052b6ae3bfe23e597fb314e4
2018-04-04 09:54:14 -07:00
Jaewan Kim
03cba65b91 MediaSessionManager: Apply API council review
Here's the comments from the review
  - RemoteUserInfo needs to override .hashCode() as well
  - Verify package name and the UID in the RemoteUserInfo
  - Docs: Document how to get RemoteUserInfo
  - Docs: Document that RemoteUserInfo is only valid on thread that the
          command is being called from
    * It's already documented in the
      MediaSession#getCurrentControllerInfo() and
      MediaBrowserService#getCurrentBrowserInfo().

Bug: 77507337
Test: Run following CtsMediaTestCases
  - MediaBrowserTest
  - MediaBrowserServiceTest
  - MediaControllerTest
Change-Id: If37560a7bc59d1ef5517ec1f3e0a8b74c2bb2980
2018-04-04 19:13:59 +09:00
Hongwei Wang
aeadd06604 Merge "Adds comment how to deal with newly added audio usage" into pi-dev am: 3eaf39f3d0
am: 92b5974b9c

Change-Id: If01257e0fde15f534b2e736225c501c9842b382c
2018-04-03 21:07:34 -07:00
Hongwei Wang
1b322dd042 Adds comment how to deal with newly added audio usage
Bug: 77547740
Test: adb shell dumpsys media.audio_policy
Change-Id: If0d9f1d0ac2205900532cb9f761746ce4d164d32
2018-04-03 16:22:06 -07:00
Jeff Tinker
589a712db9 Merge "Updates MediaDrm developer docs" into pi-dev am: 1c967fe075
am: d2dc31b5b8

Change-Id: I94356f44fe3e9b1e381662ae702eb078ff8c4897
2018-04-02 18:52:23 -07:00
TreeHugger Robot
1c967fe075 Merge "Updates MediaDrm developer docs" into pi-dev 2018-04-02 20:00:46 +00:00
rago
201fc345d3 Merge "Dynamics Processing Effect" into pi-dev am: d41d56e348
am: d110770ccd

Change-Id: Ib3de104d30a7fcd67744b440a97c360549d149b1
2018-03-31 06:04:12 +00:00
Rahul Frias
cf7bd0f8e3 Merge "Clarified app behavior on REQUEST_TYPE_NONE" into pi-dev am: 1b7162ad3d
am: 02c7881824

Change-Id: I7c553068bc702f822006e0445e5e0e35dc7db157
2018-03-31 02:23:22 +00:00
Jeff Tinker
1e034fd2ed Updates MediaDrm developer docs
Distinguish between secure stops and secure stop ids

bug:76449152
Change-Id: I4ff26b645bd4a156738ba358de598e2ccb1b0584
2018-03-30 17:38:56 -07:00
TreeHugger Robot
d41d56e348 Merge "Dynamics Processing Effect" into pi-dev 2018-03-31 00:05:32 +00:00
jiabin
a897e832c8 Merge "Make back mic available when getting all available mic." into pi-dev am: cfe67aa575
am: 3f57ace702

Change-Id: Icb377e9ece76c73e7603a8af790c57a1671bbf8c
2018-03-30 20:50:20 +00:00