Commit Graph

7340 Commits

Author SHA1 Message Date
TreeHugger Robot
6364e04bac Merge "Add audio device type AUDIO_DEVICE_IN_HDMI_ARC" 2019-01-18 17:35:46 +00:00
TreeHugger Robot
615329242c Merge "Media2: Provide a way to tell session's playback active state" 2019-01-18 05:47:41 +00:00
Nick Chalko
2e1f76a462 Add audio device type AUDIO_DEVICE_IN_HDMI_ARC
ag/5359018

Bug:117967786
Test: flashall on an atom
Change-Id: I197723448716460379da3ec7568c5367bad3b88b
2019-01-17 16:49:02 -08:00
Paul Mclean
5955f741e4 Merge "Adding Audio HAL V5: Direction API" 2019-01-17 21:34:34 +00:00
Lajos Molnar
c7641debd3 Merge "MediaCodecInfo: add codec attributes and performance points." 2019-01-17 20:21:08 +00:00
TreeHugger Robot
3d404e7836 Merge "MediaSession2: Fix controller is disconnected immediatly after connected" 2019-01-17 16:32:12 +00:00
Lajos Molnar
a462966c8e Merge "media: Add new AVC levels and AV1 media type string" 2019-01-17 14:41:58 +00:00
Jaewan Kim
69dd985043 Media2: Provide a way to tell session's playback active state
Bug: 122818120
Test: Run MediaSession2Test in CTS
Change-Id: I32fed056db08b95fc406d82f32c583bbb3ca4fa8
2019-01-17 22:24:07 +09:00
Jaewan Kim
f8e970a923 MediaSession2: Fix controller is disconnected immediatly after connected
This is regression introduced by my previous commit
45d94a4844 MediaSession2Service: Initial commit

Test: Run CTS
Change-Id: Id1490e1897e502c2a6008e5ed72158d4d5cf9685
2019-01-17 21:55:58 +09:00
Insun Kang
b3517bf1fe Initial code for AML MediaSessionService
Bug: 123000882
Test: build / manually
Change-Id: If2234340ed835fa02dcdbd1fd1b968418fe0a8ac
2019-01-17 19:32:12 +09:00
Jaewan Kim
9a11c43809 Session2Token: Write Session2Link in writeToParcel()
This fixes MediaController2's connection failure when the token is from
the remote process.

Test: Build and run CTS test
Change-Id: Ic44b31b0088bc59ead4d341c27eebc57beac7d20
2019-01-17 11:53:28 +09:00
TreeHugger Robot
b9b73aee2a Merge "MediaSession2Service: Initial commit" 2019-01-17 02:17:32 +00:00
Lajos Molnar
49beba10cf media: Add new AVC levels and AV1 media type string
Also remove OMX references for the current constants.

Bug: 122971163
Bug: 111936705
Change-Id: I604ecdeedd5408016fe7c69b763ffbc040ecffd2
2019-01-16 17:29:35 -08:00
Lajos Molnar
d2a7f47b0d MediaCodecInfo: add codec attributes and performance points.
Bug: 112374531
Bug: 119631295
Bug: 112370870
Change-Id: Icf8db614a616bd5c815bc272093ce77d05eb4406
2019-01-16 16:46:50 -08:00
Eric Laurent
56f5322566 Merge "add new audio sources for audio capture" 2019-01-16 23:57:58 +00:00
Eric Laurent
0016c5b739 add new audio sources for audio capture
This commit adds the following audio capture sources:
- AudioSource.VOICE_PERFORMANCE: for real time live performances like Karaoke.
- AudioSource.ECHO_REFERENCE: for capturing the reference signal to suppress by an echo
canceller. Protected by privileged permission CAPTURE_AUDIO_OUTPUT.

Also added device AUDIO_DEVICE_IN_ECHO_REFERENCE selected when the requested
capture source is AudioSource.ECHO_REFERENCE.

Bug: 118203066
Test: CTS tests for audio capture

Change-Id: I8258296736848986562f7fc89c9260aad562d3d1
2019-01-16 09:53:51 -08:00
Jaewan Kim
45d94a4844 MediaSession2Service: Initial commit
Bug: 122563346
Test: Build
Change-Id: I250ee493837bfa7964fa7baf3d11f1673c879010
2019-01-16 17:18:14 +09:00
TreeHugger Robot
3ee68ec453 Merge "MediaPlayer2: fix checking for next datasources" 2019-01-16 01:23:32 +00:00
Andy Hung
ef0d3861a6 Merge "AudioFormat: Add IntRange annotation to getFrameSizeInBytes" 2019-01-16 00:08:41 +00:00
Wei Jia
2b5dfbc265 MediaPlayer2: fix checking for next datasources
Test: cts testPlaylist
Bug: 122073361
Change-Id: I0306b09b1f5d3796a4a74d4fe76a5c53d1ea6f57
2019-01-15 15:12:52 -08:00
Robert Shih
b5fd613d16 Merge "MediaPlayer2: callback based DRM APIs" 2019-01-15 23:12:51 +00:00
Andy Hung
72a60f82a0 AudioFormat: Add IntRange annotation to getFrameSizeInBytes
Test: compile
Bug: 122885005
Change-Id: I4cef60d5b767ca05f4cf0284ee18f99fd886635b
2019-01-15 11:45:55 -08:00
TreeHugger Robot
ba05834931 Merge "Unhide MediaSession2 and MediaController2" 2019-01-15 08:48:33 +00:00
Sungsoo Lim
7553b35ea1 Unhide MediaSession2 and MediaController2
Also unhide the relevant class: Session2Token.

Bug: 122055262
Test: pass MediaSession2Test and MediaController2Test
Change-Id: I7fb94b24082d683ff6367961e300f9ce5f6f8821
2019-01-15 10:24:08 +09:00
Jeff Tinker
955f3424a2 Merge "Add additional error conditions to MediaDrm" 2019-01-15 01:22:16 +00:00
Robert Shih
cf96703641 MediaPlayer2: callback based DRM APIs
Bug: 112549021
Test: MediaPlayer2DrmTest
Change-Id: If837087ef38fe0b71ad67e01aefdc04bb0339c8e
2019-01-14 16:33:20 -08:00
TreeHugger Robot
c3a5109a54 Merge "MediaSessionManager: Add listener for Session2Token changes" 2019-01-14 14:24:26 +00:00
Jaewan Kim
ea911860ef MediaSessionManager: Add listener for Session2Token changes
Bug: 122234817
Test: Build and flash manually
Change-Id: I5098a2437a556a785d405a89ee27868a7d6fb49f
2019-01-14 21:17:24 +09:00
TreeHugger Robot
fc02cf7f50 Merge "Unhide Session2CommandGroup" 2019-01-14 06:46:23 +00:00
Jin Seok Park
42dd015a86 Unhide Session2CommandGroup
Bug: 122436036
Test: atest CtsMediaTestCases:android.media.cts.Session2CommandGroupTest
Change-Id: I8a3e3fed9c5e5fc900e4c6dfc80ac1a346860321
2019-01-14 12:02:04 +09:00
Michael Dooley
7534f652ba Merge "Annotating getModelState method so it can be used by NowPlaying" 2019-01-12 14:28:52 +00:00
mike dooley
e01860a6e9 Annotating getModelState method so it can be used by NowPlaying
Test: none
Bug: 119386757
Change-Id: If4dcd9fae9b693cd040e74d6e7b10be895b46af3
2019-01-12 00:37:56 +01:00
Jeff Tinker
20594d8b9d Add additional error conditions to MediaDrm
New codes are being added to handle resource
contention, lost session state, frame size too
large and insufficient security level for
decryption. Also cleans up inconsistent use of
tamper detected error where invalid state error
should have been used.

bug:111504510
bug:111505796
test: cts and gts media test cases

Change-Id: Ifa652d31ea151fbdc9faa0dd15b19f885d82b916
2019-01-11 15:31:04 -08:00
Hyundo Moon
72994d482e Merge changes I185d3723,Id674576a
* changes:
  Introduce SessionCallbackLink
  Introduce ControllerCallbackLink
2019-01-11 11:51:16 +00:00
TreeHugger Robot
ba1b767e71 Merge "MediaSessionManager: Add getSession2Tokens()" 2019-01-11 11:45:17 +00:00
Jaewan Kim
bbce3333fc MediaSessionManager: Add getSession2Tokens()
This currently only returns tokens with the TYPE_SESSION.
Follow up CLs will change this to also return tokens with other types.

Bug: 122234817
Test: Build and flash manually.
Change-Id: Ia2f67983393696439020d5ea58976b9ed1662566
2019-01-11 16:54:11 +09:00
Jin Seok Park
4900d0e4ff Merge "Unhide Session2Command" 2019-01-11 06:58:00 +00:00
Hyundo Moon
c451a82527 Introduce SessionCallbackLink
In order to avoid direct AIDL usages in framework, this CL introduces a
new public class SessionCallbackLink which can prevent usages of
ISessionCallback.

Bug: 122336924
Test: make update-api -j / make -j
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest
Change-Id: I185d372335104067b6f4ed512fcd2f3b3925642f
2019-01-11 15:18:03 +09:00
Hyundo Moon
8cd0ae9041 Introduce ControllerCallbackLink
In order to avoid direct AIDL usages in framework, this CL introduces a
new public class ControllerCallbackLink which can prevent usages of
ISessionControllerCallback.

Bug: 122337578
Test: make update-api -j / make -j
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest
Change-Id: Id674576aa071b7fdbd0082bf6189fef2af2d919b
2019-01-11 14:42:14 +09:00
Jin Seok Park
abe390477b Merge "Cannot cast Object[] to Session2Command[]" 2019-01-11 04:33:26 +00:00
Jin Seok Park
eabc8bf0fe Cannot cast Object[] to Session2Command[]
Currently, Session2CommandGroup#writeToParcel tries to cast Object[]
to Session2Command[]. This CL casts each object instead.

Bug: 122686869
Test: Will add cts in later CL
Change-Id: I1a7c1e387bdbb089ae77d729527317959e47fce2
2019-01-11 11:03:16 +09:00
Jin Seok Park
b2b5049077 Unhide Session2Command
Bug: 122435992
Test: atest CtsMediaTestCases:android.media.cts.Session2CommandTest
Change-Id: I109fd5383689c211b4019514e498022e2717ea53
2019-01-11 10:44:18 +09:00
Dichen Zhang
c54940f204 Merge "jWakeLock" 2019-01-10 01:26:35 +00:00
TreeHugger Robot
f85b3162d7 Merge "MediaRecorder:add note for setMaxFileSize/Duration" 2019-01-09 21:37:04 +00:00
TreeHugger Robot
ed954eb7e6 Merge "MediaPlayer2: add back convenient API's for current data source." 2019-01-09 01:09:21 +00:00
TreeHugger Robot
95cb8e40ca Merge "Make PlaybackInfo implement Parcelable" 2019-01-09 00:27:30 +00:00
Dichen Zhang
8022ba126a jWakeLock
replace native binder with java PowerManager in JWakeLock

Test: MediaPlayer2Test
Bug: 122470692
Change-Id: I1e5871a50ecac4b0785f064801107e4b6035889a
2019-01-08 14:30:18 -08:00
Ray Essick
4c2d5d8c63 Merge "Synchronize mediarecorder.h and MediaRecorder.java" 2019-01-08 17:22:54 +00:00
Paul McLean
525b4cab9a Adding Audio HAL V5: Direction API
Bug: 119137468
Test: With testbed app

Change-Id: I03b82d7a3d8a4590506a6880e4d5a44da26d5c58
2019-01-08 09:07:53 -07:00
TreeHugger Robot
e6baf1a446 Merge "Resolve hidden API usage of Handler constructor" 2019-01-08 04:41:31 +00:00