Commit Graph

8860 Commits

Author SHA1 Message Date
Gopalakrishnan Nallasamy
b53728a073 MediaMuxer:Include info to specify last sample duration
Added ability to set duration of last sample by writing an empty buffer
with EOS flag marked along with presentation time stamp at the end.
Have updated the same and the default behavior in JavaDoc of MediaMuxer.

Bug: 141573686
Bug: 121052341

Test: Document is updated with new information properly.
Change-Id: If15d555e877f0d17040688858673946cf4fe86af
(cherry picked from commit 19261fac01)
2020-02-29 00:59:34 +00:00
Ytai Ben-tsvi
2cba965676 Merge "Pass models to soundtrigger middleware with shared memory" into rvc-dev 2020-02-28 21:29:53 +00:00
Ytai Ben-Tsvi
d5065ba8a5 Pass models to soundtrigger middleware with shared memory
This both avoids the need to make extra copied for the models and
allows exceeding the parcel size limits.

Bug: 150100907
Test: Manual testing of basic sound trigger functionality
Change-Id: Ic4c5c1a9de3e29b1b6fa82442254e1afe7daec19
2020-02-28 13:01:24 -08:00
TreeHugger Robot
fde0af9177 Merge "Make MediaRouter2 callback classes as abstract" into rvc-dev 2020-02-28 11:38:39 +00:00
Hyundo Moon
899535c9ff Make MediaRouter2 callback classes as abstract
This is per API review.

Bug: 149912538
Test: Ran CTS and atest mediaroutertest
Change-Id: Id52bb7b06da4f414099607b1bde781005e47ded3
2020-02-28 18:27:42 +09:00
TreeHugger Robot
0eba93a5ed Merge "Tuner JNI: demux" into rvc-dev 2020-02-28 01:22:41 +00:00
Nicholas Ambur
626b24958f Merge "remove client token passing active VI service" into rvc-dev 2020-02-27 18:01:24 +00:00
Kyunglyul Hyun
d02172c6e6 Add "name" to RoutingSessionInfo
The name of dynamic group can be set by providers.

Bug: 150249359
Test: cts tests
Change-Id: I1b74fe5b7976eb0ad6a52fd29203446dde480de8
2020-02-27 19:12:10 +09:00
Jaewan Kim
745b35004a Fix MediaSession.Token#equals()
This also fixes the Activity#setMediaController() which previously
ignored because the MediaSessionService failed to find session set to
the foreground activity.

Bug: 149006225
Test: Run MediaActivityTest in CtsMediaTestCases
Change-Id: I8a22665a109ce480ae9604f5c7262bf2b3c2db8c
2020-02-27 07:31:47 +00:00
shubang
bee73460b8 Tuner JNI: demux
Bug: 139308734
Test: make; acloud create;
Change-Id: I4e821ea24eb109cca54087ea6163d42b6e8f5639
(cherry picked from commit 551d3282f7)
2020-02-25 23:02:19 +00:00
shubang
82530bf904 Tuner API: Remove superclass Dvr
Bug: 149785982
Test: make;
Change-Id: I39721db253ec1212c5cd9774c8466afdf47799d2
2020-02-25 14:04:01 -08:00
TreeHugger Robot
c5162ed949 Merge "media: fix MediaCodecTest#testException" into rvc-dev 2020-02-25 18:21:19 +00:00
Amy Zhang
282b5c2043 Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev 2020-02-25 18:16:49 +00:00
Nicholas Ambur
1ec50c8f2f remove client token passing active VI service
Previous implementation relied on client to pass a token which the
service used to verify if it was the active service. This is seen to be
a security concern as there is no way to verify how the client obtained
the token. Instead, a check is done to confirm the caller's UID matches
the UID of the active service.

In the case of voice model enrollment, KeyphraseEnrollmentInfo class is
leveraged. A client is allowed to enroll if it is the active voice
interaction service or if it is a voice model enrollment application
bundled with the system image.

All previous manifest permision checks still apply.

Bug: 148159858
Test: gts-tradefed run gts-dev -m GtsAssistIntentTestCases -t \
com.google.android.assist.gts.KeyphraseModelManagerTest \
\#testShouldEnrollOnlyWhenActiveService

Merged-In: Ie2c4653d365770a9123a22bc69822518b4ccc568
Change-Id: Ie2c4653d365770a9123a22bc69822518b4ccc568
(cherry picked from commit c6f4118f9e)
2020-02-25 01:20:05 +00:00
Amy
38ff0181c3 Add requestFrontend implementation in TunerResourceManager
Test: atest TunerResourceManagerServiceTest
Bug: 147380513
Change-Id: Icec048913e2cbe141448c0c322d37c233588dfcd
(cherry picked from commit 9d150f58bd)
2020-02-24 14:27:36 -08:00
Amy
9db88a2f0d Add @NonNull annotation per API Council's suggestion
Test: make framework-minus-apex -j8
Bug: 150127251
Change-Id: I667668ec97cc46f2513c63eeadcc56d5a26cb41f
2020-02-24 14:10:40 -08:00
Wonsik Kim
4a728ca2e5 media: fix MediaCodecTest#testException
Bug: 150004878
Test: atest CtsMediaTestCases:MediaCodecTest
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: I779aa12bea633cee755aba46231e1b8c8e67b2cd
Merged-In: I779aa12bea633cee755aba46231e1b8c8e67b2cd
(cherry picked from commit 253f0046ba)
2020-02-22 08:23:30 +00:00
TreeHugger Robot
0526d43236 Merge "Tuner JNI: use linearblock for media event" 2020-02-21 21:57:07 +00:00
Santiago Seifert
9aa778f56d Merge "Make minor MediaFormat code simplifications" 2020-02-21 19:15:47 +00:00
Hyundo Moon
20886b9210 Merge "Add javadoc for the difference between transfer and select" 2020-02-21 06:47:51 +00:00
Hyundo Moon
6200266917 Add javadoc for the difference between transfer and select
Bug: 149912538
Test: Builds successfully
Change-Id: I5282bf6572a6ef281028e0a2368e9385c7564f46
2020-02-21 14:02:27 +09:00
Kyunglyul Hyun
ce6a9dc061 Merge "MediaRouter: Define route type" 2020-02-21 02:36:00 +00:00
shubang
d49681e2b3 Tuner JNI: use linearblock for media event
Test: mannual
Change-Id: I58398404fdfdb538649cd272031d7d04ca3cd956
2020-02-20 17:45:47 -08:00
Hyundo Moon
d882109319 Merge "Add MediaRoute2ProviderService#notifyRequestFailed" 2020-02-21 00:21:46 +00:00
Santiago Seifert
274ad8ed8d Make minor MediaFormat code simplifications
Test: Non-functional changes.

Change-Id: Id1262062d43723b097e09cb18d5deffbfe0a11fb
2020-02-20 20:08:19 +00:00
Jean-Michel Trivi
a5f0eb7b48 Merge "Audio preferred device: improve listener javadoc" 2020-02-20 19:53:31 +00:00
Jean-Michel Trivi
cf9c5d32e3 Audio preferred device: improve listener javadoc
Clarify behavior of OnPreferredDeviceForStrategyChangedListener.

Bug: 149871788
Test: atest AudioServiceHostTest#testPreferredDeviceRouting
Change-Id: Ice80ed848a8a818dcb4d7266cf51c0a0af5d378c
2020-02-20 10:45:35 -08:00
TreeHugger Robot
5f43ae305d Merge "MediaCodec: address API review" 2020-02-20 17:44:41 +00:00
Kyunglyul Hyun
8828c891e0 MediaRouter: Define route type
Change deviceType to type and define more types.
TYPE_GROUP is also added to classify static group routes.

Device type for the default route is set from now

Bug: 149677159
Test: cts test and atest mediaroutertest
Change-Id: I0626efe7b6160f22fe69a0b75368ee1a67d8768c
2020-02-20 21:32:54 +09:00
Santiago Seifert
42c3d4bcfa Deprecate DrmInitData.get(UUID)
And point users to use getSchemeInitDataCount and
getSchemeInitDataAt instead.

Bug: 132153067
Test: No behavioral change.
Change-Id: Ie50067ebdc408481fc69167deab4ebfd376b3543
2020-02-20 12:11:32 +00:00
TreeHugger Robot
f01c606040 Merge "Add MediaRouter2.RoutingController#getOriginalId() as @TestApi" 2020-02-20 11:13:29 +00:00
Hyundo Moon
0fa60e880b Add MediaRoute2ProviderService#notifyRequestFailed
Bug: 146616547
Test: atest mediaroutertest and CTS
Change-Id: I2b2b95bf0fec070ab24f51bba0c58221e5495460
2020-02-20 17:33:22 +09:00
Hyundo Moon
0ba64fa110 Add MediaRouter2.RoutingController#getOriginalId() as @TestApi
Bug: 149886370
Test: atest mediaroutertest and CTS
Change-Id: I4adc8041763756747e4c725d682533fb5707f183
2020-02-20 16:43:20 +09:00
TreeHugger Robot
ff8f9860ab Merge "Tuner JNI: time filter" 2020-02-20 02:41:58 +00:00
Wonsik Kim
e0cc55ec00 MediaCodec: address API review
- New exception for APIs that are incompatible with the new mode
- Better messages with exceptions
- QueueRequest API/documentation rework as per suggestion

Bug: 149487982
Test: atest CtsMediaTestCases:MediaCodecBlockModelTest
Change-Id: I48be448876c200208bb814e91b920c76d09a3b9e
2020-02-19 15:08:12 -08:00
Automerger Merge Worker
7995915661 Merge "RingtoneManager: Don't crash if the ringtone doesn't have a numerical ID" am: ff78aab391 am: 0396aae65b am: ac23b2292d
Change-Id: Id6d7ff358769c86fab311b5b1161e8916169212e
2020-02-19 22:17:45 +00:00
TreeHugger Robot
895e1f2883 Merge "Resolve TODOs in MediaRouter2" 2020-02-19 06:33:35 +00:00
Jean-Michel Trivi
1c4cb8be3b Merge "Rename AudioDevice to AudioDeviceAttributes" 2020-02-19 05:51:11 +00:00
TreeHugger Robot
7b9eaf2f78 Merge "Tuner Java API: minor changes per API review feedback" 2020-02-19 04:51:07 +00:00
Kyunglyul Hyun
a42e8ea39c Resolve TODOs in MediaRouter2
including trivial cleanup

Bug: 145490612
Test: cts related to MR2
Change-Id: I1d5230dbfe21315a6f1b59f272088049396b1147
2020-02-19 13:49:35 +09:00
Henry Fang
5cba7b1136 Use Tuner Resource Manager to get resource permission
Cooperate with Tuner Resource Manager to allocate and free CAS session resource

bug: 141783130
Test: Manual
Change-Id: I2fb09d8def0fcfa19d568e8c618b1824158ceda9
2020-02-18 16:45:29 -08:00
Jean-Michel Trivi
0e87bcaf5c Rename AudioDevice to AudioDeviceAttributes
Once AudioDeviceAddress, then AudioDevice, now AudioDeviceAttributes.

Bug: 148565943
Test: atest AudioServiceHostTest#testAudioDeviceAttributes AudioServiceHostTest#testPreferredDeviceRouting
Change-Id: I17b2b8fc6a5eda6ee1176d6aa27ada3cdd820acc
2020-02-18 23:10:46 +00:00
Automerger Merge Worker
0396aae65b Merge "RingtoneManager: Don't crash if the ringtone doesn't have a numerical ID" am: ff78aab391
Change-Id: Ia4af051076066cb3cd66cb5d95162339b989dad4
2020-02-18 22:06:22 +00:00
Andy Hung
ff78aab391 Merge "RingtoneManager: Don't crash if the ringtone doesn't have a numerical ID" 2020-02-18 21:48:53 +00:00
nchalko
e982fa4084 Merge "Add encoding information to TvTrackInfo" am: f3681741e3
Change-Id: Id263372457ab5849cdadd3f6788c64ad462310fe
2020-02-18 21:11:28 +00:00
TreeHugger Robot
a83ff7c895 Merge "MediaFormat AAC DRC documentation updates" 2020-02-18 19:42:00 +00:00
Amy Zhang
e891f575a4 Merge "Moving TRM under a separate package Change the TunerResourceManagerListener to ResourcesReclaimListener" 2020-02-18 18:38:38 +00:00
Oscar Azucena
2a180f1140 Merge "Remove user id based audio captured API." 2020-02-18 17:55:19 +00:00
Kyeongkab.Nam
ada0f3079c Add encoding information to TvTrackInfo
Add TIF API for getting encoding in order for TV App to use it.

Test: build
Bug: 112835103
Change-Id: I975dda20f129cb05d55eb59a1a60bcdb22b2533e
Merged-In: I975dda20f129cb05d55eb59a1a60bcdb22b2533e
2020-02-18 17:45:00 +00:00
Jean-Michel Trivi
fc3b8a8df3 MediaFormat AAC DRC documentation updates
Better doc for Target Ref level.
Clarify behavior of -1 for Target Ref level

Bug: 148385721
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I8ef83abc73d72552c4ea8e63839cc6efb4d22a45
2020-02-18 09:29:13 -08:00