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
Sylvestre Ledru
9ce875d87a
Bug 1387002 - Replace .size() by .empty() when applicable in gmp r=cpearce
...
MozReview-Commit-ID: HhYJ6BK4oOG
--HG--
extra : rebase_source : 8177ad33ebafafc27ba2f809743cfd2c223a10d7
2017-08-04 09:09:38 +02:00
Sylvestre Ledru
756cf62eca
Bug 1372839 - SkipString; Exit early if sym is not found r=gerald
...
MozReview-Commit-ID: GnqPuW8FL5F
--HG--
extra : rebase_source : b3c44c8daecc5341957d5953a525af82afba705a
2017-08-10 09:34:34 +02: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
Chris Pearce
12f8d2203e
Bug 1352556 - Validate output of MFGetAttributeSize. r=gerald
...
MozReview-Commit-ID: J1NirhKfTK6
2017-05-01 16:12:27 +12: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
Chris Pearce
f96fedca29
Bug 1351954 - Change ClearKey CDM to allocate its video frame buffers optimally. r=gerald
...
The WMF decoder gives us video frames in buffers with the planes 16 row-aligned
for some reason. If we allocate our video frames the same size we waste memory.
So let's have the ClearKey CDM not allocate its video frames with the extra
padding rows.
Excluding the padding in our copy of the decoded data also makes my work in bug
1351953 easier.
MozReview-Commit-ID: 9dD40P6ST68
--HG--
extra : rebase_source : a6c4fea01e8bf2deef8edc78d0a041e8fed0c0b8
extra : source : 433028f9a2055869cd98710f0871d040605c0535
2017-03-28 18:00:01 +13:00
Tom Ritter
6c832ecd7e
Bug 1344909 When compiled with MinGW, use only a single core in gmp-clearkey r=cpearce
...
MozReview-Commit-ID: Ej9avF7TkaL
--HG--
extra : rebase_source : 804988fa70c9cc45bb404793dd1320dbd2bc4ac1
2017-03-23 13:58:54 -05:00
Gerald Squelart
ef98a8485d
Bug 1346648 - Better pointer checks. r=cpearce
...
MozReview-Commit-ID: BjYCYS4h5qN
--HG--
extra : rebase_source : e1b079c4e7e29fcb2121ad3cfbc2c183798928b7
2017-03-14 09:33:16 +11:00
Joel Maher
43d997b5a3
Bug 1344470 - add BUG_COMPONENT to media/* files. r=padenot
...
MozReview-Commit-ID: C7xWOE0OwIK
2017-03-07 13:06:45 -05: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
Jay Harris
f1bbbab7e0
Bug 1306477 - Updates an assert in Clearkey to deal with unencrypted samples. r=cpearce
...
MozReview-Commit-ID: 42VfekHccjK
--HG--
extra : rebase_source : 34c52ed975e56c5f691c334efd3e43bcaf21364e
2017-02-08 12:18:13 +13: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
845adb059f
Bug 1318965 - Changes the way the the 'DeinitializeDecoder' method in the ClearkeyCDM works r=cpearce
...
It is now more inline with the api spec in content_decryption_module
MozReview-Commit-ID: KmZzyfvHv5p
--HG--
extra : rebase_source : 783430c2d92018d686ddd8779bea1939936c618a
extra : histedit_source : 653ab1e717ce57c0f3eebfb3e6eddc6fa20d5884
2017-01-18 14:49:04 +13:00
Jay Harris
1be3b00a10
Bug 1318965 - Removes the custom AtomicRefCount r=cpearce
...
MozReview-Commit-ID: BAGocY4nGiM
--HG--
extra : rebase_source : a2d545834d4d033073a58940416a8d26765af2af
extra : histedit_source : ab70291573de634e0f3b05b9364bd8bb3f95f70d
2016-12-16 11:57: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
Jay Harris
f4929b46d1
Bug 1319159 - Updates how 'ParseChromiumManifest' works so that it doesn't assume Widevine (now it assumes Widevine or Clearkey..). r=cpearce
...
MozReview-Commit-ID: 8m6hPIiUPT
--HG--
extra : rebase_source : 457da21982f35b66eac1ff32316ceee243139652
extra : histedit_source : 4ebc011309b9013952435bf0ff32206a73de0854
2016-12-22 11:28:40 +13:00
Wes Kocher
813009d982
Backed out 2 changesets (bug 1319159) for frequent media test failures a=backout
...
Backed out changeset afb84605c3c4 (bug 1319159)
Backed out changeset a14cade8b962 (bug 1319159)
MozReview-Commit-ID: 1ZWV6BPE8ne
--HG--
extra : source : 68c824ad72b817189143af771bb34408c72ad495
2017-01-13 13:23:56 -08: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
36c1319590
Bug 1318965 - Removes the custom AtomicRefCount r=cpearce
...
MozReview-Commit-ID: BAGocY4nGiM
--HG--
extra : rebase_source : 18562465c37b686ca1653862e5c4e096d9efefe9
extra : amend_source : ecc2ab9b15950c6291ea386004d82a67d5dde368
2016-12-16 11:57:58 +13: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
6f7214ca07
Bug 1319159 - Updates how 'ParseChromiumManifest' works so that it doesn't assume Widevine (now it assumes Widevine or Clearkey..). r=cpearce
...
MozReview-Commit-ID: 8m6hPIiUPT
--HG--
extra : rebase_source : 1e8de4d233e15cda3f08f1ca556ea4f82eb6cebe
extra : amend_source : 50a7e80ff09bd6cb1f4033425c136b4552cbda41
2016-12-22 11:28:40 +13:00
Ting-Yu Chou
e551a0b979
Bug 1322465 part 7 - Use explicit/MOZ_IMPLICIT for the unary constructors in media/. r=cpearce,Ehsan
...
MozReview-Commit-ID: Ln63tzmkynd
--HG--
extra : rebase_source : 869cca55da15d2394411571f741d8ed2728c3265
2016-12-16 15:56:40 +08: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
812726afd0
Bug 1308821 - Ensure ClearKey doesn't parse a keyids initdata format session type parameter. r=kikuo
...
The specification doesn't require there to be a 'type' member of
the keyids init data format.
MozReview-Commit-ID: 7mOm7KwyyuC
--HG--
extra : source : c9fb674f3cb8dff4fe8734e0426e67825878015d
2016-10-09 20:42:01 -07: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
Phil Ringnalda
62997f0b4b
Backed out changeset 9b132e52aa0a (bug 1308821) for wpt encrypted-media/clearkey timeouts and unexpected passes
2016-10-26 19:07:49 -07: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
Chris Pearce
b6dbc9a4a9
Bug 1308821 - Ensure ClearKey doesn't parse a keyids initdata format session type parameter. r=kikuo
...
The specification doesn't require there to be a 'type' member of
the keyids init data format.
MozReview-Commit-ID: 7mOm7KwyyuC
--HG--
extra : rebase_source : 88b729ae0b0f851763bbd06ec48bae2d6ac1c47e
2016-10-09 20:42:01 -07: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
Carsten "Tomcat" Book
ec76d557f1
Merge mozilla-central to autoland
2016-10-12 12:07:59 +02:00
James Cheng
ff7e2ab548
Bug 1309171 - Reduce an unnecessary copy by universal reference. r=gerald
...
MozReview-Commit-ID: 6lED8WcGtje
--HG--
extra : rebase_source : e246e607f0a48b7cc12683eac3bc0f37639936dc
2016-10-11 18:07:06 +08:00
Phil Ringnalda
798404cf65
Backed out changeset f47181dc6ad7 (bug 1308424) for unexpectedly passing encrypted-media-update-disallowed-input.html
2016-10-11 19:23:29 -07:00
Kilik Kuo
d3d72c3b63
Bug 1308424- Verify the license response size while updating session. r=cpearce
...
MozReview-Commit-ID: AmyCOutPvWn
--HG--
extra : rebase_source : 8fd1c98ba5039fc55ee3e5ac8b9cfc61f9dee4e2
2016-10-07 18:16:30 +08:00
Chris Pearce
cc1ef8649c
Bug 1308076 - Move PSSH parser gtests into media/psshparser/gtest. r=glandium
...
MozReview-Commit-ID: G760z2sIQpO
--HG--
rename : media/gmp-clearkey/0.1/gtest/TestClearKeyUtils.cpp => media/psshparser/gtest/TestPsshParser.cpp
rename : media/gmp-clearkey/0.1/gtest/moz.build => media/psshparser/gtest/moz.build
extra : source : a409d51e3efa0099344ff4b8ebc414ddb50ce829
2016-10-07 21:34:54 +13:00
Chris Pearce
a00a07e25a
Bug 1308076 - Consistently put expected value where it's expected in EXPECT_EQ() in Pssh Parser gtest. r=jwwang
...
The expected value comes first in the EXPECT_EQ gtest macro. So reorder our
calls to this macro in the Pssh Parser gtests to match that.
This makes it easier to read what's the expected value when the test fails.
MozReview-Commit-ID: LJ4ND2gRPi4
--HG--
extra : source : 34254ffcdb6fe9e053449210556fb2333f7a205a
2016-10-07 21:17:42 +13:00
Chris Pearce
591af22fc7
Bug 1308076 - Fixup PSSH parser gtests. r=jwwang
...
We're now obliged to be stricter, taking from the example of the Web Platform
Tests.
MozReview-Commit-ID: AJNDoRZ9BF8
--HG--
extra : source : 5180fdf042b03362b882ceb3a8ac0e664049bd64
2016-10-07 21:12:18 +13: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
Chris Pearce
8b3c096a18
Bug 1308076 - Don't statically link mfplat.lib into gmp-clearkey. r=glandium
...
We're loading functions from that library dynamically in gmp-clearkey anyway,
we don't need to statically link this.
MozReview-Commit-ID: AKwP5aWLsK3
--HG--
extra : source : 857f21f44316ef8125fedf8db22b5d3191d9c7e9
2016-10-07 11:20:05 +13:00
Chris Pearce
35e13f726f
Bug 1308076 - Move ClearKeyCencParser to PsshParser library. r=glandium
...
To validate the PSSH init data passed to EME, I'd like to reuse the same
PSSH parser that the ClearKey CDM shared library uses. So move the code
out of gmp-clearkey and into its own library, so we can link it statically
into code that needs to use it.
MozReview-Commit-ID: 7xSUSmCueJz
--HG--
rename : media/gmp-clearkey/0.1/ClearKeyCencParser.cpp => media/psshparser/PsshParser.cpp
rename : media/gmp-clearkey/0.1/ClearKeyCencParser.h => media/psshparser/PsshParser.h
extra : source : 78dcbc5d3c26547c63269eb14034a67863cf28de
2016-10-06 20:23:38 +13:00
Sebastian Hengst
2bb0f9b7a2
Backed out changeset 68f1d429368c (bug 1308076)
...
--HG--
rename : media/psshparser/PsshParser.cpp => media/gmp-clearkey/0.1/ClearKeyCencParser.cpp
rename : media/psshparser/PsshParser.h => media/gmp-clearkey/0.1/ClearKeyCencParser.h
2016-10-11 10:41:25 +02:00
Sebastian Hengst
b3064bba8d
Backed out changeset b2ef285116b3 (bug 1308076)
2016-10-11 10:41:20 +02:00
Sebastian Hengst
bd612c1fd3
Backed out changeset 4ce11c2f2e69 (bug 1308076)
2016-10-11 10:41:08 +02:00