Commit Graph

335 Commits

Author SHA1 Message Date
Masatoshi Kimura
9865b2fdeb Bug 1369020 - Remove nsContentUtils::ConvertStringFromEncoding and nsContentUtils::CheckForBOM. r=hsivonen
MozReview-Commit-ID: E0w8BsP1Rof

--HG--
extra : rebase_source : db95e1e7fc60c9b9c8e6d7fcc5329421ec97e811
2017-06-16 21:11:03 +09:00
Chris Pearce
08c74f252e Bug 1368596 - Add telemetry to track how often deprecated configs are passed to navigator.requestMediaKeySystemAccess(). r=gerald,r=francois
MozReview-Commit-ID: IQ6zRRb31Vc

--HG--
extra : rebase_source : 80b86b74405779015311c31444e54506f39df1e2
extra : source : 24008e376cff0d7b6b94900001c71b596179a7c3
2017-05-30 21:34:55 +12:00
Chris Pearce
29420a59c0 Bug 1368583 - Add deprecation warning for MediaKeySystemConfiguration properties no longer supported by the EME spec. r=gerald
As per Bug 1355252, the EME spec requires our
navigator.requestMediaKeySystemAccess() function to reject request for
configurations which don't contain at least one MediaKeySystemCapabilities
(audioCapabilities or videoCapabilities).

That's step 15 of this algorithm:
https://w3c.github.io/encrypted-media/#get-supported-configuration-and-consent

We also shouldn't be assuming that WebM and MP4 normatively imply a specific
set of codecs and codec constraints, as that violates step 10 of the "Get
Supported Capabilities for Audio/Video Type" algorithm.

https://w3c.github.io/encrypted-media/#get-supported-capabilities-for-audio-video-type

Making this change has the effect of causing us to reject configurations with
MediaKeySystemCapabilities where those capabilities don't specify a codec
string.

This patch adds a deprecation warning to encourage authors to make their sites
spec compliant.

MozReview-Commit-ID: 6kM9LATDfy6

--HG--
extra : rebase_source : 96763bd49cbebb81ac565a8862cb0ad97838181f
extra : source : 9df49a410082d68041377dabbbebfb458a580041
2017-05-30 21:33:03 +12:00
Carsten "Tomcat" Book
b318c7dca7 merge mozilla-inbound to mozilla-central + UPGRADE_NSS_RELEASE a=merge
--HG--
rename : toolkit/components/extensions/test/xpcshell/xpcshell.ini => toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
extra : amend_source : 458fd54fe8070ca3034ac441267ff7025adb5251
2017-05-30 11:37:46 +02:00
Chris Pearce
b7b2dab14d Bug 1355252 - Backed out changeset c19d32e2a710. r=backout
MozReview-Commit-ID: 7pTa64IsIq2

--HG--
extra : rebase_source : 27ec010599614d1402e9621149cb953464ec7603
2017-05-30 10:34:13 +12:00
Chris Pearce
1a44af43a6 Bug 1355252 - Backed out changeset ddb3969de046. r=backout
MozReview-Commit-ID: cdH0WSFOaz

--HG--
extra : rebase_source : 3b1eebcf7323cbcc037d1a2e0d92a923f217d811
2017-05-30 10:33:30 +12:00
Chris Pearce
7442ac32b0 Bug 1334111 - Log MediaKeySystemConfiguration on creation of MediaKeySystemAccess. r=gerald
This makes it easier to tell what's going on; whether we've created a
MediaKeySystemConfiguration which can persist state.

MozReview-Commit-ID: L4dbmMVYhsM

--HG--
extra : rebase_source : e47e60f5091b6b5477b2c8bd63ba408922706082
2017-05-29 11:02:15 +12:00
Chris Pearce
098502268f Bug 1334111 - Move MediaKeySystemConfig to-string helper to MediaKeySystemAccess. r=gerald
This will enable us to re-use the logging code in MediaKeySystemAccess to log
the configuration we end up instantiating the MediaKeySystemAccess with.


MozReview-Commit-ID: AMnauhMLJ1R

--HG--
extra : rebase_source : a2dfeb7b263108ac1c60bfe2f47755e0a73d6324
2017-05-29 10:34:38 +12:00
Chris Pearce
7bcd5db48e Bug 1334111 - Reject MediaKeys requests for persistent storage when in PB mode. r=gerald
We want requests for MediaKeySystemAccess with persistentState to be rejected
if the window is in Private Browsing mode. This is primarily so that users in
Private Browsing mode don't unknowningly use up their "device limits"; some DRM
streamers have limits on the numbers of unique devices that can be
provisioned/used in a given time period, and the device ID is persisted in the
persistent state. So if we're flushing that state, the user will use up one of
their device quota on every new session, and quickly hit their limit, and be
unable to continue watching DRM video.

MozReview-Commit-ID: JWNO1kcU2ST

--HG--
extra : rebase_source : ad4e22629acfdd82aff8ead764949939726adbf4
2017-05-29 10:21:18 +12:00
Chris Pearce
61c23b5287 Bug 1355252 - Reject navigator.requestMediaKeySystemAccess if no MediaCapabilities supplied. r=jwwang
As required by step 15 of EME's Get Supported Configuration and Consent algorithm,
https://www.w3.org/TR/encrypted-media/#get-supported-configuration-and-consent

MozReview-Commit-ID: 8c24VrmygBx

--HG--
extra : rebase_source : cccb8c05cefc06396683317f3827885f6b91ba0e
2017-05-17 17:10:14 +12:00
Chris Pearce
5064845788 Bug 1355252 - Don't assume default codecs for MP4 and WebM in EME MediaCapabilities r=jwwang
Step 10 of EME's "Get Supported Capabilities for Audio/Video Type" algorithm
says we can assume default codecs only if a container normatively implies a
specific set of codec and codec constraints. Our code assumes that WebM implies
Vorbis/VP8 and MP4 implies AAC/H.264, but those aren't actually normatively
required by either of these containers' specifications. So we shouldn't assume
these containers imply those codecs.

MozReview-Commit-ID: G9TDOmrjhpp

--HG--
extra : rebase_source : 2f040d76c8cb240359401fe1dc1e3eefa029d77b
2017-05-11 14:23:33 +12:00
Kris Maglione
b588cdc5bb Bug 1361900: Part 1 - Make CDMProxy.h compatible with mozilla::Result. r=JamesCheng
MozReview-Commit-ID: DiO7IPFYKbE

--HG--
extra : rebase_source : 500e32854c50e2381fd9de3a3533611be1426329
extra : source : 9e3064aec4bb16542f9cc93a89f7a257b6716a98
2017-05-12 12:08:43 -07:00
Sebastian Hengst
7b52c82b67 Backed out changeset 9e3064aec4bb (bug 1361900) for crashing Marionette's test_timeouts.py TestTimeouts.test_reset_timeout on Linux debug with e10s. r=backout 2017-05-13 18:56:06 +02:00
Kris Maglione
49ed37ac3d Bug 1361900: Part 1 - Make CDMProxy.h compatible with mozilla::Result. r=JamesCheng
MozReview-Commit-ID: DiO7IPFYKbE

--HG--
extra : rebase_source : defeef269706ba81ee35272818e468e3ae0b2b19
2017-05-12 12:08:43 -07:00
Chris Pearce
59c8ad9b72 Bug 1363605 - Widevine should support SW_SECURE_CRYPTO video robustness. r=gerald
Turns out that Chrome treats the robustness values as SW_SECURE_DECODE to mean
that SW_SECURE_CRYPTO is also supported. So we'd better follow suit...


MozReview-Commit-ID: 6J68IsSQhyL

--HG--
extra : rebase_source : 08baf83f0812f52670f1643e7e86ced0a0972f64
2017-05-10 16:00:21 +12:00
Chris Pearce
e156a08c17 Bug 1315850 - Rename DetailedPromise Status enum. r=gerald
X11.h #defines 'Status' and 'Failed' and 'Succeeded' which conflicts with
the enum in DetailedPromise. So rename the 'Status' enum in DetailedPromise
so that the build works on Linux.

Some of my changes here caused DetailedPromise to be included in more
places that it was before, which caused build failures on Linux.

MozReview-Commit-ID: KV5xKixXR3J

--HG--
extra : rebase_source : ef6cab901d74b78f613660f263f5e453d6044536
2017-03-13 10:42:36 +13:00
Chris Pearce
caac622c6d Bug 1315850 - Implement CDM persistent sessions. r=gerald
This is required for the browser clearing persistence tests to pass.

MozReview-Commit-ID: Ai9qc6Ds1IG

--HG--
extra : rebase_source : 80c2133e26742410fda983e3c18c35736fc013d0
2017-03-09 19:09:43 +13:00
Chris Pearce
c60d6c1294 Bug 1315850 - Add CDMProxy::AsChromiumCDMProxy(). r=gerald
This means the EME PDM implementation can safely tell when a CDMProxy is a
ChromiumCDMProxy, so we can create an appropriate MediaDataDecoder for it (in
the next patch).

MozReview-Commit-ID: CpL6QRa7SwJ

--HG--
extra : rebase_source : 3821c378c73067066f3cc67499680bdf546fb4f0
2016-12-15 11:32:03 +13:00
Chris Pearce
1d0fde26c0 Bug 1315850 - Ensure we query for the correct string in HavePluginForKeySystem. r=gerald
Otherwise navigator.requestMediaKeySystemAccess() doesn't know whether we have
a CDM or not.

MozReview-Commit-ID: Hic6UneGA4u

--HG--
extra : rebase_source : 68ce766bede0f5c8e41de3a3f9e46b6ef88cab96
2017-02-22 13:06:58 +13:00
Chris Pearce
a619213252 Bug 1315850 - Create ChromiumCDMProxy in MediaKeys.cpp when preffed on. r=gerald
MozReview-Commit-ID: G37QlP74esb

--HG--
extra : rebase_source : 76937006b9e424f2588e7d06f8f7b0c3a68b5af2
2017-02-22 14:42:55 +13:00
JW Wang
3be61ebd8d Bug 1345753 - Pass the event target to the CDMProxy constructor. r=cpearce
MozReview-Commit-ID: 94QzJ5FnGDo

--HG--
extra : rebase_source : b863f95c7906327f00eb8e08dd5b7f37a3b3cc6c
extra : source : 6e6242c50af23128b23d3b955a081481cec0b6e2
2017-03-09 14:58:18 +08:00
Chris Pearce
825ed9ed70 Bug 1345680 - Use ToString(MediaKeySessionType) in EME code. r=jwwang
MozReview-Commit-ID: 5MK7j7THKgW

--HG--
extra : rebase_source : c9e456d7b30475e6a204f2f9b0f6762a0e74890b
2017-03-09 12:35:33 +13:00
Chris Pearce
2edfe89f04 Bug 1345680 - Add ToString(MediaKeySessionType) functions. r=jwwang
MozReview-Commit-ID: 68aAdTYqCon

--HG--
extra : rebase_source : a733a46e5dac671c996ab5bf57fa2a27c364b40e
2017-03-09 12:19:58 +13:00
karo
85319b4cd0 Bug 1344073 - Adding consistent formatting to HTMLMediaElement::MozRequestDebugInfo debugInfo dump string. r=cpearce
MozReview-Commit-ID: GfRrLQcebbt

--HG--
extra : rebase_source : 846b74c63528f58e414636654b0167d6c8c1480b
2017-03-01 16:03:01 +13:00
JW Wang
2df35d6eb8 Bug 1345324 - Label runnables for CDMProxy sub-classes. r=cpearce
MozReview-Commit-ID: Fpf29Kctmxs

--HG--
extra : rebase_source : 24612112d4b474812e5fdcd2e14cd3679715c098
extra : source : f5d085c3221ec54785f9c98a5fd0eda78d446641
2017-03-07 15:32:10 +08:00
Daniel Holbert
95a650ec1b Bug 1343975: Get rid of all dos/windows linebreaks in Mozilla C++ code. r=ehsan
This is an automated patch, generated by the following command:
find . -name "*.h" -exec fromdos {} \; && \
  find . -name "*.cpp" -exec fromdos {} \; && \
  hg revert -C gfx/angle \
               gfx/sfntly \
               media/webrtc \
               media/libstagefright \
               media/openmax_il \
               other-licenses

MozReview-Commit-ID: Gunlz3vE3h6
2017-03-02 13:08:29 -08:00
karo
3c2b014e09 Bug 1343409 - HTMLMediaElement::MozRequestDebugInfo returns EMEInfo. r=cpearce
MozReview-Commit-ID: 1iQP3OJmwdP

--HG--
extra : rebase_source : 171155ab5e58cac8cc9db9109a5c2fc88b1930d3
2017-03-01 12:56:29 +13:00
Chris Pearce
fefb089d1f Bug 1341475 - Ensure clearkey doesn't think it can decode AAC on Windows. r=gerald
Because it can't now.

MozReview-Commit-ID: JCO4zUGaryY

--HG--
extra : rebase_source : b3c1ec5cd2b246a85ca3d44f5436252803b76e32
2017-02-22 13:04:17 +13:00
Wes Kocher
8c4ce17711 Merge inbound to m-c a=merge
MozReview-Commit-ID: DCUf7VEDrTt
2017-02-17 13:38:51 -08:00
Vedant Sareen
7d4bd52fae Bug 1330907 - Rename Telemetry::ID to Telemetry::HistogramID. r=dexter
Changed |print("enum ID : uint32_t {", file=output)| to |print("enum HistogramID : uint32_t {", file=output)| at line 53 of the file |toolkit/components/telemetry/gen-histogram-enum.py|, and then replaced all the textual occurrences of |Telemetry::ID| to |Telemetry::HistogramID| and |ID| to |HistogramID| in 43 other files.
2017-02-16 00:45:15 +05:30
Tom Tromey
d2667a2b27 Bug 1060419 - make AppendPrintf and nsPrintfCString use Printf.h, r=froydnj
MozReview-Commit-ID: 2E8FoiNxU8L

--HG--
extra : rebase_source : 810ac727bef0751f24edea18c52e0ec170bf367d
2016-12-14 09:32:21 -07:00
Tom Tromey
5f8f360823 Bug 1060419 - make log_print use Printf.h, r=froydnj
MozReview-Commit-ID: BIZ1GQEZ1vs

--HG--
extra : rebase_source : 2f1f0aa12493c44f352d9a7e8683e7bb72d2d75b
2016-12-15 20:16:31 -07:00
Jean-Yves Avenard
b1c337cb35 Bug 1340096: Remove MediaCodecDataDecoder. r=bwu,jolin
We prefer the RemoteDataDecoder instead.

MozReview-Commit-ID: SK0D3hycRh

--HG--
extra : rebase_source : 97899154bf5fcbcd2feb44ac82879a79eabb44f7
2017-02-16 12:26:53 +01:00
Chris Pearce
cb48e7686c Bug 1339755 - Move GMPCDMProxy::DecryptJob out of GMPCDMProxy. r=jwwang
This means it can be used in other CDMProxies, specifically the
upcoming Chromium CDM code in bug 1315850.

MozReview-Commit-ID: G26xclqhtSw

--HG--
extra : rebase_source : 041c2cb41ba444e0dea8de3ddcc6a119d480f4f7
extra : source : c7f66edac83a6662d99f59a48f70c539f8ccecc8
2016-12-01 10:57:58 +13:00
Wes Kocher
5b67cbcee7 Backed out 2 changesets (bug 1339755) for build bustage a=backout
Backed out changeset f3629503d405 (bug 1339755)
Backed out changeset 85641936e471 (bug 1339755)

MozReview-Commit-ID: LiZfM9OcO5s
2017-02-15 11:57:38 -08:00
Chris Pearce
ef8e49b7e5 Bug 1339755 - Move GMPCDMProxy::DecryptJob out of GMPCDMProxy. r=jwwang
This means it can be used in other CDMProxies, specifically the
upcoming Chromium CDM code in bug 1315850.

MozReview-Commit-ID: G26xclqhtSw

--HG--
extra : rebase_source : c4c99063f7423b8cbbd49865d2d45eca32c254ce
extra : source : c7f66edac83a6662d99f59a48f70c539f8ccecc8
2016-12-01 10:57:58 +13:00
Chris Pearce
d050e8d591 Bug 1338064 - Enable VP9 in MP4 for EME in Nightly. r=gerald
MozReview-Commit-ID: Deggrc038Va

--HG--
extra : rebase_source : cebfafbfec26bc0c756b85c9cde214455979f374
2017-02-09 20:09:39 +13:00
Jay Harris
e247a308ba Bug 1335555 - Removes a call to telemetry that is no longer needed r=cpearce
MozReview-Commit-ID: Fmi29mNFBL4

--HG--
extra : rebase_source : 257dc20cdac0d4c6b54ca934e03fcdc07d1b2898
2017-02-01 14:15:15 +13:00
Jay Harris
076ff58095 Bug 1335555 - Begins removing MediaKeySession.keySystem r=cpearce,smaug
MozReview-Commit-ID: fCrVx8Xd90

--HG--
extra : rebase_source : 69429ca0d6a781f4462bac68145e1341fc31ae6f
2017-02-01 13:36:56 +13:00
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