Граф коммитов

29 Коммитов

Автор SHA1 Сообщение Дата
Eric Rahm 2f5a215771 Bug 1577885 - Remove using namespace std from GMP ClearKey r=bryce
Differential Revision: https://phabricator.services.mozilla.com/D44269

--HG--
extra : moz-landing-system : lando
2019-09-03 19:10:42 +00:00
Chris Pearce 2674fe3acc Bug 1528661 - Pass paths to i686 xul and plugin-container binaries to CDM in host verification paths. r=bryce
On Windows on ARM64 we will run the x86 Widevine DLL in an x86
plugin-container.exe with an x86 xul.dll. We therefore should also pass the
paths to these binaries to the CDM in the host files instead of the aarch64
plugin-container.exe. We should still pass the aarch64 xul.dll to the CDM,
as that's in use by the aarch64 firefox.exe.

Differential Revision: https://phabricator.services.mozilla.com/D21507

--HG--
extra : source : 4c22ddbf15b579a57d1790c1b4f6290e661da346
extra : histedit_source : 8f1f76f36c3a18681e8aa373e7cd117c41c11815
2019-02-15 21:27:01 +13:00
Ehsan Akhgari e5e885ae31 Bug 1521000 - Part 2: Adjust our clang-format rules to include spaces after the hash for nested preprocessor directives r=sylvestre
# ignore-this-changeset

--HG--
extra : amend_source : 7221c8d15a765df71171099468e7c7faa648f37c
extra : histedit_source : a0cce6015636202bff09e35a13f72e03257a7695
2019-01-18 10:16:18 +01:00
Bryce Van Dyk 5aecaa0a28 Bug 1516669 - Update gmp-clearkey to use CDM10 interface. r=cpearce
Not much changed in the interface:
- CDM initialization takes a use hardware codecs arg, we pipe this through, but
  don't do anything more with it in the clearkey CDM.
- The CDM should call the hosts OnInitialized() when it's initialized. This is
  done is now done in the clearkey CDM once the session management is ready, as
  that is the last thing done during init.

Aside from the above, it's just updating interface usage. While the new CDM
interface adds support for different encryption schemes, this is not handled
here and will be done in follow up bug 1516673.

Differential Revision: https://phabricator.services.mozilla.com/D15518

--HG--
extra : moz-landing-system : lando
2019-01-14 16:40:04 +00:00
Sylvestre Ledru 265e672179 Bug 1511181 - Reformat everything to the Google coding style r=ehsan a=clang-format
# ignore-this-changeset

--HG--
extra : amend_source : 4d301d3b0b8711c4692392aa76088ba7fd7d1022
2018-11-30 11:46:48 +01:00
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 38c77e80cb Bug 1406080 - Part2 - Reject creating with unsupported cdm version in clearkey cdm and cdm-fake. r=cpearce
MozReview-Commit-ID: JvSsqZekRQ6

--HG--
extra : rebase_source : e80713dbf52aad29a32ff71a083c19479094b9a6
2017-10-07 00:06:06 +08:00
James Cheng 10d6dbd3e6 Bug 1390453 - Don't call VerifyCdmHost_0 in non-official builds. r=cpearce
MozReview-Commit-ID: 3rzMDq0upBm
2017-08-17 14:41:54 -04:00
Jan Beich 5c4a94b509 Bug 1385115 - Unbreak build on Tier3 after bug 1382883. r=cpearce
MozReview-Commit-ID: ISTOw1qfxiy

--HG--
extra : rebase_source : 4444849c190f7128d67c53483866ac59c73b2eb9
2017-07-28 11:48:56 +00:00
Chris Pearce 0637427899 Bug 1382883 - Pass paths and open file handles to CDM host binaries on CDM startup. r=gerald
MozReview-Commit-ID: 9IhRqlFrNJf

--HG--
extra : source : de04ea0a90ae935bbc1d0f730332b034b5514f17
extra : intermediate-source : b18daff94ad3d832fcbd601d219c6db2eae46f90
2017-07-27 12:50:46 +12:00
Chris Pearce c4af620223 Bug 1381720 - Update content_decryption_module.h. r=gerald
Update to chromium revision 6e4c388c0117fe408b66fbede91081fb1018c5fe.

Includes cdm::ContentDecryptionModule_9 and cdm::Host_9 definitions,
HDCP definitions, and 10 and 12 bit image format definitions.

MozReview-Commit-ID: bYH3OBSzuT

--HG--
extra : rebase_source : cfc291b3452c2154ecd1ca16a2ece0a5a42f0b5e
2017-05-29 17:14:26 +12:00
Wes Kocher b1c83de1b7 Backed out 2 changesets (bug 1381720) for linux build failures in content_decryption_module.h a=backout
Backed out changeset e4d9cb334352 (bug 1381720)
Backed out changeset 69f177823866 (bug 1381720)

MozReview-Commit-ID: DctOanJkHh7
2017-07-17 23:21:49 -07:00
Chris Pearce 9901d75b55 Bug 1381720 - Update content_decryption_module.h. r=gerald
Update to chromium revision 6e4c388c0117fe408b66fbede91081fb1018c5fe.

Includes cdm::ContentDecryptionModule_9 and cdm::Host_9 definitions,
HDCP definitions, and 10 and 12 bit image format definitions.

MozReview-Commit-ID: bYH3OBSzuT

--HG--
extra : rebase_source : d062d233c9a2b59aa5ae5c6e0584ed13b7c83e6e
2017-05-29 17:14:26 +12: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
Jay Harris 7a7b0325f0 Bug 1319197 - Remove audio decoding from gmp-clearkey. r=cpearce
MozReview-Commit-ID: EA0AAoDjWUh

--HG--
extra : transplant_source : 1D%21%1C%21%15%F7A%CD%EF-%C9%8FS%ECl%A8%9A%DC%B5
2016-11-22 14:32:26 +13: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
Gerald Squelart 0cf2393949 Bug 1182363 - Added missing 'else' to prevent wrong error logging. r=edwin 2015-07-09 18:22:00 +02:00
Gerald Squelart f4ccd23df1 Bug 1173631 - [EME] Implement async shutdown in clearkey GMP. r=cpearce
--HG--
extra : rebase_source : d6e510b5e081d581524a38a684a9cc677a5bde34
2015-06-11 22:05:00 +02:00
Chris Pearce 461ef61358 Bug 1169129 - Test that an EME GMP can instantiate a plugin before report we support that keySystem. r=edwin 2015-06-05 21:55:51 +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 4e3006ddd2 Bug 1075199 - WMF decoding in ClearKey CDM - r=cpearce 2015-01-16 10:37:54 +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
Masatoshi Kimura bf312ad056 Bug 1120062 - Part 1: Remove most Nullptr.h includes. r=waldo 2015-01-11 11:34:52 +09:00
Chris Pearce b392b7de2a Bug 1077159 - Use macros for GMP API names, to make them implicitly versionable. r=jesup 2014-12-10 09:35:26 +13:00
Daniel Holbert c1bc87650e Bug 1083373 part 1: Remove unused member-variable mHost from ClearKeySession and ClearKeyDecryptionManager. r=edwin 2014-10-27 18:11:55 -07:00
Edwin Flores 0afabd88d4 Bug 1044742 - ClearKey CDM for testing EME - r=cpearce 2014-09-24 10:04:49 +12:00