Commit Graph

34 Commits

Author SHA1 Message Date
James Cheng
1c2ea0c110 Bug 1417297 - Part1 - Convert gmp-clearkey to use Chromium ContentDecryptionModule_9 interface. r=cpearce
1. Make ClearKeyCDM inherits cdm::ContentDecryptionModule_9
2. Pass cdm::Host_9 instance instead of cdm::Host8
3. Modify the manifest to 1.4.9

MozReview-Commit-ID: JbeBm5YNZ22

--HG--
extra : rebase_source : feb6aa44e361cb68f8a75284e79b1617609438a4
2017-11-23 16:47:13 +08:00
James Cheng
f0a43c284e Bug 1409670 - Skip decrypting request when receiving an unencrypted sample in Clearkey implementation. r=cpearce
MozReview-Commit-ID: 5XIUeFc3PSD

--HG--
extra : rebase_source : a36e27b385f1622bc7125e8d7e8c1b1b6e930842
2017-10-19 16:45:21 +08:00
Michael Layzell
8b7ba021a4 Bug 1339537 - Part 6: Pass std::function values tree by const reference instead of by value, r=ehsan
MozReview-Commit-ID: PVAqU2DPs2
2017-04-27 12:44:57 -04:00
Daniel Holbert
a6c2851e3e Bug 1344812: Remove variable "sessionId" from lambda-captures where it's not used, in ClearKeySessionManager.cpp. r=cpearce
MozReview-Commit-ID: IMdIBFmgwmv

--HG--
extra : rebase_source : c71f7910dcea9dbd9a16ef463c5983069c90f0b7
2017-03-06 10:52:09 -08:00
Andi-Bogdan Postelnicu
c3aa41c06b Bug 1334079 - prevent memory leak in CreateSession. r=cpearce
MozReview-Commit-ID: 7aaEkFcmiZF

--HG--
extra : rebase_source : e686021eabe8931105d3eae5e7f27f5a76ed21c1
2017-01-26 14:18:07 +02:00
Jay Harris
21c0f1fb53 Bug 1318965 - Improves the logging in Clearkey r=cpearce
MozReview-Commit-ID: DTQAI7ffMm7

--HG--
extra : rebase_source : 432ab764dcec12da295294615e8024a9fdfe7662
extra : histedit_source : bf2a4bdaadf44f7da935ce2c659a7f039e562388
2017-01-18 14:49:58 +13:00
Jay Harris
f44f926c07 Bug 1318965 - Converts gmp-clearkey to use Chromium ContentDecryptionModule8 interface used by widevine r=cpearce
MozReview-Commit-ID: 6lOzItuuvdd

--HG--
extra : rebase_source : b1e98ecd166954f0a9e7e9ad8544504210998f49
extra : histedit_source : 7d73e59040f8f5c15bc26c388b4b40bf2ec1e5fe
2017-01-12 09:52:05 +13:00
Wes Kocher
07fd8cebf7 Backed out 3 changesets (bug 1318965) for frequent media test failures a=backout
Backed out changeset 3f756d8ee4cf (bug 1318965)
Backed out changeset 4bdf65d60c9e (bug 1318965)
Backed out changeset c1e2b6c14a7f (bug 1318965)

MozReview-Commit-ID: 6CPk5oS5AOw

--HG--
extra : source : babe3f8a0258fb592e17a590450de6ceb09460c3
2017-01-13 13:23:31 -08:00
Jay Harris
06bce5da83 Bug 1318965 - Converts gmp-clearkey to use Chromium ContentDecryptionModule8 interface used by widevine r=cpearce
MozReview-Commit-ID: 6lOzItuuvdd

--HG--
extra : rebase_source : 7f70380be5628c3e6668cf9fa235c8d2525bf1dc
extra : amend_source : 8d6afebb484ed59cf02907cab8991e6f232b0f69
2017-01-12 09:52:05 +13:00
Chris Pearce
d0ce61581c Bug 1313266 - Make gmp-clearkey reject with TypeError instead of InvalidAccessError on invalid input. r=gerald
The spec expects this, and now we pass more web platform tests.

MozReview-Commit-ID: 9HJFp2ebczk

--HG--
extra : source : 6d50c9068b52d8846e4d528d150f3f3dbd9a233d
2016-10-27 14:59:02 +13:00
Chris Pearce
04141020eb Bug 1313202 - Make ClearKey resolve MediaKeySession.closed promise before promise returned by MediaKeySession.close(). r=gerald
MozReview-Commit-ID: KWwN6W07Cba

--HG--
extra : rebase_source : 4eb210a5816981a26e9792e3141564e6b235ea20
2016-10-27 10:35:16 +13:00
Sebastian Hengst
ab415c7049 Backed out changeset 736a78915259 (bug 1310879) 2016-10-19 11:25:00 +02:00
Chris Pearce
a8a56efe47 Bug 1310879 - Remove persistent license support from gmp-clearkey. r=kikuo
MozReview-Commit-ID: LlBUD4xPpRC

--HG--
extra : rebase_source : 3cec8951cee990271d724c59b4c7f9d517a820a2
2016-10-18 16:10:05 +13:00
Kilik Kuo
26bd0bc8ef Bug 1308424-[Part1] Verify the license response size while updating session. r=cpearce
MozReview-Commit-ID: IXZLWnbYTn9

--HG--
extra : rebase_source : fbf015e56443320c55960121e4d59379d9ffabcd
2016-10-07 18:16:30 +08:00
Chris Pearce
3bb7ad5953 Bug 1308076 - Rename CLEARKEY_KEY_LEN to CENC_KEY_LEN. r=jwwang
This better reflects that it's used for all CENC keys, not just ClearKey keys.

MozReview-Commit-ID: 9uCzDKVDLjc

--HG--
extra : source : 3307b3e0d411ceb9888f10afdbebc07ab9efce61
2016-10-07 11:14:04 +13:00
Kilik Kuo
4d162fcd4a Bug 1303922 - Part 1: Make EME keystatuschanged information notified in batch. r=cpearce
MozReview-Commit-ID: IeExaQ62qTF

--HG--
extra : transplant_source : t%D4%AFxu%D6%40%F8hU%D2%94%D4q8q%EDy%08-
2016-10-04 17:18:46 +08:00
Chris Pearce
f49856bc79 Bug 1278198 - Pipe through distinctive identifier and persistent state allowed. r=gerald
MozReview-Commit-ID: A92e0XGp5s4

--HG--
extra : rebase_source : 09f7ba18c9b81263aa345cc7f34f0ef2a2548482
2016-07-07 17:26:15 +12:00
Chris Pearce
46a1552995 Bug 1271242 - Remove GMPDecryptorCallback::SetCapabilities(). r=jwwang
Now that GMPParent detects whether gmp-clearkey can decode using AAC/H.264
using WMF before reporting gmp-clearkey's GMPParent can decode AAC/H.264, we
don't need the GMPDecryptorCallback::SetCapabilities() callback from the GMP to
signal to the PDMFactory that the GMP can decode. We can now trust what the
GMPService tells us.

So we can remove the "waiting for CDM caps" step in the state machine's startup
sequence. And all the plumbing. :)

If we need more caps, like for an decode-and-render path, we can declare those
as API strings in the info file.


MozReview-Commit-ID: E0QhU4cYhjo

--HG--
extra : rebase_source : 7d15ab6a45bac88c15c053f416d941b5fe0807b0
2016-05-10 10:28:38 +12:00
Chris Pearce
966cf53003 Bug 1232527 - Call into WMF PDM to determine if WMF can decode instead of using GMPVideoDecoderTrialCreator. r=jwwang
Resurrect WMFDecoderModule::HasAAC() and HasH264(), and use those in
MediaKeySystemAccess.cpp to figure out whether we gmp-clearkey can decode,
rather than assuming Vista and later is always able to decode, as that's not
a valid assumption; Vista may not have the required Platfor Update installed,
or we may be on Windows N or KN without the Media Feature Pack.

--HG--
extra : commitid : 2QrVAGQ5OJa
extra : rebase_source : 8ad6e5c5f87cf2b2489f049543c021723927901a
2015-12-15 14:50:59 +13:00
Chris Pearce
9654972991 Bug 1230026 - Support 'webm' initDataType format for MP4 ClearKey initData. r=gerald 2015-12-04 07:24:11 +13:00
Chris Pearce
d6743b5aff Bug 1186406 - Copy input to ClearKey's decoder, so we can return its containing shmem earlier. r=gerald
We're failing in the "Very rough kill-switch" case in
GMPVideoDecoderParent::Decode() we find that too many shmems are in use when we
come to send a "Decode" message to the GMP, and that causes an error which
percolates up to cause the test failure.

This patch changes gmp-clearkey to copy the input encrypted and compressed
sample and immediately return the shmem to the parent process. We are
copying the data anyway when we decrypt, so we can rejigg things so that we
don't actually end up doing a second copy.
2015-12-01 18:13:58 +13:00
Chris Pearce
efc8956d13 Bug 1228461 - Implement keyids initData type for ClearKey. r=gerald 2015-11-27 17:13:40 +13:00
Chris Pearce
05f051d1ba Bug 1160914 - Make gmp-clearkey's decoders threadsafe refcounted, to handle DecodingComplete while GMPVideoHost::CreateFrame() is waiting. r=edwin 2015-05-06 11:40:40 +12:00
Wes Kocher
b7143cd0e7 Backed out changeset ddb936f4e78a (bug 1160914) for build bustage CLOSED TREE 2015-05-04 16:32:41 -07:00
Chris Pearce
b62f7d16fb Bug 1160914 - Make gmp-clearkey's decoders threadsafe refcounted, to handle DecodingComplete while GMPVideoHost::CreateFrame() is waiting. r=edwin 2015-05-05 11:21:55 +12:00
Jacek Caban
3a45303395 Bug 1156131 - mingw cross compilation fixup. 2015-04-29 17:39:35 +02:00
Chris Pearce
fa0f746b0c Bug 1156131 - Use correct DLL on WinVista, 7, and 8 for WMF decoding in gmp-clearkey. r=edwin 2015-04-20 20:07:24 +12:00
Chris Pearce
1fa249bfb8 Bug 1150437 - Make gmp-clearkey consistently Apache2 licensed. r=edwin,jwwang,kentuckyfriedtakahe 2015-04-03 09:08:27 +13:00
Chris Pearce
1618c6fa37 Bug 1137489 - Fix unified build failure in gmp-clearkey. r=edwin 2015-02-28 16:15:18 +13:00
Edwin Flores
bc2814dfe3 Bug 1075199 - More logging in ClearKey CDM - r=cpearce 2015-01-27 18:35:36 +13:00
Edwin Flores
4e3006ddd2 Bug 1075199 - WMF decoding in ClearKey CDM - r=cpearce 2015-01-16 10:37:54 +13:00
JW Wang
c1dd9140a5 Bug 1121332. Part 1 - add media key status to gmp-api. r=cpearce. 2015-01-31 13:22:12 +13:00
JW Wang
a9391d3408 Bug 1102852 - add MediaKeyMessageType to and remove destinationURL from MediaKeyMessageEvent. r=cpearce,bz 2015-01-15 11:25:47 +13:00
Edwin Flores
1f04f15482 Bug 1075199 - Separate session management from ClearKeyDecryptionManager - r=cpearce
--HG--
rename : media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp => media/gmp-clearkey/0.1/ClearKeySessionManager.cpp
2015-01-12 20:15:55 +13:00