Commit Graph

4480 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
ec76d557f1 Merge mozilla-central to autoland 2016-10-12 12:07:59 +02: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
Munro Mengjue Chiang
0bbb96335e Bug 1308792 - protect the critical section accessing device_info_cs_; r=jesup
MozReview-Commit-ID: GGxtHUPAk6N

--HG--
extra : rebase_source : 335cb7962dbd5e8f2900ca7984c24e327924d9ec
2016-10-11 14:30:28 +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
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
Randell Jesup
d53aa7abf7 Bug 1307433 - WebRTC: implement RFC6051 ("Rapid Synchronisation of RTP Flows") r=pkerr
Actually just the first part of it (sending RTCP at the start of a flow),
not the RTCPFB message
2016-10-11 15:04:39 -04:00
Chris Pearce
c0fc92ff04 Bug 1308076 - Ensure Primetime PSSH boxes pass the PSSH validator. r=jwwang
Primetime PSSH boxes don't use the common encryption system ID.
So to ensure we don't break any existing Primetime players, we
must allow PSSH boxes with the Primetime system ID to pass the
PSSH validator.

MozReview-Commit-ID: 3q58FKLQXgV

--HG--
extra : rebase_source : a7a0ca3d38fb027ad6de23d8260043b3193536f4
extra : source : b94fe60732fb7d3a6630c976284eaabd28b271f3
2016-10-10 23:47:28 -07: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
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
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
67e4cd1c41 Backed out changeset 40ce3fa30dfa (bug 1308076) 2016-10-11 10:41:16 +02:00
Sebastian Hengst
bd612c1fd3 Backed out changeset 4ce11c2f2e69 (bug 1308076) 2016-10-11 10:41:08 +02:00
Sebastian Hengst
8718521d1f Backed out changeset 11fc2627544c (bug 1308076) 2016-10-11 10:41:04 +02:00
Sebastian Hengst
57c3796c20 Backed out changeset 2ce4a30bdf86 (bug 1308076) 2016-10-11 10:41:00 +02:00
Sebastian Hengst
8a98e7cddd Backed out changeset 5862e3ccc989 (bug 1308076) 2016-10-11 10:40:56 +02:00
Sebastian Hengst
1eb3faf861 Backed out changeset 6d16f00b9858 (bug 1308076) 2016-10-11 10:40:52 +02:00
Chris Pearce
e0b2194579 Bug 1308076 - Ensure Primetime PSSH boxes pass the PSSH validator. r=jwwang
Primetime PSSH boxes don't use the common encryption system ID.
So to ensure we don't break any existing Primetime players, we
must allow PSSH boxes with the Primetime system ID to pass the
PSSH validator.

MozReview-Commit-ID: 3q58FKLQXgV

--HG--
extra : rebase_source : aac2a8349d8e9dfccae3c37a47549245fb1fc0e3
2016-10-10 23:47:28 -07:00
Chris Pearce
c18aa7f516 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 : rebase_source : 80fc084137ca84f9263cb056c27f296b8f05111c
2016-10-07 21:34:54 +13:00
Chris Pearce
ba946f19e0 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 : rebase_source : 85ca2dcff57354253b801fbd598c89698c74c2d6
2016-10-07 21:17:42 +13:00
Chris Pearce
2f998b9d61 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 : rebase_source : 79b13d1d7d1b6b6b4a382b6a17af81606af608fa
2016-10-07 21:12:18 +13:00
Chris Pearce
a0900b6998 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 : rebase_source : dfd7fe864be6825a86dfed4f60b448a5edac286f
2016-10-07 11:14:04 +13:00
Chris Pearce
d4606df737 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 : rebase_source : ccf8e217d87dfa85478578f52469dc7383fd6c9b
2016-10-06 23:17:44 +13:00
Chris Pearce
48ecbebd03 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 : rebase_source : 23ab95e7bb2f756ef1df7f97b96ec7da0953533f
2016-10-07 11:20:05 +13:00
Chris Pearce
10c6ab2576 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 : rebase_source : 3f621aa1d99c6a73f6b5f3ca9d1f84022266a833
2016-10-06 20:23:38 +13:00
Ted Mielczarek
fed17ce3e1 bug 1305506 - Remove some cruft from a webrtc gyp file. r=jesup
Things seem to build OK without this, and it's breaking some new code I added in gyp_reader.

MozReview-Commit-ID: 6ccaXZ0mRTj

--HG--
extra : rebase_source : c1e8acb39f863b3ff62492cf70e74748cb74e795
2016-08-16 10:09:03 -04: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
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
Kilik Kuo
4d162fcd4a Bug 1303922 - Part 1: Make EME keystatuschanged information notified in batch. r=cpearce
MozReview-Commit-ID: IeExaQ62qTF

--HG--
extra : transplant_source : t%D4%AFxu%D6%40%F8hU%D2%94%D4q8q%EDy%08-
2016-10-04 17:18:46 +08:00
Kilik Kuo
21f4832a64 Bug 1303662 - Avoid accessing uninitialized member while debugging. r=cpearce
MozReview-Commit-ID: IX4bI9HB8Ub

--HG--
extra : rebase_source : c3d33f757e228788546b234711f3f8e4f51424ce
2016-10-07 18:40:34 +08:00
Dan Minor
a62e23429f Bug 1291715 - Add support for 44100 and 48000 Hz sample rates to DtmfInband; r=jesup
The DtmfInband class does not support sample rates above 32000. This adds
support for 44100 and 48000.

The 'a' coefficients were calculated in python as:

int(round(32768*math.cos(2*math.pi*f/fs)))

The 'ym2' coefficients were calculated in python as:

int(round(16383*math.sin(2*math.pi*f/fs)))

where f was in: [697, 770, 852, 941, 1209, 1336, 1477, 1633] and fs was in:
[8000, 16000, 32000, 44100, 44800].

The calculated values were slightly off the existing values at 8000 Hz,
but agreed at 16000 and 32000 Hz.

MozReview-Commit-ID: GIzyUSyecR4

--HG--
extra : rebase_source : edbde6e8c8b6cfd1c44c808022849c688364745b
2016-09-14 16:07:46 -04:00
Dan Minor
136c79105e Bug 1291715 - Add DTMF support to PeerConnection and AudioConduit; r=jib
MozReview-Commit-ID: LNN1HNJicCj

--HG--
extra : rebase_source : 6b4153e6bddb939a89b58961abcec4b1741a68d3
extra : source : a3521a634b4a5c64d17686662dc3b1aec91f590b
2016-10-06 08:55:43 -04:00
Dan Minor
621afd7f92 Bug 1291715 - Add RTCDTMFSender and RTCDTMFToneChangeEvent to webidl; r=smaug
MozReview-Commit-ID: FvAp6DQex02

--HG--
extra : rebase_source : 1b8102930efba0fb0da855b02effd106370a1b8b
2016-09-14 08:53:23 -04:00
Carsten "Tomcat" Book
7c8e81673d merge mozilla-inbound to mozilla-central a=merge 2016-10-06 11:59:54 +02:00
Jean-Yves Avenard
4a7fd611df Bug 1301869: P1. Only add SPS/PPS on the first keyframe. r=cpearce
When we add SPS/PPS NAL in front of each keyframe data, this somehow makes the WMF decoder to misbehave and to always return an invalid timestamp.

MozReview-Commit-ID: 2SzTiwP0ii1

--HG--
extra : rebase_source : b499c83d504df772e6d722053630ff4d92306d4f
2016-10-06 11:38:52 +11:00
Randell Jesup
2f628de7ca Bug 1307254: Implement ::Stop() for screen/window/app capture r=jib 2016-10-05 16:15:19 -04:00
Paul Adenot
d31503d9d3 Bug 1307724 - Cherry-pick cubeb revision 50d92c. r=kinetik
MozReview-Commit-ID: 2ibCLal3BVD

--HG--
extra : rebase_source : 42dbab3510abdb390c6287df95721a17be7a1e4d
2016-10-05 12:20:06 +02:00
Randell Jesup
bfeb950383 Bug 1307507: ensure that resolution is retained on multiple replaceTrack/renegotiations r=bwc 2016-10-04 13:13:01 -04:00
Tom Schuster
774a8bf34d Bug 1302163 - Change code to use SprintfLiteral instead of snprintf. r=ehsan 2016-10-04 17:57:51 +02:00
Mark Banner
c4565f5765 Bug 1306631 - Remove old Loop telemetry hooks from WebRTC code. r=jesup
MozReview-Commit-ID: 1ctKZPDVEha

--HG--
extra : rebase_source : 530df82d85d87dd605289b8af8ce372ba6cd4ed9
2016-09-23 16:55:48 +01:00
Sebastian Hengst
7520674246 Backed out changeset 903fa45a9d6c (bug 1291715) for build bustage. r=backout 2016-10-05 17:03:06 +02:00
Sebastian Hengst
8e6bfb5804 Backed out changeset 5505acbab659 (bug 1291715) 2016-10-05 17:02:57 +02:00