4232 Commits

Author SHA1 Message Date
aleloi
16f55a10c4 Migrated GN target :g711_test
Migrated GN target :g711_test from
webrtc/modules/audio_coding/codecs/g711/g711.gypi

NOTRY=True

BUG=webrtc:6191

Review-Url: https://codereview.webrtc.org/2273623002
Cr-Commit-Position: refs/heads/master@{#13864}
2016-08-23 15:08:30 +00:00
kwiberg
2e486462e0 RTC_CHECK and RTC_DCHECK macros for C
So that we don't have to use assert(). Includes one sample call site.

NOTRY=true
BUG=chromium:617124

Review-Url: https://codereview.webrtc.org/2262173002
Cr-Commit-Position: refs/heads/master@{#13862}
2016-08-23 12:54:31 +00:00
kjellander
d8dd190a08 GN: Fix test_support_unittests and MIPS compile issue.
Move the webrtc/test/test_support/metrics sources into
test_support[_unittests] targets.
This is essentially reverting https://webrtc-codereview.appspot.com/5789004
and moving these sources back to the right target.

Add missing foreman_cif.yuv resource needed for these tests.

For MIPS, a compile error was surfacing for logcat_trace_context.h when
flipping bot to GN, which was fixed.

BUG=webrtc:5949
NOTRY=True

Review-Url: https://codereview.webrtc.org/2267113002
Cr-Commit-Position: refs/heads/master@{#13860}
2016-08-23 11:52:19 +00:00
henrik.lundin
b3f1c5d2fe Add NetEq::FilteredCurrentDelayMs() and use it in VoiceEngine
The new method returns the current total delay (packet buffer and sync
buffer) in ms, with smoothing applied to even out short-time
fluctuations due to jitter. The packet buffer part of the delay is not
updated during DTX/CNG periods.

This CL also pipes the new metric through ACM and uses it in
VoiceEngine. It replaces the previous method of estimating the buffer
delay (where an inserted packet's RTP timestamp was compared with the
last played timestamp from NetEq). The new method works better under
periods of DTX/CNG.

Review-Url: https://codereview.webrtc.org/2262203002
Cr-Commit-Position: refs/heads/master@{#13855}
2016-08-22 22:40:00 +00:00
ehmaldonado
6c46eaa544 Add gtest as a dependency for neteq_quality_test_support.
Was removed in Patch Set 5 of https://codereview.webrtc.org/2252413002
but shouldn't have been, since it's actually required.

https://cs.chromium.org/chromium/src/third_party/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h?l=17

BUG=webrtc:6228
NOTRY=True

Review-Url: https://codereview.webrtc.org/2262173003
Cr-Commit-Position: refs/heads/master@{#13851}
2016-08-22 16:48:11 +00:00
stefan
d48717b455 Fix issue where the number of packets reported in tests/simulations sometimes are negative.
BUG=webrtc:6159

Review-Url: https://codereview.webrtc.org/2223033002
Cr-Commit-Position: refs/heads/master@{#13850}
2016-08-22 15:50:36 +00:00
kwiberg
4ec01d9c9d Fix trivial lint errors in FileRecorder and FilePlayer
Mostly, it's about replacing mutable reference arguments with pointer
arguments, and replacing C style casts with C++ style casts.

Review-Url: https://codereview.webrtc.org/2056653002
Cr-Commit-Position: refs/heads/master@{#13849}
2016-08-22 15:43:58 +00:00
danilchap
853ecb21f7 Style cleanup in UpdateTmmbr:
function names style updated,
unused return type removed.
Comment style fixed, redundant comments removed.
pass-by-pointer parameter changed to pass-by-value because can't be nullptr any more.

NOTRY=true
BUG=webrtc:5565

Review-Url: https://codereview.webrtc.org/2258523005
Cr-Commit-Position: refs/heads/master@{#13848}
2016-08-22 15:26:22 +00:00
kwiberg
7f82fc988d WebRtcIlbcfix_Smooth: Fix UBSan fuzzer bug (left shift of 1 by 31 overflows)
scale1 == 31 if and only if w10 == 0. So even though 1 << scale1
overflows, we know that the result of the multiplication should be 0.
Handle that case.

BUG=chromium:615818

Review-Url: https://codereview.webrtc.org/2258543002
Cr-Commit-Position: refs/heads/master@{#13847}
2016-08-22 14:43:50 +00:00
danilchap
642e3bc75b [rtcp] TransportFeedback adjusted to match other rtcp packets:
Derived from rtcp::Rtpfb instead of directly from RtcpPacket
Does not depend on RTCPUtility.
Parse function takes CommonHeader.
TransportFeedback::BlockLength fixed to match size used by Create

BUG=webrtc:5260

Review-Url: https://codereview.webrtc.org/1847973003
Cr-Commit-Position: refs/heads/master@{#13846}
2016-08-22 14:37:00 +00:00
henrika
49810511c9 [Reland] Cleanup of the AudioDeviceBuffer class.
See https://codereview.webrtc.org/2256833003/

Contains a minor change to ensure that an external client builds.

TBR=magjed
BUG=NONE

Review-Url: https://codereview.webrtc.org/2269553004
Cr-Commit-Position: refs/heads/master@{#13845}
2016-08-22 12:56:17 +00:00
kjellander
83d79cd4a2 Revert of Add pps id and sps id parsing to the h.264 depacketizer. (patchset #5 id:80001 of https://codereview.webrtc.org/2238253002/ )
Reason for revert:
Breaks some h264 bitstream tests downstream. Reverting for now.

Original issue's description:
> Add pps id and sps id parsing to the h.264 depacketizer.
>
> BUG=webrtc:6208
>
> Committed: https://crrev.com/abcc3de169d8896ad60e920e5677600fb3d40180
> Cr-Commit-Position: refs/heads/master@{#13838}

TBR=sprang@webrtc.org,stefan@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6208

Review-Url: https://codereview.webrtc.org/2265023002
Cr-Commit-Position: refs/heads/master@{#13844}
2016-08-22 12:34:43 +00:00
danilchap
e5b4141746 Move RTP timestamp calculation from BuildRTPheader to SendOutgoingData
BUG=webrtc:5565

Review-Url: https://codereview.webrtc.org/2249223005
Cr-Commit-Position: refs/heads/master@{#13842}
2016-08-22 10:39:31 +00:00
stefan
abcc3de169 Add pps id and sps id parsing to the h.264 depacketizer.
BUG=webrtc:6208

Review-Url: https://codereview.webrtc.org/2238253002
Cr-Commit-Position: refs/heads/master@{#13838}
2016-08-22 08:20:43 +00:00
magjed
8177452698 iOS H264VideoToolBoxEncoder: Stop scaling native CVPixelBuffers
If the input to H264VideoToolBoxEncoder is a native CVPixelBuffer and
the quality scaler requests scaling, we fall back to a slow path where
the buffer is converted from NV12 to I420 on the CPU and then uploaded
to a native CVPixelBuffer again. It turns out this scaling is not needed
and that the H264VideoToolBoxEncoder can handle the scaling internally.

BUG=b/30939444

Review-Url: https://codereview.webrtc.org/2258103003
Cr-Commit-Position: refs/heads/master@{#13835}
2016-08-20 17:53:32 +00:00
henrika
d7a89dbe8b Revert of Cleanup of the AudioDeviceBuffer class (patchset #6 id:100001 of https://codereview.webrtc.org/2256833003/ )
Reason for revert:
Seems to break an external client.

Original issue's description:
> Cleanup of the AudioDeviceBuffer class.
>
> WebRTC works on 10ms buffer sizes in both directions but this class has contained
> support for any size (with some limits) and for changes on the fly. It makes no sense to maintain such code and we have no tests to test it. This CL ensures that only 10ms audio buffers are supported and that nothing can be changed on the fly.
>
> It also updates the style to follow the Google C++ style guide.
>
> Finally, I remove very old (not tested and not maintained) support for file
> handling since the code is never used. It was more or less dead code.
>
> BUG=NONE
> R=magjed@webrtc.org
>
> Committed: https://crrev.com/cf327b45b9f5738950d4fca2b6a7b6030d508cdf
> Cr-Commit-Position: refs/heads/master@{#13833}

TBR=magjed@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=NONE

Review-Url: https://codereview.webrtc.org/2260183002
Cr-Commit-Position: refs/heads/master@{#13834}
2016-08-19 15:09:29 +00:00
henrika
cf327b45b9 Cleanup of the AudioDeviceBuffer class.
WebRTC works on 10ms buffer sizes in both directions but this class has contained
support for any size (with some limits) and for changes on the fly. It makes no sense to maintain such code and we have no tests to test it. This CL ensures that only 10ms audio buffers are supported and that nothing can be changed on the fly.

It also updates the style to follow the Google C++ style guide.

Finally, I remove very old (not tested and not maintained) support for file
handling since the code is never used. It was more or less dead code.

BUG=NONE
R=magjed@webrtc.org

Review URL: https://codereview.webrtc.org/2256833003 .

Cr-Commit-Position: refs/heads/master@{#13833}
2016-08-19 14:38:07 +00:00
danilchap
da161d795c Reformat rtcp_receiver
git cl format --full

BUG=webrtc:5565
NOTRY=true

Review-Url: https://codereview.webrtc.org/2259213002
Cr-Commit-Position: refs/heads/master@{#13832}
2016-08-19 14:29:51 +00:00
ehmaldonado
861da3c662 Refactor neteq_test_support.
Take 'tools/neteq_quality_test.cc' and 'tools/neteq_quality_test.h' outside of neteq_test_support into their own target, neteq_quality_test_support.

BUG=webrtc:6228
NOTRY=True

Review-Url: https://codereview.webrtc.org/2252413002
Cr-Commit-Position: refs/heads/master@{#13831}
2016-08-19 14:02:31 +00:00
ehmaldonado
bcba64a0fa GN: Add "//build/config/sanitizers:deps" as a dependency to executable targets.
When the sanitizer bots are switched to GN, this needs to be included as a dependency so that the executables can be compiled.

BUG=webrtc:6215
NOTRY=True

Review-Url: https://codereview.webrtc.org/2250893003
Cr-Commit-Position: refs/heads/master@{#13829}
2016-08-19 09:11:15 +00:00
peah
b5b30908dc Corrected the testvectors for the level controller
bitexactness test. The activation of the test will
be done in another CL.

BUG=

Review-Url: https://codereview.webrtc.org/2257733002
Cr-Commit-Position: refs/heads/master@{#13822}
2016-08-18 16:47:52 +00:00
isheriff
8df4d0e426 Add playout_delay_oracle_unittest as gn target
BUG=

Review-Url: https://codereview.webrtc.org/2256743002
Cr-Commit-Position: refs/heads/master@{#13821}
2016-08-18 14:53:44 +00:00
maxmorin
3a11933a63 Remove audio_device_test_func.
This code does not work and hasn't been used in a long time. It also
lacks a GN target. There's no reason to save it.

BUG=none

Review-Url: https://codereview.webrtc.org/2255173002
Cr-Commit-Position: refs/heads/master@{#13820}
2016-08-18 14:20:48 +00:00
peah
644fa96886 Added recording of the configuration for the AudioFrame API call
BUG=webrtc:6227

Review-Url: https://codereview.webrtc.org/2252043003
Cr-Commit-Position: refs/heads/master@{#13819}
2016-08-18 13:48:38 +00:00
danilchap
2b616397de Remove TMMBRSet class
by cleaning RTCPReceiveInfo class
and following cleaning of RTCPReceiver::BoundingSet function.

BUG=webrtc:5565

Review-Url: https://codereview.webrtc.org/2254703003
Cr-Commit-Position: refs/heads/master@{#13817}
2016-08-18 13:17:48 +00:00
henrik.lundin
38d840c35a NetEq: Changing checked_cast to saturated_cast
The cast involves packet_len_samp, which is derived from the timestamps
and sequence numbers of incoming packets. Being values from the outside,
these should be treated as if any value is possible, making a
checked_cast unsuitable. Changing instead to saturated_cast to avoid
overflow with out-of-bounds values.

Review-Url: https://codereview.webrtc.org/2243403007
Cr-Commit-Position: refs/heads/master@{#13815}
2016-08-18 10:49:41 +00:00
peah
e9a6acfbf5 Added missing unittest to the modules/BUILD.gn build file
NOTRY=True

BUG=

Review-Url: https://codereview.webrtc.org/2255093002
Cr-Commit-Position: refs/heads/master@{#13813}
2016-08-18 09:41:51 +00:00
kjellander
cb2d701946 Add kjellander as BUILD.gn OWNER in webrtc/modules
NOTRY=True

Review-Url: https://codereview.webrtc.org/2258593003
Cr-Commit-Position: refs/heads/master@{#13812}
2016-08-18 09:39:14 +00:00
danilchap
71fead2146 Reland of StartTimestamp generated randomly in RtpSender constructor (patchset #1 id:1 of https://codereview.webrtc.org/2248413002/ )
Reason for revert:
Reland: downstream code expectation about rtp_sender timestamp adjusted.

Original issue's description:
> Revert of StartTimestamp generated randomly in RtpSender constructor (patchset #4 id:60001 of https://codereview.webrtc.org/2241193002/ )
>
> Reason for revert:
> Breaks downstream code.
>
> Original issue's description:
> > StartTimestamp generated randomly in RtpSender constructor
> > instead of not-randomly at SetSendingState(true)
> > Renamed to timestamp_offset_ to better match meaning of the variable.
> >
> > R=asapersson@webrtc.org, terelius@webrtc.org
> >
> > Committed: https://crrev.com/4466782ae43e1b1125a55ee7e18abd10dd37cede
> > Cr-Commit-Position: refs/heads/master@{#13796}
>
> TBR=asapersson@webrtc.org,terelius@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: https://crrev.com/86c96948e340cf8b879bddb0c7293f3b5ad4dad4
> Cr-Commit-Position: refs/heads/master@{#13798}

TBR=asapersson@webrtc.org,terelius@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.webrtc.org/2257083002
Cr-Commit-Position: refs/heads/master@{#13811}
2016-08-18 09:02:16 +00:00
ossu
d4e9f62ea7 Updated AudioDecoderFactory to list AudioCodecSpecs instead of SdpAudioFormats.
BUG=webrtc:5805

Review-Url: https://codereview.webrtc.org/2123923004
Cr-Commit-Position: refs/heads/master@{#13810}
2016-08-18 09:02:15 +00:00
magjed
235020dba6 Roll chromium_revision 915e47250f..e3860bd297 (412201:412289)
Change log: 915e47250f..e3860bd297
Full diff: 915e47250f..e3860bd297

No dependencies changed.
No update to Clang.

NOTRY=TRUE
TBR=
BUG=webrtc:6219

Review-Url: https://codereview.webrtc.org/2253973002
Cr-Commit-Position: refs/heads/master@{#13809}
2016-08-18 08:45:53 +00:00
noahric
6a35590d14 Add code for dummy file audio to fallback to dummy audio.
BUG=

Review-Url: https://codereview.webrtc.org/2250853002
Cr-Commit-Position: refs/heads/master@{#13804}
2016-08-17 22:19:55 +00:00
noahric
d8a72f0ab2 Close input file in FileAudioDevice::StopRecording.
Also added some more logging, to help track down start/stop, start
failure, and the name of the file used.

BUG=

Review-Url: https://codereview.webrtc.org/2253763002
Cr-Commit-Position: refs/heads/master@{#13802}
2016-08-17 22:14:57 +00:00
kwiberg
d22854bf7d FilePlayer: Remove unused default values for arguments
The functions in question were virtual, so we would've wanted to get
rid of the default values even if callers had relied on them.

Review-Url: https://codereview.webrtc.org/2045943004
Cr-Commit-Position: refs/heads/master@{#13800}
2016-08-17 16:27:08 +00:00
henrika
4a42900540 Removes redundant log warning in WebRtcAudioManager.
Trivial patch which avoids logs that are of no value.

BUG=NONE

Review-Url: https://codereview.webrtc.org/2250403002
Cr-Commit-Position: refs/heads/master@{#13799}
2016-08-17 15:43:59 +00:00
danilchap
86c96948e3 Revert of StartTimestamp generated randomly in RtpSender constructor (patchset #4 id:60001 of https://codereview.webrtc.org/2241193002/ )
Reason for revert:
Breaks downstream code.

Original issue's description:
> StartTimestamp generated randomly in RtpSender constructor
> instead of not-randomly at SetSendingState(true)
> Renamed to timestamp_offset_ to better match meaning of the variable.
>
> R=asapersson@webrtc.org, terelius@webrtc.org
>
> Committed: https://crrev.com/4466782ae43e1b1125a55ee7e18abd10dd37cede
> Cr-Commit-Position: refs/heads/master@{#13796}

TBR=asapersson@webrtc.org,terelius@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.webrtc.org/2248413002
Cr-Commit-Position: refs/heads/master@{#13798}
2016-08-17 15:12:27 +00:00
kwiberg
5a25d9504a FileRecorder + FilePlayer: Let Create functions return unique_ptr
Because passing ownership in raw pointers makes kittens cry.

This also means we can ditch the Destroy functions and the protected
destructors. (Well, almost. We need to keep the old CreateFilePlayer
and DestroyFilePlayer around for a little while longer because of an
external caller.)

Review-Url: https://codereview.webrtc.org/2049683003
Cr-Commit-Position: refs/heads/master@{#13797}
2016-08-17 14:31:18 +00:00
Danil Chapovalov
4466782ae4 StartTimestamp generated randomly in RtpSender constructor
instead of not-randomly at SetSendingState(true)
Renamed to timestamp_offset_ to better match meaning of the variable.

R=asapersson@webrtc.org, terelius@webrtc.org

Review URL: https://codereview.webrtc.org/2241193002 .

Cr-Commit-Position: refs/heads/master@{#13796}
2016-08-17 13:07:49 +00:00
kwiberg
144dd27056 FileRecorderImpl and FilePlayerImpl don't need their own .h and .cc files
They are implementations of interfaces that are only ever exposed
via "create" functions, so the entire class definitions can be put in
anonymous namespaces in the .cc files that defines the "create"
functions.

NOPRESUBMIT=true

Review-Url: https://codereview.webrtc.org/2038513002
Cr-Commit-Position: refs/heads/master@{#13794}
2016-08-17 09:46:57 +00:00
ossu
c54071d8ab WebRtcVoiceEngine: Use AudioDecoderFactory to generate recv codecs.
Reland of https://codereview.webrtc.org/2072753002/ which broke
chromium due to how their build was setup. This issue should now be
resolved.

Changed WebRtcVoiceEngine to present receive codecs from the formats
provided by its decoder factory. Added supported formats to
BuiltinAudioDecoderFactory. Added helper functions for creating some
simple decoder factories for mocking.

Created a PayloadTypeMapper for assigning payload types to formats. I
think we'll eventually want to use this further up, or possibly in
both the audio and video sides. It would be best if the engines didn't
have to talk payload types at all, but it might be more difficult to
get around when payload types depend on each-other, like the RTX
codecs for video.

BUG=webrtc:5805
TBR=ivoc@webrtc.org

Review-Url: https://codereview.webrtc.org/2250683002
Cr-Commit-Position: refs/heads/master@{#13793}
2016-08-17 09:45:47 +00:00
philipel
eb680eac5d CongestionController::SetBweBitrates may now trigger probing.
BUG=webrtc:5859
R=stefan@webrtc.org

Review URL: https://codereview.webrtc.org/2246403002 .

Cr-Commit-Position: refs/heads/master@{#13791}
2016-08-17 09:12:14 +00:00
noahric
c594aa61bc Add a gyp/gn option to use dummy audio file devices.
Conceptually, dummy audio file devices are a "platform", like
win/mac/linux, and so the conditional slots under
include_internal_audio_device. When enabled, use_dummy_audio_file_devices
disables whatever platform-specific audio layer would have been used and
turns on dummy file device support.

BUG=

Review-Url: https://codereview.webrtc.org/2250483002
Cr-Commit-Position: refs/heads/master@{#13790}
2016-08-17 01:21:23 +00:00
zijiehe
49c01d7f34 Currently there is not way to programmically test whether a ScreenCapturer
implementation can accurately capture updated regions. Especially in
ScreenCapturerWinDirectx, which has a specific updated region spreading logic
and cannot be tested through regular code path. So we need a controllable
ScreenDrawer to draw some basic shapes on the screen. And a platform independent
test case can use the ScreenDrawer to test a ScreenCapturer.

So this change addes a ScreenDrawer virtual class, and its Windows
implementation ScreenDrawerWin. A disabled gtest ScreenDrawerTest.DrawRectangles
is also added to manually test whether ScreenDrawer can work on a certain
platform.

BUG=314516

TBR=kjellander@webrtc.org

Review-Url: https://codereview.webrtc.org/2210443002
Cr-Commit-Position: refs/heads/master@{#13788}
2016-08-17 00:34:00 +00:00
danilchap
287e54820b Cleanup RtcpReceiver::TMMBRReceived function
BUG=webrtc:951

Review-Url: https://codereview.webrtc.org/2250633002
Cr-Commit-Position: refs/heads/master@{#13786}
2016-08-16 22:15:46 +00:00
kwiberg
a06ce499d6 Run "git cl format" on some files before I start to modify them
This CL does literally nothing else but run "git cl format --full"
on the touched files.

NOPRESUBMIT=true

Review-Url: https://codereview.webrtc.org/2035663002
Cr-Commit-Position: refs/heads/master@{#13782}
2016-08-16 12:35:29 +00:00
ehmaldonado
90920d5bec GN: Enable msse2 flag in Mac.
It was disabled for some reason, even though in GYP it's enabled.

BUG=626067
NOTRY=True

Review-Url: https://codereview.webrtc.org/2247293002
Cr-Commit-Position: refs/heads/master@{#13780}
2016-08-16 11:13:07 +00:00
kwiberg
9d7eb13c40 Revert of Move FilePlayer and FileRecorder to Voice Engine (patchset #3 id:40001 of https://codereview.webrtc.org/2247033003/ )
Reason for revert:
Reverting, because it turns out that third-party code was using webrtc::FilePlayer. I'm not at all sure that this is something WebRTC ought to be exporting, but since we did export it, we have to live with it for now.

Original issue's description:
> Move FilePlayer and FileRecorder to Voice Engine
>
> Because Voice Engine was the only user.
>
> (This has been landed twice before, as
> https://codereview.webrtc.org/2037623002 and
> https://codereview.webrtc.org/2240163002. Third time's a charm!)
>
> NOPRESUBMIT=True
> TBR=kjellander@webrtc.org
>
> Committed: https://crrev.com/427ce3d86f6328dc994f84a15c28bb7bfbaa46ef
> Cr-Commit-Position: refs/heads/master@{#13777}

TBR=
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.webrtc.org/2245413002
Cr-Commit-Position: refs/heads/master@{#13779}
2016-08-16 11:08:39 +00:00
kwiberg
427ce3d86f Move FilePlayer and FileRecorder to Voice Engine
Because Voice Engine was the only user.

(This has been landed twice before, as
https://codereview.webrtc.org/2037623002 and
https://codereview.webrtc.org/2240163002. Third time's a charm!)

NOPRESUBMIT=True
TBR=kjellander@webrtc.org

Review-Url: https://codereview.webrtc.org/2247033003
Cr-Commit-Position: refs/heads/master@{#13777}
2016-08-16 10:34:50 +00:00
danilchap
2f69ce9498 Cleaned out candidateSet member from TMMBRHelp class
leaving that class memberless.

BUG=webrtc:5565

Review-Url: https://codereview.webrtc.org/2234783002
Cr-Commit-Position: refs/heads/master@{#13776}
2016-08-16 10:21:44 +00:00
maxmorin
6910537458 Add gn target for audio_device_tests.
Note (for myself) that this depends on https://codereview.webrtc.org/2219653004/ and https://codereview.webrtc.org/2214003002/, it should not be landed before them.

NOTRY=True
BUG=webrtc:6170,webrtc:5949

Review-Url: https://codereview.webrtc.org/2216423002
Cr-Commit-Position: refs/heads/master@{#13773}
2016-08-16 09:17:48 +00:00