Commit Graph

296 Commits

Author SHA1 Message Date
Wes Kocher
65216b775b Merge m-c to inbound, a=merge
MozReview-Commit-ID: 5CIctUOTFma
2017-01-26 16:32:26 -08:00
Chris Pearce
c4a0c6d738 Bug 1324925 - Backed out changeset 229e1278d976. r=backout
MozReview-Commit-ID: NnHo7YXFls
2017-01-27 12:30:33 +13:00
Kartikaya Gupta
1af1a82edf Bug 1312319 - Add a NS_INLINE_DECL_PURE_VIRTUAL_REFCOUNTING macro and replace existing pure-virtual AddRef/Release declarations. r=froydnj
MozReview-Commit-ID: 5yt3O4Hoois

--HG--
extra : rebase_source : 5dad12cd8400b8a783e8407de874d4b7c75cb645
2017-01-25 14:51:34 -05:00
Gerald Squelart
5745998021 Bug 1331770 - Rename 'MediaContentType' to 'MediaContainerType' - r=jya
MozReview-Commit-ID: F0BWai8vPyo

--HG--
rename : dom/media/MediaContentType.cpp => dom/media/MediaContainerType.cpp
rename : dom/media/MediaContentType.h => dom/media/MediaContainerType.h
extra : rebase_source : 640ada96750b4496055087e80ae3f600c9df31c9
2017-01-18 11:59:03 +11:00
Chris Pearce
af0e6c4ab5 Bug 1329543 - Remove PGMPAudioDecoder. r=gerald
MozReview-Commit-ID: nwW4s4MtJX

--HG--
extra : rebase_source : 95079ac628f301f8ceb8b5540c7ea95a15deb931
2017-01-14 16:14:32 +08:00
Chris Pearce
fb9e4baabb Bug 1329543 - Remove Primetime from MediaKeySystemAccess. r=gerald
MozReview-Commit-ID: HMSp5AO20mg

--HG--
extra : rebase_source : ea20efdff49f18f71b0c6cbd6597d475a52f8eea
2017-01-14 11:21:35 +08:00
Chris Pearce
5b7a58a56b Bug 1329543 - Remove IsPrimetimeKeySystem(string) from Gecko. r=gerald
MozReview-Commit-ID: LX1ywPZDHtj

--HG--
extra : rebase_source : 8f2181b426159d7f58e9452ad3b0f4ae474388b2
2017-01-09 21:51:40 +08:00
Chris Pearce
9fde9fe382 Bug 1329543 - Remove use of gmp-eme-adobe* prefs from Gecko. r=gerald
MozReview-Commit-ID: 1CnwuGGJ9Jo

--HG--
extra : rebase_source : 99c285160b06a7557f58243bd97f993a13add608
2017-01-09 21:49:13 +08:00
Gerald Squelart
f3a92fa0a6 Bug 1330284 - Use MediaContentType in MP4Decoder - r=jya
MozReview-Commit-ID: 9Npl40Iicjc

--HG--
extra : rebase_source : 27df1df1cdf8eb8b608e155c0146c8b09d655de4
2017-01-01 12:27:45 +11:00
Gerald Squelart
843031e2a5 Bug 1330284 - Use MediaContentType in WebMDecoder - r=jya
MozReview-Commit-ID: 5tcc9of73WR

--HG--
extra : rebase_source : 38ef74afdf27fec45f84f33f539717b3595358f2
2017-01-01 12:16:38 +11:00
Gerald Squelart
cf77093674 Bug 1330284 - Use MediaContentType in MediaKeySystemAccess - r=jya
MozReview-Commit-ID: IpUOcYnYV5z

--HG--
extra : rebase_source : 8038b5fe7bb7c592ba6addc566e49d13bb262e60
2016-12-16 16:12:16 +11:00
Nicholas Nethercote
949658eb73 Bug 1329857 - Remove NS_METHOD and NS_CALLBACK. r=froydnj.
Bug 1295053 removed most uses of NS_METHOD and NS_CALLBACK, but one use was
unintentionally left behind (in the XPIDL parser) and another has since crept
in (in MediaDrmCDMProxy.h).

So this patch removes NS_METHOD and NS_CALLBACK. NS_METHOD_(nsresult) and
NS_CALLBACK_(nsresult, T) can still be used for the same purpose, but those
alternatives are less likely to be used unintentionally.

--HG--
extra : rebase_source : a50fc7b2a64a36d1ca9beda81bc0edb8f2ec1934
2017-01-10 14:08:43 +11:00
Chris Peterson
4b28bd3f34 Bug 1329547 - Remove EME checks for Vista. r=cpearce
MozReview-Commit-ID: J1ww70KMQuw

--HG--
extra : rebase_source : 8cbf795562a02469ce1c5629c5c693700ee8fcea
2017-01-08 00:56:45 -08:00
Kilik Kuo
c0c0027fee Bug 1325543 - Avoid unnecessarily awaiting procedure for Widevine CDM installation. r=jwwang
Currently, gecko doesn't support download and installation for Widevine CDM on Android.
Returning Cdm_not_supported avoids the subsequent call to AwaitInstall() while requesting MediaKeySystemAccess.

MozReview-Commit-ID: 3mOEf9iWE1G

--HG--
extra : rebase_source : 59649e5048424c38033c3c6e6c48f89ea4997a8e
2016-12-29 20:30:31 +08:00
Chris Pearce
896b86d2fb Bug 1324926 - Log expiration in terms of hours remaining in MediaKeySession.SetExpiration(). r=gerald
MozReview-Commit-ID: 4D3qXmCOZrh

--HG--
extra : rebase_source : 51f06be11bd0b990ba662cb69f1c691ffa6b32c5
2016-12-21 11:49:26 +13:00
Chris Pearce
55e0da876c Bug 1324926 - Convert other EME/GMP byte logging from Base64 to Hex. r=gerald
This is marginly more readable.

MozReview-Commit-ID: DWJNFXxI7Vd

--HG--
extra : rebase_source : cb29271f3942db63da2b815e81977f98ec955968
2016-12-21 10:37:09 +13:00
Wes Kocher
5401734deb Backed out 4 changesets (bug 1324926) for windows build bustage a=backout
Backed out changeset e57acea9a4ab (bug 1324926)
Backed out changeset 3a5fc19f492b (bug 1324926)
Backed out changeset 1694d0248f1a (bug 1324926)
Backed out changeset b0a59896aa01 (bug 1324926)
2016-12-20 16:53:41 -08:00
Chris Pearce
6b9f2d3717 Bug 1324926 - Log expiration in terms of hours remaining in MediaKeySession.SetExpiration(). r=gerald
MozReview-Commit-ID: 4D3qXmCOZrh

--HG--
extra : rebase_source : f8a732162d4d53b51c236daa1008f88a310026d1
2016-12-21 11:49:26 +13:00
Chris Pearce
d71275d786 Bug 1324926 - Convert other EME/GMP byte logging from Base64 to Hex. r=gerald
This is marginly more readable.

MozReview-Commit-ID: DWJNFXxI7Vd

--HG--
extra : rebase_source : bfc694c51a8f1de28a6a11155f0c3e6b723ff153
2016-12-21 10:37:09 +13:00
Chris Pearce
8e41b15452 Bug 1324925 - Convert GMPTimestamp to epoch seconds in GMPDecryptorChild::ExpirationChange(). r=gerald
MozReview-Commit-ID: 8tSl2kIQc1w

--HG--
extra : rebase_source : c10839a0df68716b2370e15645470442b0b69922
2016-12-21 11:52:16 +13:00
James Cheng
4f0ada8315 Bug 1323566 - Fix incorrect index usage in MediaKeySystemAccessManager::Observe(). r=cpearce
MozReview-Commit-ID: 1D6Yes6ofdj

--HG--
extra : rebase_source : aada68f7aab16fb51c3a5025993e52a01dd5ed07
2016-12-15 11:53:54 +08:00
Andrea Marchesini
f7f5990527 Bug 1317927 - Media caching needs to use origin attributes, r=cpearce, r=jesup 2016-12-07 07:07:09 -10:00
Chris Pearce
19f0b2fe44 Bug 1320614 - Remove MediaKeys::mNodeId as it's only ever written and never read. r=gerald
MozReview-Commit-ID: BWfrjzdfph

--HG--
extra : amend_source : 784b9d8341dc2fad29c522b5faa147a2a81a9388
2016-11-28 12:12:34 +13:00
Gerald Squelart
2af5ebc606 Bug 1318228 - Replace nsAutoPtr with UniquePtr in MediaDrmCDMProxy - r=cpearce
MozReview-Commit-ID: 71BGVx1G7JH

--HG--
extra : rebase_source : cac6f50eaeaf1afa2f2b03f3514f5e598039618e
2016-11-17 21:11:04 +11:00
Kilik Kuo
5d9f1e5975 Bug 1307818-[P1] Provide drmStubId for CDMProxy and instantiate {Local,Remote}MediaDrmBridge. r=cpearce,jchen
MozReview-Commit-ID: EFPn4DOZq4D

--HG--
extra : rebase_source : 7f494fe6f6c6db897b50b159fcd001f3181f15cd
2016-11-16 22:09:34 +08:00
Chris Pearce
0a0e9d8f06 Bug 1317822 - Move GMPCrashHelper into its own file. r=gerald
MozReview-Commit-ID: 7CinZ2Y2Fmz

--HG--
extra : rebase_source : 3b176cbfadebf6463384105c261ff208bc58b1c2
2016-11-16 11:35:36 +13:00
Chris Pearce
b430a8a481 Bug 1306314 - Add an ID to GMPDecryptor instances, reflect that on CDMProxy. r=gerald
This enables us to identify GMPDecryptor instances in the child process, so that
in a later patch when we create a GMPVideoDecoder instance, we can associate it
with a GMPDecryptor. Then the cdm::ContentDecryptionModule8 instance that these
two actors are adapted to can know whom it's supposed to respond to.

We use the IPDL PGMPDecryptorChild actor ID as the GMPDecryptor's ID. This is unique
per GMP process, which is sufficient.

MozReview-Commit-ID: 7NKND9VjPUW

--HG--
extra : rebase_source : da14d9a8a7313a609e30649af1a23e79b3e401fe
2016-11-11 12:10:43 +13:00
Iris Hsiao
d9a1a0a083 Backed out changeset 9e9727bdc484 (bug 1306314) 2016-11-14 11:07:39 +08:00
Chris Pearce
ec543ad267 Bug 1306314 - Add an ID to GMPDecryptor instances, reflect that on CDMProxy. r=gerald
This enables us to identify GMPDecryptor instances in the child process, so that
in a later patch when we create a GMPVideoDecoder instance, we can associate it
with a GMPDecryptor. Then the cdm::ContentDecryptionModule8 instance that these
two actors are adapted to can know whom it's supposed to respond to.

We use the IPDL PGMPDecryptorChild actor ID as the GMPDecryptor's ID. This is unique
per GMP process, which is sufficient.

MozReview-Commit-ID: 7NKND9VjPUW

--HG--
extra : rebase_source : 6ea7dfa358f8d13f7d36db5a581fc075268038b7
2016-11-11 12:10:43 +13:00
James Cheng
06a62c3bad Bug 1314530 Part3 - Instantiate MediaDrmCDMProxy if it is widevine on fennec. r=cpearce
MozReview-Commit-ID: AhNBaO5LPwe

--HG--
extra : rebase_source : bd481396058d28521b2cbbd0fca8296d32768a86
2016-11-07 14:03:44 +08:00
James Cheng
d1f91996e4 Bug 1314530 Part2 - Add isRemote flag to MediaDrmProxy::Create function to determine if it is oop case. r=cpearce
MozReview-Commit-ID: Dqf1C5nDHct

--HG--
extra : rebase_source : aa957ab7b0ac5fb50b12ab4cd4a3db5fc7273488
2016-11-07 14:01:25 +08:00
James Cheng
90f62da0ee Bug 1314530 Part1 - Remove IsInPrivateBrowsing() since we did not use it anymore. r=cpearce
MozReview-Commit-ID: J8tfOyzBB97

--HG--
extra : rebase_source : fc667dcb1eb47d44f94da4d65160cde6dba8a2d9
2016-11-07 12:34:32 +08:00
James Cheng
15a599af5d Bug 1306572 - Part3 - Implement MediaCDMProxy and the callback proxy. r=cpearce
MozReview-Commit-ID: 3dFawuvhfWu

--HG--
extra : rebase_source : 2c77a0c1b9e7a3c1067f12ebf4a416ae4417f3e6
2016-11-01 14:39:34 +08:00
James Cheng
34683786c0 Bug 1306572 - Part2 - The native implementation of MediaDrmProxy by MediaDrmProxySupport r=cpearce,jchen
MozReview-Commit-ID: 1cbTPDyXlzU

--HG--
extra : rebase_source : 7b3dbecff6044182f67b46033afcfc1df4e26c86
2016-11-01 14:39:26 +08:00
Chris Pearce
5cba5b5a25 Bug 1314858 - Refactor multiple callers of HasPluginForAPI into a helper. r=gerald
I've repeated myself a few times, so make a helper to make determining which
GMPs are available easier.

MozReview-Commit-ID: 2fFLeaA5o8u

--HG--
extra : rebase_source : 74ea0b429d339273535610df3bbd7fec7beae469
2016-11-03 14:33:31 +13:00
Chris Pearce
d5c366c045 Bug 1314445 - Remove unused ParseKeySystem(). r=gerald
MozReview-Commit-ID: KdIpvet73LR

--HG--
extra : rebase_source : aed95e2b024af6fa36f0da96f564966c8d7f3a7d
2016-11-02 13:56:23 +13:00
Chris Pearce
5ebd6552d1 Bug 1314445 - Make MediaKeySystemAccess use GMPService::HasPluginForAPI. r=gerald
Removes callers of GMPService::GetPluginVersionForAPI().


MozReview-Commit-ID: KZcyfDAfTR7

--HG--
extra : rebase_source : ee774359a30c75390eef43d7a6b94789070e77a4
2016-11-02 13:42:40 +13:00
Chris Pearce
20b6c3ec6b Bug 1314445 - Don't pass CDM version to MediaKey*. r=gerald
We don't need this, and we don't seem to be using this anyway.

MozReview-Commit-ID: 7NCRO94PN3m

--HG--
extra : rebase_source : de91b099e5e536eb321584990f18025e08c7cc78
2016-11-02 11:56:30 +13:00
Chris Pearce
e80a3b5b24 Bug 1314452 - Remove IsGMPPresentOnDisk checks from Gecko. r=gerald
These are done in the GMPProvider, so it's unnecessary to do them again inside
Gecko. Plus, they cause main thread synchronous IPC in multi-process Firefox.


MozReview-Commit-ID: EcG38i3b2Oh

--HG--
extra : rebase_source : 37dffa797be13913131efb0019fd2e32c21b1fb6
2016-11-02 11:17:50 +13:00
Phil Ringnalda
b6eec64324 Merge m-c to a CLOSED TREE m-i
MozReview-Commit-ID: 2JxLeQ8GYIX
2016-10-27 20:36:38 -07:00
Chris Pearce
b691c3f403 Bug 1310879 - Remove EME persistent-license sessions. r=gerald
This removes the ability for ClearKey to instantiate persistent-license
sessions using the EME APIs.

MozReview-Commit-ID: FXj5YORxpas

--HG--
extra : source : b69b2435f1059a5c7b1dd26947ea500b381ec7f0
2016-10-18 15:42:02 +13:00
Chris Pearce
08bdd39606 Bug 1310879 - Check that only supported session types are instantiated. r=gerald
MozReview-Commit-ID: 6XkToIXzZL8

--HG--
extra : source : d1c0a7a2ff25005de82033081bee5eb10adea0c8
2016-10-28 11:43:26 +13:00
Chris Pearce
17c7c9d886 Bug 1310879 - Pass MediaKeySystemConfiguration to MediaKeys. r=gerald
MozReview-Commit-ID: 6tHlyRl4nWT

--HG--
extra : source : 5773f8dac74aaf05ec1c4f8585b3b148d51da324
2016-10-28 11:22:11 +13:00
Chris Pearce
8685a93e46 Bug 1313202 - Update MediaKeySession.close() to match EME spec. r=gerald
MozReview-Commit-ID: JgzOaACDUfc

--HG--
extra : rebase_source : 35ce6986bdc7e486b757df53fc59a63fb97014c3
2016-10-27 11:37:27 +13:00
Chris Pearce
ea73ebebc8 Bug 1311848 - Don't call ConnectPendingPromiseIdWithToken in MediaKeySession::Load. r=kikuo
We don't need to call MediaKeys::ConnectPendingPromiseIdWithToken() on the
MediaKeySession::Load() path, we already know the session Id, and we've already
removed the session from the list of pending sessions in Load().

MozReview-Commit-ID: KBiEsY95Csi

--HG--
extra : rebase_source : aadc3204409df35e4bbcb9532c530f860681afd1
2016-10-21 10:52:26 +13:00
Chris Pearce
22b1ca7b53 Bug 1311864 - Reject MediaKeySession::Load() for non temporary session types. r=kikuo
We are required to do this by the draft EME spec.

MozReview-Commit-ID: FnIEFgVId1z

--HG--
extra : rebase_source : 23042d3acda6cfcb379db457224d648dc955f688
2016-10-21 11:43:05 +13:00
Carsten "Tomcat" Book
2e7511ed5a merge mozilla-inbound to mozilla-central a=merge 2016-10-20 16:47:39 +02:00
Kilik Kuo
ede59e2ecf Bug 1310936- Provide a map to get pending MediaKeySession by promise Id correctly. r=cpearce
MozReview-Commit-ID: 34BL4GYoC1A

--HG--
extra : rebase_source : 4dffdf8da32412a6812716de9edbf685235ce442
2016-10-20 15:28:09 +08:00
Phil Ringnalda
8377010e6a Merge m-c to m-i
MozReview-Commit-ID: Ihd0iacfcIW

--HG--
rename : devtools/.eslintrc => devtools/.eslintrc.js
2016-10-18 19:45:02 -07:00
Kilik Kuo
4eecda6d84 Bug 1310958 - Reject promise with correct error in MediaKeySession::Load. r=cpearce
MozReview-Commit-ID: JuWGZCMfW6x

--HG--
extra : rebase_source : 59a9957cd3d37c0ef81cd6bc09f7b6eda3afac7b
2016-10-18 17:31:51 +08:00