Commit Graph

4258 Commits

Author SHA1 Message Date
Wes Kocher
e9097643d5 Merge inbound to central, a=merge 2016-08-12 13:44:29 -07:00
Glenn Randers-Pehrson
f072d9f55e Bug 1276127 - Add SSE support to in-tree libpng. r=jrmuizel 2016-08-11 09:50:00 -04:00
Byron Campen [:bwc]
fe142cf303 Bug 1280443: Copy this the hard way. r=drno
--HG--
extra : rebase_source : d3ad50a2fb57bdaab31e53188d918ed8d6d1daa7
2016-08-10 11:51:28 -05:00
Nicholas Nethercote
bab6d17ebf Bug 1293117 (part 4) - Change many NS_IMETHODIMP occurrences to NS_IMETHOD. r=froydnj.
This patch makes the following changes on many in-class methods.

- NS_IMETHODIMP F() override;      --> NS_IMETHOD F() override;
- NS_IMETHODIMP F() override {...} --> NS_IMETHOD F() override {...}
- NS_IMETHODIMP F() final;         --> NS_IMETHOD F() final;
- NS_IMETHODIMP F() final {...}    --> NS_IMETHOD F() final {...}

Using NS_IMETHOD is the preferred way of marking in-class virtual methods.
Although these transformations add an explicit |virtual|, they are safe --
there's an implicit |virtual| anyway because |override| and |final| only work
with virtual methods.

--HG--
extra : rebase_source : 386ee4e4ea2ecd8d5001efabc3ac87b4d6c0659f
2016-08-08 10:54:47 +10:00
Nicholas Nethercote
d1b1a7d71d Bug 1293117 (part 3) - Remove some unnecessary |virtual| annotations. r=froydnj.
This patch changes |virtual NS_IMETHODIMP| occurrences to |NS_IMETHOD|, which
is equivalent and the more standard way of marking in-class virtual XPCOM
methods.

--HG--
extra : rebase_source : c0ad273d8e341a7601466f33420a62742130e4a6
2016-08-08 10:45:56 +10:00
Dan Minor
cd36d5b8e3 Bug 1274340 - Call SetReceiveCodec for RED and ULPFEC when FEC is enabled; r=jesup
We need to call SetReceiveCodec for RED and ULPFEC so we know how to handle
those packets when received.

MozReview-Commit-ID: A9EluM7p2NH

--HG--
extra : rebase_source : 14033558254e7b8c7bc8dc38c1b77ad371b4e6a5
2016-06-30 12:20:19 -04:00
Dan Minor
05fc0cdaee Bug 1274340 - Make RED and ULPFEC payload type match sdp values; r=jesup
To be able to send and receive video with FEC enabled it appears we need to
have matching constant values here and in sdp/sipcc/ccsdp.h.

MozReview-Commit-ID: LZzAyMW9eEu

--HG--
extra : rebase_source : 1b0588b53c3906659711ab39d51533ae38db2568
2016-06-30 12:20:04 -04:00
Glenn Randers-Pehrson
2a7cababba Bug 1291986 - Part 01 (libpng) Update embedded libpng to version 1.6.24. r=seth 2016-08-04 20:10:00 +02:00
Nicholas Nethercote
e7f10a07fd Bug 1293603 (part 2) - Make Run() declarations consistent. r=erahm.
This patch makes most Run() declarations in subclasses of nsIRunnable have the
same form: |NS_IMETHOD Run() override|.

As a result of these changes, I had to add |override| to a couple of other
functions to satisfy clang's -Winconsistent-missing-override warning.

--HG--
extra : rebase_source : 815d0018b0b13329bb5698c410f500dddcc3ee12
2016-08-08 12:18:10 +10:00
Carsten "Tomcat" Book
d9e0b4c565 merge mozilla-inbound to mozilla-central a=merge 2016-08-09 15:44:51 +02:00
Nils Ohlmeier [:drno]
f8f35e1df4 Bug 1293172: improve DTLS handshake error message. r=mt
MozReview-Commit-ID: GM28RvCQ3O4

--HG--
extra : rebase_source : 690ec762844950c7aff2f7382d48de67a7f5e786
2016-08-07 22:34:41 -07:00
Sebastian Hengst
d307cb8dab Backed out changeset 4361c6f3b915 (bug 1289968) for failing encrypted-media-generate-request-disallowed-input.html. r=backout 2016-08-08 15:28:12 +02:00
Chris Pearce
a41f94398b Bug 1289968 - Ensure ClearKey doesn't assume keyIds can only be 16 bytes. r=gerald
I also added more testing around ClearKey's base64 decoding, since that affected
how keyIds were handled.

MozReview-Commit-ID: 2UH1JNT4NC3

--HG--
extra : rebase_source : 8e2c861e6b030d7e4a1378d3fafed7630324d940
2016-08-01 16:28:10 +12:00
Wes Kocher
83c7e63697 Merge m-c to inbound, a=merge 2016-08-05 14:06:00 -07:00
Nathan Froyd
f7fb6722a6 Bug 1231764 - part 6 - build rust code via cargo; r=chmanchester
This patch is really two separate changes.

The first change is that rust crates are large, standalone entities that
may contain multitudes of source files.  It therefore doesn't make sense
to keep them in SOURCES, as we have been doing.  Moving to use cargo
will require a higher-level approach, which suggests that we need a
different, higher-level representation for Rust sources in the build
system.

The representation here is to have the build system refer to things
defined in Cargo.toml files as the entities dealt with in the build
system, and let Cargo deal with the details of actually building things.
This approach means that adding a new crate to an existing library just
requires editing Rust and Cargo.toml files, rather than dealing with
moz.build, which seems more natural to Rust programmers.  By having the
source files for libraries (and binaries in subsequent iterations of
this support) checked in to the tree, we can also take advantage of
Cargo.lock files.

The second is that we switch the core build system over to building via
cargo, rather than invoking rustc directly.

We also clean up a number of leftover things from the Old Way of doing
things.  A number of tests are added to confirm that we'll only permit
crates to be built that have dependencies in-tree.
2016-08-06 00:49:26 -04:00
Wes Kocher
ac0a6fd9e6 Backed out 2 changesets (bug 1286041) for asan failures in cubeb_pulse.c
Backed out changeset 72e5792fe990 (bug 1286041)
Backed out changeset 14d4b1e011ad (bug 1286041)

--HG--
extra : rebase_source : 1db28655abbb337e537a67d09e2af243ae94f081
2016-08-05 11:05:33 -07:00
Jean-Yves Avenard
b390a15468 Bug 1292039: [ffmpeg] P1. Remove unused options and dictionary features. r=kentuckyfriedtakahe.
Saving is disappointing, only 41kiB out of a 2222kiB

MozReview-Commit-ID: JNz9PxHTLUp

--HG--
extra : rebase_source : b68ed5c3784c76d840438d1d5e369c95a8abd9a7
2016-08-04 16:55:15 +10:00
Carsten "Tomcat" Book
cf611bec79 merge mozilla-inboudn to mozilla-central a=merge 2016-08-05 12:01:14 +02:00
Nils Ohlmeier [:drno]
b3a05a317c Bug 1290365: add TURN TCP socket to read poll after connect. r=bwc
MozReview-Commit-ID: FLITvQCt9Xq

--HG--
extra : rebase_source : 8346b3b8e1655882584bdf1a60a8af75fc1da1bf
2016-08-02 10:58:55 -07:00
Alex Chronopoulos
b8d6550755 Bug 1286041 - Cubeb PulseAudio backend stop calling callback before stream start. r=kinetik
--HG--
extra : rebase_source : cf6f9603d9b069477be572a04b7d2e0999a72d2f
2016-08-04 03:32:00 +02:00
ctai
749ec15b11 Bug 1201363 - MediaStreamVideoSink for MediaPipelineTransmit case. r=jesup
Replace |MediaPipelineTransmit::PipelineListener::NotifyQueuedTrackChanges| with |MediaPipelineTransmit::PipelineVideoSink::SetCurrentFrames|. We only need to deal with the video case since audio will be routed to |NotifyQueuedAudioData|.

MozReview-Commit-ID: EVpMVgJynGT

--HG--
extra : transplant_source : %0By%B5%91Fr%5B%BA%F7%D4%EE%FBs7%0C%F2%84%EC%5C5
2016-05-31 14:59:13 +08:00
Wes Kocher
ae855cdb28 Merge m-c to inbound, a=merge 2016-08-03 16:47:07 -07:00
Wes Kocher
9605851be0 Backed out 7 changesets (bug 1231764) for apparently causing linux debug wpt bustage
Backed out changeset 4b71272c92cf (bug 1231764)
Backed out changeset 234d8a930afa (bug 1231764)
Backed out changeset f9b204c2f5a7 (bug 1231764)
Backed out changeset f933119e57e4 (bug 1231764)
Backed out changeset e3af0b1d3473 (bug 1231764)
Backed out changeset 643b03aae1dd (bug 1231764)
Backed out changeset a945dbf63410 (bug 1231764)

--HG--
extra : rebase_source : e71360fa4b5e3e74859c82e74e183e13e6211c4c
2016-08-03 16:27:06 -07:00
Sebastian Hengst
a27be4decf Backed out changeset 0d2c395386ba (bug 1201363) 2016-08-03 19:33:24 +02:00
Nathan Froyd
6b2618fb44 Bug 1231764 - part 6 - build rust code via cargo; r=chmanchester
This patch is really two separate changes.

The first change is that rust crates are large, standalone entities that
may contain multitudes of source files.  It therefore doesn't make sense
to keep them in SOURCES, as we have been doing.  Moving to use cargo
will require a higher-level approach, which suggests that we need a
different, higher-level representation for Rust sources in the build
system.

The representation here is to have the build system refer to things
defined in Cargo.toml files as the entities dealt with in the build
system, and let Cargo deal with the details of actually building things.
This approach means that adding a new crate to an existing library just
requires editing Rust and Cargo.toml files, rather than dealing with
moz.build, which seems more natural to Rust programmers.  By having the
source files for libraries (and binaries in subsequent iterations of
this support) checked in to the tree, we can also take advantage of
Cargo.lock files.

The second is that we switch the core build system over to building via
cargo, rather than invoking rustc directly.

We also clean up a number of leftover things from the Old Way of doing
things.  A number of tests are added to confirm that we'll only permit
crates to be built that have dependencies in-tree.
2016-08-03 19:40:41 -04:00
Dan Minor
a096887e44 Bug 1279135 - Reattach Pipeline to PipelineTransport in AttachTransport_s; r=jesup
When we call MediaPipeline::UpdateTransport_s we in turn call DetachTransport_s
which detaches the pipeline from PipelineTransport. The subsequent call to
AttachTransport_s does not currently reattach the pipeline, causing
subsequent sends to fail due to a detached pipeline. Since
PipelineTransport::SendRtpRtcpPacket_s returns NS_OK if a send fails due to a
detached pipeline, this failure is not straightforward to detect.

This patch adds an Attach() method to PipelineTransport and calls it from
AttachTransport_s.

MozReview-Commit-ID: Kfc3TH1YOno

--HG--
extra : rebase_source : 91dbb07973b62e410541150805a918e4375643af
2016-07-29 11:04:49 -04:00
Carsten "Tomcat" Book
2bcc300cca Backed out changeset 12e3777de139 (bug 1274626)
--HG--
rename : dom/media/platforms/ReorderQueue.h => dom/media/platforms/apple/ReorderQueue.h
2016-08-02 17:47:29 +02:00
Carsten "Tomcat" Book
bd81ddd0b0 merge mozilla-inbound to mozilla-central a=merge 2016-08-02 17:09:31 +02:00
Carsten "Tomcat" Book
9211a18088 Backed out changeset f239b2ba9c46 (bug 1201363) 2016-08-02 12:53:48 +02:00
Jean-Yves Avenard
7f1f8deb8b Bug 1290710: [ffmpeg] Resync ffvpx with 3.1 branch. r=gerald
Sync at version n3.1.1-6-g86f9228

MozReview-Commit-ID: Qp8OxKkDHu

--HG--
extra : rebase_source : 39367dcc0ed471c65acd611eb1787fed86f261d8
2016-08-01 14:05:13 +10:00
Wes Kocher
b2fb9f514e Backed out changeset 11b27019a256 (bug 1290710) for PGO build bustage in media/ffvpx/libavcodec/target a=backout 2016-08-01 09:43:07 -07:00
Jean-Yves Avenard
ff62e39fd8 Bug 1290710: [ffmpeg] Resync ffvpx with 3.1 branch. r=gerald
Sync at version n3.1.1-6-g86f9228

MozReview-Commit-ID: Qp8OxKkDHu

--HG--
extra : rebase_source : d05415b5fad36c533ce8d900723bc360ad097598
2016-08-01 14:05:13 +10:00
ctai
93fd7395d3 Bug 1201363 - MediaStreamVideoSink for MediaPipelineTransmit case. r=jesup
Replace |MediaPipelineTransmit::PipelineListener::NotifyQueuedTrackChanges| with |MediaPipelineTransmit::PipelineVideoSink::SetCurrentFrames|. We only need to deal with the video case since audio will be routed to |NotifyQueuedAudioData|.

MozReview-Commit-ID: EVpMVgJynGT

--HG--
extra : amend_source : 19b5fca8cc2ca10d58bd8b2add9363ff9bd42b62
2016-05-31 14:59:13 +08:00
ctai
06b9cfbf60 Bug 1201363 - MediaStreamVideoSink for MediaPipelineTransmit case. r=jesup
Replace |MediaPipelineTransmit::PipelineListener::NotifyQueuedTrackChanges| with |MediaPipelineTransmit::PipelineVideoSink::SetCurrentFrames|. We only need to deal with the video case since audio will be routed to |NotifyQueuedAudioData|.

MozReview-Commit-ID: EVpMVgJynGT

--HG--
extra : transplant_source : U4%AC%EA%CA%CE%15%D6%F6%F8%05%F5%ED%FB%8EF%EF%E1X%13
2016-05-31 14:59:13 +08:00
Jan-Ivar Bruaroey
23c8aa8b52 Bug 1290625 - Make libcubeb mutex recurse again, to avoid deadlock when getting microphone. r=achronop
MozReview-Commit-ID: AvYa8ylsdOf

--HG--
extra : rebase_source : 111b2954a089fcacc530f7d9babed5de298b5b78
2016-07-29 20:03:35 -04:00
Paul Adenot
f6b4822250 Bug 1290425 - Update cubeb to e40741 to fix bustage. 2016-07-29 14:04:09 +02:00
Alex Chronopoulos
ae1e3599d8 Bug 1290425 - Update cubeb to revision 6278ef2f73. r=padenot 2016-07-29 13:40:52 +02:00
Carsten "Tomcat" Book
8c47612fee merge mozilla-inbound to mozilla-central a=merge 2016-07-29 11:56:43 +02:00
Wes Kocher
97868e2577 Merge m-c to inbound, a=merge 2016-07-28 17:04:59 -07:00
Carsten "Tomcat" Book
99e55461fb Merge mozilla-central to autoland 2016-07-28 17:46:12 +02:00
Carsten "Tomcat" Book
37be51f16a merge mozilla-inbound to mozilla-central a=merge 2016-07-28 17:43:03 +02:00
Nils Ohlmeier [:drno]
650d5a0e64 Bug 1289984: fix Windows compiler warnings. r=bwc
MozReview-Commit-ID: EWSJZdxPzQk

--HG--
extra : rebase_source : 5d5c2e088c6e0dffcba9d8692d4e1a878b24ae44
2016-07-27 17:13:43 -07:00
Alexandre Lissy
ceb1dc3eac Bug 1290073 - Remove ICS Gonk widget support r=sotaro
MozReview-Commit-ID: JOWaHvPwnZI

--HG--
extra : rebase_source : 1f9c81b0bb79572365d98944fc8923f1859540c1
2016-07-28 14:38:07 +02:00
Chris Pearce
a2a8662207 Bug 1289931 - Fire InvalidAccessError instead of AbortError when ClearKey's generateRequest is passed invalid initData. r=gerald
Google's Web Platform EME test expects this, and it makes sense.

MozReview-Commit-ID: CCuEHYintob

--HG--
extra : rebase_source : 7b2a9f38b5c22ecb0af8b9a2e270eaa7d0bf2da0
2016-07-28 11:08:27 +12:00
Byron Campen [:bwc]
38b1158591 Bug 1287874: Add missing math.h include. r=drno
MozReview-Commit-ID: APRXVtWHlBX

--HG--
extra : rebase_source : fe8e299f81d4623456c28e2b5aca76b1e29b4503
2016-07-27 14:21:58 -05:00
Michael Froman
089e002c9b Bug 1275360 - Add sdp handling for video FEC (red/ulpfec). r=drno
MozReview-Commit-ID: BIt7SkSEquj

--HG--
extra : transplant_source : %A9%27%7B%D7%AA%FBI%94%9D%EC%9E%A2%2C%ED%3D%06%2C%90f%DB
2016-06-30 00:40:40 -05:00
Glenn Randers-Pehrson
fe2ffde0f8 Bug 1283961 - Part 1: Remove limits on PNG image dimensions (libpng). r=seth
--HG--
extra : rebase_source : 400ad744e14fbecd9b1aac784124df4c86078dbe
2016-07-21 11:13:00 -04:00
Sotaro Ikeda
d32193d4c6 Bug 1284803 part 11 - Fix build failure of Android 4.2 x86 opt r=jrmuizel 2016-07-26 00:02:40 -07:00
Sotaro Ikeda
061a24e917 Bug 1284803 part 9 - Make sure NEON ifdefs match r=jesup 2016-07-26 00:01:53 -07:00
Sotaro Ikeda
370a3052df Bug 1284803 part 8 - Disable AVX2 asm if the compiler/assembler don't support it r=jesup 2016-07-26 00:01:24 -07:00