Commit Graph

8377 Commits

Author SHA1 Message Date
Ehsan Akhgari
9de6bbbaec Bug 1261019 - Part 3: Remove Navigator.mozApps and code depending on it; r=myk,jryans,fabrice,mcmanus,peterv 2016-10-13 13:18:41 -04:00
Sotaro Ikeda
39fa68003d Bug 1309802 - Supress warning r=jya 2016-10-13 06:10:31 -07:00
Carsten "Tomcat" Book
85979d0405 Merge mozilla-central to mozilla-inbound 2016-10-13 11:58:40 +02:00
Jean-Yves Avenard
393d5d4fe1 Bug 1305876: P3. Make function members const. r=gerald
MozReview-Commit-ID: 6R9Y9ofjKp8
2016-10-13 18:59:17 +11:00
Jean-Yves Avenard
eb41ff60cb Bug 1305876: P2. Do not modify internal data when calculating buffered ranges. r=gerald
MozReview-Commit-ID: 29WJozhIrEP
2016-10-13 18:59:17 +11:00
Jean-Yves Avenard
b835f66b3a Bug 1305876: P1. Add diagnostic assert to more easily identify issue. r=gerald
MozReview-Commit-ID: BJhHLHRhnQw
2016-10-13 18:59:17 +11:00
JW Wang
d30c88bef8 Bug 1309111 - Some macros are not expanded correctly by MSVC. r=gerald
MozReview-Commit-ID: BGJXOgslSt8

--HG--
extra : rebase_source : a62efe2e0653f009a7010e5c95dcbb09bed2213b
extra : source : f8a392e8034e1ca216aaf7084f860b0a03e021eb
2016-10-11 13:28:56 +08:00
JW Wang
dd4edf6409 Bug 1307725. Part 8 - move DonePrerolling{Audio,Video} into DecodingState. r=kikuo
MozReview-Commit-ID: I173Qo7hH9X

--HG--
extra : rebase_source : 5d23e1c4599953644098b852cc6e413b554cc9ee
extra : source : c6f967679de1d4c6595de0bd8f27add588af5a6d
2016-10-05 17:40:01 +08:00
JW Wang
2484a7a911 Bug 1307725. Part 7 - move mIsPrerolling into DecodingState. r=kikuo
MozReview-Commit-ID: kHNnGepY53

--HG--
extra : rebase_source : 9f826ff50bfa6c8f282e18bd90d658dac64082c5
extra : source : ae8c423b9095e9ff71b9854bb865451f54e9c949
2016-10-05 17:30:38 +08:00
JW Wang
315755870d Bug 1307725. Part 6 - move mIsPrerolling out of MDSM::DumpDebugInfo(). r=kikuo
MozReview-Commit-ID: 3BkJIRcW5oV

--HG--
extra : rebase_source : 88a3ad0826af41564543811de1e0adfd072c2d69
extra : source : ba8d9d4ef2058de81aaeb9e6ce661d50cd90af43
2016-10-05 17:28:13 +08:00
JW Wang
8d17e94aef Bug 1307725. Part 5 - move the check of mIsPrerolling out of MaybeStartPlayback(). r=kikuo
Note CompletedState doesn't need to check this flag because prerolling should be done when entering the COMPLETED state.

MozReview-Commit-ID: 4Z7mFYf7wdR

--HG--
extra : rebase_source : fba2f8dfb7544225531e8b816154205d42cf9784
extra : source : 3335ed64b39859a2211017a5794ff46da2ce605c
2016-10-05 17:21:47 +08:00
JW Wang
6281d1257d Bug 1307725. Part 4 - move MaybeStopPrerolling() into DecodingState. r=kikuo
MozReview-Commit-ID: JiedugPhOMU

--HG--
extra : rebase_source : ec9f7e8c9d1291c64a2353ce9e00bf0cb5758c59
extra : source : 3e4313fc7b0f31f84faa64008103e9cc3b378f13
2016-10-05 17:15:27 +08:00
JW Wang
e32e3565ca Bug 1307725. Part 3 - add StateObject::HandleWaitingForData to handle NS_ERROR_DOM_MEDIA_WAITING_FOR_DATA. r=kikuo
MozReview-Commit-ID: 9SO9cwVMQK7

--HG--
extra : rebase_source : 098fe3aa4caa0b6f8f5a678a5cb220c8adfe3bbc
extra : source : 9677486f5f15509c721f2b496e1a7f6cc7b9a0bf
2016-10-05 17:11:41 +08:00
JW Wang
7b87fa2df9 Bug 1307725. Part 2 - handle prerolling in DecodingState::HandleEndOfStream() and move it to the public section. r=kikuo
MozReview-Commit-ID: DMlLV8KLXvQ

--HG--
extra : rebase_source : ece3213b5c2c1179bb1ec7bacb6fc7989a5702bb
extra : source : 871ad4af55ba397aa71508e404753c4057924f93
2016-10-05 17:07:55 +08:00
JW Wang
19ec826989 Bug 1307725. Part 1 - add StateObject::HandleAudioCaptured() to handle audio capture. r=kikuo
MozReview-Commit-ID: JoBQSte4MML

--HG--
extra : rebase_source : 93797079202f53f3bf6ade898ec0177e274e09d2
extra : source : a9a8e198d82df3c1d95d8e5ba67a4096028c77a7
2016-10-05 17:03:08 +08:00
JW Wang
b387fd9352 Bug 1308603 - add some assertions to debug crash. r=kaku
MozReview-Commit-ID: DpWRbgwIzla

--HG--
extra : rebase_source : 07e54af87c5d9f13cdf05dad8d3e112bc2dc08cc
extra : source : 7761cbb3e9aae1756bc4cbc2acc6452c7e3d40a2
2016-10-11 11:11:42 +08:00
Jan-Ivar Bruaroey
cfc1a09d64 Bug 1308605 - Fail with OverconstrainedError on bad constraint. r=jesup
MozReview-Commit-ID: JJ1Y3G5b1wl

--HG--
extra : rebase_source : 0ac85ff7c2438aef4ea9e6230fb3816148993fb6
2016-10-12 17:31:20 -04:00
Andreas Pehrson
4c1c6df40c Bug 1284577 - Always insert the debug canvas first for visibility in screenshots. r=padenot
MozReview-Commit-ID: KxJLRDfzczz

--HG--
extra : rebase_source : 5f0a0315ebb6ccdea38b7650b1246920a94f7cab
2016-09-29 10:37:04 +02:00
JW Wang
b68b2a7505 Bug 1308078. Part 2 - no need to store mQueuedSeek in WaitForCDMState::HandleDormant. r=kaku
Because we haven't decoded any data and are at position 0, there is no need to seek when exiting the dormant state.

MozReview-Commit-ID: AKAcqW3HfRN

--HG--
extra : rebase_source : 45056ef8a67a2869b90ea3b1ab842bfca310b9aa
extra : source : 2dc17c8ca765eee1d05956b087804bb760af0e48
2016-10-06 15:11:45 +08:00
JW Wang
5e39aa3292 Bug 1308078. Part 1 - Don't decode metadata again when exiting the dormant state. r=kaku
MozReview-Commit-ID: JBzxcePE8F8

--HG--
extra : rebase_source : 8bc1c642a66adec57b38741132d5005f40e46cbd
extra : source : 55ef6ec6353b69cdc88240ce4c953a61054816df
2016-10-06 14:57:29 +08:00
JW Wang
cfcd2ba433 Bug 1308071. Part 3 - early return from VisibilityChanged() if mInfo is nothing. r=kaku
VisibilityChanged() could be called before reading metadata.

MozReview-Commit-ID: F3OIiC4mXo3

--HG--
extra : rebase_source : 2ce037b5bbdd4a8e58a59c1efe1026339b492644
extra : source : bcc536974529f4e3330e297b2f8b10c0f9fc92c2
2016-10-06 11:28:01 +08:00
JW Wang
494375d074 Bug 1308071. Part 2 - remove unused members. r=kaku
MozReview-Commit-ID: J3OHVA3VeXA

--HG--
extra : rebase_source : b33a2cb596dc87d7c5ee3a1a4747238398514ce2
extra : source : f4b8a7ed803ba43babe13f2d84ef9271fedb1d60
2016-10-06 11:26:29 +08:00
JW Wang
ecb238d94b Bug 1308071. Part 1 - Change the type of MDSM::mInfo to Maybe<MediaInfo>. r=kaku
MozReview-Commit-ID: 4rJfO1w9jYr

--HG--
extra : rebase_source : 48370e5fb9ebadc4bd70849222f93bb7fee2be21
extra : source : 8403aecdd90d12f00801a9cbf1d55f206a190894
2016-10-06 11:25:24 +08:00
Carsten "Tomcat" Book
2844380bd4 merge mozilla-inbound to mozilla-central a=merge
--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
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
2016-10-12 12:01:48 +02:00
Carsten "Tomcat" Book
f21768dc9c Backed out changeset aa789d732c6c (bug 1309299) for wpt-4 test failures on own test 2016-10-12 08:49:30 +02:00
Chris Pearce
b34a32e0bb Bug 1309299 - make navigator.requestMediaKeySystemAccess() reject with TypeError for empty keysystem string or config. r=gerald
This makes us match the spec and pass more cases of
http://www.w3c-test.org/encrypted-media/drm-mp4-syntax-mediakeysystemaccess.html
but we still need to adjust the test so that it's consistent, as pointed out
by bz.

MozReview-Commit-ID: KEfRk4QnJKR

--HG--
extra : source : a54ae0c94eefcf30270abad6463ed0becd0331db
2016-10-11 10:37:34 -07:00
Sotaro Ikeda
1d3ceeff04 Bug 1306521 - Handle VP9 colorspace BT.709 on BasicCompositor r=nical,jwwang,jya,jrmuizel 2016-10-11 19:46:28 -07:00
Jean-Yves Avenard
02a3f88827 Bug 1285883: Limit how many frames we will parse to detect HE-AAC. r=kamidphish
MozReview-Commit-ID: JJEGomJZLio

--HG--
extra : rebase_source : d9b1f1770f3e2a345cc3709ee33efddd00e115f6
2016-10-07 13:49:42 +11:00
Wes Kocher
ccdd87c2f4 Backed out changeset 8559d0b32326 (bug 1309299) for causing a wpt test to fail a=backout CLOSED TREE 2016-10-11 16:49:55 -07:00
Chris Pearce
2f576c0089 Bug 1309299 - make navigator.requestMediaKeySystemAccess() reject with TypeError for empty keysystem string or config. r=gerald
This makes us match the spec and pass more cases of
http://www.w3c-test.org/encrypted-media/drm-mp4-syntax-mediakeysystemaccess.html
but we still need to adjust the test so that it's consistent, as pointed out
by bz.

MozReview-Commit-ID: KEfRk4QnJKR

--HG--
extra : rebase_source : feba0407aa8742b58b8f976bf31a494ea65c5319
2016-10-11 10:37:34 -07:00
Bryce Van Dyk
0b2ecfd134 Bug 1309035 - Addresses insufficient fix from Bug 1307016 by converting to unicode before ascii. r=maja_zf
Bug 1307016 attempted to address issues with output not being ascii and thus
being incompatible with terminals on test machines. However my changes in that
bug introduced two issues:
- They introduced a bug where field names were being read from an incorrect
  source.
- They attempted to construct a string internally then converted that string to
  ascii replacing non-ascii chars. This is an issue as in python 2 strings are
  implicitly ascii, so the initial conversion to a string would fail if the
  underlying object couldn't be represented as ascii.

Both of these issues are addressed here. The first by fixing the bad source in
the code, the second by converting to unicode for the intermediate
representation.

MozReview-Commit-ID: HC6Fd9TLRe2

--HG--
extra : rebase_source : bb7493b9074baa0273fb4110465f8bd13477f1d6
2016-10-11 10:02:16 +13:00
Andreas Pehrson
0a4fb06422 Bug 1305601 - Increase test_gUM_mediaElementCapture_tracks.html timeouts to 50 seconds. r=jib
MozReview-Commit-ID: 1wY3Y3MxPGA

--HG--
extra : rebase_source : baf14a09ffc0cb6767199beddee8136b01376e86
2016-10-11 17:22:26 +02:00
Randell Jesup
07c0f87e39 Bug 1306940: Use a pref to disable system-load monitoring in webrtc calls r=pkerr 2016-10-11 15:40:06 -04:00
Chris Pearce
ef74aeb8a8 Bug 1308076 - Use PsshParser to validate CENC init data. r=jwwang
Now that we can link gmp-clearkey's PSSH parser into Gecko, we can
simply use that inside MediaKeySession to validate that the CENC
init data matches the spec.

This change enforces that CENC init data uses the common system Id.
As far as I can tell, Widevine only uses that now.

MozReview-Commit-ID: HrlKQHcv5DI

--HG--
extra : source : f61138f1030e87026eb432e83d36e46c81e55b33
2016-10-06 23:17:44 +13:00
Chris Pearce
a52e1adba5 Bug 1308076 - Validate keyids json format. r=smaug
Use a WebIDL dict to define the "keyids" EME init data format, and
then use that to parse and validate incomint "keyids" EME init data
and ensure it's in the expected JSON format, i.e.:

https://w3c.github.io/encrypted-media/format-registry/initdata/keyids.html

This means we now pass the "generateRequest() with too short key ID."
case of encrypted-media-generate-request-disallowed-input.html
(upstream that is, our local copy of that WPT is out of sync).


MozReview-Commit-ID: 6W7j2a9Bg7E

--HG--
extra : source : fed2a26df89a5c2a600a6e6d1ab63ab86706fc45
2016-10-06 17:57:08 +13:00
Chris Pearce
1678efebbf Bug 1308076 - Basic validation of EME initData. r=jwwang
Implement more of MediaKeySession.generateRequest() to validate initData before
passing to CDM.

Also throw TypeErrors when initData is not valid, as per the spec.

Only trivial validation happens here, I'll add more comprehensive validation in
subsequent patches.

MozReview-Commit-ID: 3jTOsJNvRDo

--HG--
extra : source : d023aec75d1ef1486116510efcc31e2b587e6e50
2016-10-06 17:54:36 +13:00
Jesse Ruderman
8fceb4880e crashtest for bug 1223670 r=karlt
--HG--
extra : transplant_source : %B3%E7%87%DE%A5%E3%94%20%C9K%10%B9%CA%2B%00%A9%60%28.%CF
2015-12-04 12:42:20 +13:00
Phil Ringnalda
080c63d412 Merge m-i to m-c, a=merge
MozReview-Commit-ID: 6YHoSP3exdY
2016-10-08 16:48:33 -07:00
Sebastian Hengst
cdcc9e20da Bug 1304829 - rename RELEASE_BUILD to RELEASE_OR_BETA: main part. r=ted,Mossop
MozReview-Commit-ID: 1lCt0xTMV5O
2016-10-08 11:14:49 +02:00
Jan-Ivar Bruaroey
6668691c20 Bug 1304597 - Remove hardcoded capabilities on OSX that are no longer used r=jesup
MozReview-Commit-ID: 4vENDI1Q9U1
2016-10-07 11:35:07 -04:00
Gerald Squelart
0e173b53b1 Bug 1176218 - p13. Reject Resolutions that are too big for Windows' decoder - r=jya
The WMFDecoderModule can override Supports(TrackInfo) to reject resolutions
that we know are too big for the platform decoder.

MozReview-Commit-ID: dU905wjZcJ

--HG--
extra : rebase_source : 40e5987deeffff652a88264f157391c0dbc0a2da
2016-10-07 15:51:34 +11:00
Gerald Squelart
413e411d7c Bug 1176218 - p12. Use new PDM's Supports(Trackinfo) in MP4Decoder - r=jya
MP4Decoder can translate the new MediaContentType into the relevant TrackInfo
to interrogate PDMs about codec support, with extra information if present.

MozReview-Commit-ID: K0jcYm8pJrp

--HG--
extra : rebase_source : e809824285a85035b81ad7f91406bce6393384f6
2016-10-07 15:51:22 +11:00
Gerald Squelart
a583c59045 Bug 1176218 - p11. PDM's Supports(TrackInfo) - r=jya
Add a new method alongside SupportsMimeType, which takes a TrackInfo that may
contain more information that just the MIME type.

Eventually the old SupportsMimeType should be removed, but we keep it for now,
as it is used quite extensively and it would be out of scope of this bug to
totally replace it now.

MozReview-Commit-ID: LJQBvSUB6J2

--HG--
extra : rebase_source : 6f43bf61dc6e51de3714c9a556428c7ba4fd484d
2016-10-07 15:30:30 +11:00
Gerald Squelart
c1e9d969fe Bug 1176218 - p10. VideoUtils' CreateTrackInfo*() - r=jya
Create a TrackInfo (VideoInfo or AudioInfo) from a codec MIME type, and
optionally with extra parameters from a MediaContentType.

MozReview-Commit-ID: JfDMQjVgCNT

--HG--
extra : rebase_source : 10eb8f14ce28a74883752c536b2312658bc0cb4d
2016-10-07 17:39:32 +11:00
Gerald Squelart
700d804c16 Bug 1176218 - p9. Pass MediaContentType to MP4Decoder::CanHandleMediaType - r=jya
Just passing the new MediaContentType struct, with no processing changes (yet).

MozReview-Commit-ID: KZ4xkCihPb1

--HG--
extra : rebase_source : e40eb72cc63e0a814306c25ea9b609178517729e
2016-10-01 18:10:18 +10:00
Gerald Squelart
9aaeb961ad Bug 1176218 - p8. Use MediaContentType in DecoderTraits - r=jya
MozReview-Commit-ID: G0Blu5qOpwD

--HG--
extra : rebase_source : dc9a771d1e7b84828903d7d3e72732d8c66752ca
2016-10-01 18:09:50 +10:00
Ryan VanderMeulen
38574eeac5 Merge m-c to inbound. a=merge 2016-10-07 09:44:29 -04:00
Ryan VanderMeulen
7ebb50e21d Merge inbound to m-c. a=merge 2016-10-07 09:42:25 -04:00
Phil Ringnalda
c21623fc42 Merge m-c to m-i
MozReview-Commit-ID: Kp60wHZauGi
2016-10-06 20:26:20 -07:00
Phil Ringnalda
fd7b7476c2 Merge m-i to m-c, a=merge
MozReview-Commit-ID: 93ZdJbK1x05
2016-10-06 19:58:18 -07:00