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
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