Commit Graph

18056 Commits

Author SHA1 Message Date
11c7b703d7 Remove native method VideoTrack.free which doesn't exist.
Bug: webrtc:7543
Change-Id: I6aa96d83bb30dda48505f0f678fe3d70f6d6d985
Reviewed-on: https://chromium-review.googlesource.com/519269
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18374}
2017-06-01 11:24:49 +00:00
06875307e6 Re-enable EndToEndTest.PictureIdStateRetainedAfterReinitingVp8 on tsan.
Race has been fixed in libvpx.

BUG=webrtc:7663

Review-Url: https://codereview.webrtc.org/2913343004
Cr-Commit-Position: refs/heads/master@{#18373}
2017-06-01 11:10:37 +00:00
db5bb404b0 Enabling gn check on webrtc/test
BUG=webrtc:6828
NOTRY=True

Review-Url: https://codereview.webrtc.org/2911203002
Cr-Commit-Position: refs/heads/master@{#18372}
2017-06-01 11:07:12 +00:00
d76b7b294a New targets call:rtp_interfaces, call:rtp_receiver, call:rtp_sender.
BUG=webrtc:7135
TBR=sprang@webrtc.org

Review-Url: https://codereview.webrtc.org/2913143003
Cr-Commit-Position: refs/heads/master@{#18371}
2017-06-01 11:02:35 +00:00
405f90c871 Fix indexing error in event log analyzer.
The bug was introduced in https://codereview.webrtc.org/2912113002.

BUG=webrtc:7731

Review-Url: https://codereview.webrtc.org/2920433002
Cr-Commit-Position: refs/heads/master@{#18370}
2017-06-01 10:50:31 +00:00
00b16f4dc8 In order to land https://codereview.webrtc.org/2790933002/ and due to the
ongoing clean-up work (see https://codereview.webrtc.org/2887093002,
https://codereview.webrtc.org/2894583002/ and
https://codereview.webrtc.org/2891923002/), ReadDirectory() has been
added in webrtc/test/testsupport/fileutils.h.

BUG=NOBUG

Review-Url: https://codereview.webrtc.org/2898753002
Cr-Commit-Position: refs/heads/master@{#18369}
2017-06-01 10:29:40 +00:00
57fa7683a7 Roll chromium_revision 8c2a1a922d..92db6b2c14 (476213:476239)
Change log: 8c2a1a922d..92db6b2c14
Full diff: 8c2a1a922d..92db6b2c14

Changed dependencies:
* src/third_party: 7bfe07aaba..92060a49cc
* src/third_party/catapult: de3ade508f..861d4a1741
* src/tools: 98fecf188b..ed47b61510
DEPS diff: 8c2a1a922d..92db6b2c14/DEPS

No update to Clang.

TBR=
BUG=None

Review-Url: https://codereview.webrtc.org/2915763006
Cr-Commit-Position: refs/heads/master@{#18368}
2017-06-01 10:09:57 +00:00
91914e29a3 Use IsResolution(/Framerate)ScalingEnabled methods in more places.
BUG=webrtc:7607

Review-Url: https://codereview.webrtc.org/2897023002
Cr-Commit-Position: refs/heads/master@{#18367}
2017-06-01 07:34:08 +00:00
7fcdb6d7ca Delete class NullRtpData and function NullObjectRtpData.
BUG=webrtc:5565

Review-Url: https://codereview.webrtc.org/2885823002
Cr-Commit-Position: refs/heads/master@{#18366}
2017-06-01 07:30:55 +00:00
a0bf559b52 Roll chromium_revision 1053faaf3d..8c2a1a922d (476178:476213)
Change log: 1053faaf3d..8c2a1a922d
Full diff: 1053faaf3d..8c2a1a922d

Changed dependencies:
* src/ios: fc1b90960e..bcc59f2614
* src/testing: 649ed3aaf7..9804eb7809
* src/third_party: 96d1e8ed84..7bfe07aaba
* src/third_party/catapult: e6ad06342e..de3ade508f
* src/tools: c3ef63fde9..98fecf188b
DEPS diff: 1053faaf3d..8c2a1a922d/DEPS

No update to Clang.

TBR=
BUG=None

Review-Url: https://codereview.webrtc.org/2919743002
Cr-Commit-Position: refs/heads/master@{#18365}
2017-06-01 07:19:43 +00:00
fa7afe643d Roll chromium_revision 5f9161e0e5..1053faaf3d (476117:476178)
Change log: 5f9161e0e5..1053faaf3d
Full diff: 5f9161e0e5..1053faaf3d

Changed dependencies:
* src/ios: f677cfe437..fc1b90960e
* src/third_party: 74725b64cc..96d1e8ed84
* src/tools: dd5eb50b22..c3ef63fde9
DEPS diff: 5f9161e0e5..1053faaf3d/DEPS

No update to Clang.

TBR=
BUG=None

Review-Url: https://codereview.webrtc.org/2914153002
Cr-Commit-Position: refs/heads/master@{#18364}
2017-06-01 04:11:06 +00:00
bf5a801097 Definitions of video-codec name constants don't match their declarations
Constants kRTCVp8CodecName, kRTCVp9CodecName, kRTCH264CodecName declared
in RTCRtpCodecParameters.h were defined without the "RTC" part in their
names, thus using them in the app code resulted in linking errors. This
patch fixes the naming mismatch.

BUG=webrtc:7721

Review-Url: https://codereview.webrtc.org/2910863002
Cr-Commit-Position: refs/heads/master@{#18363}
2017-06-01 03:09:12 +00:00
7b3eca9940 Add media constraint-key constants for generating offers and answers
Similar to the existing constants for the media constraint-keys intended
for media sources, add the constants for the standard keys to generate
offers and answers.

This patch also adds a few comments to RTCMediaConstraints.h, to give
a better clue on the intended usage scope of declared media-constraint
keys and values.

BUG=webrtc:7722

Review-Url: https://codereview.webrtc.org/2908013002
Cr-Commit-Position: refs/heads/master@{#18362}
2017-06-01 01:25:48 +00:00
dacac34cfb Roll chromium_revision fb9bbbcec6..5f9161e0e5 (476046:476117)
Change log: fb9bbbcec6..5f9161e0e5
Full diff: fb9bbbcec6..5f9161e0e5

Changed dependencies:
* src/build: 9d7577f96b..54fde1e4fe
* src/ios: 13f7c40f07..f677cfe437
* src/testing: 4c9733c8dd..649ed3aaf7
* src/third_party: 28abc5f9c8..74725b64cc
* src/third_party/catapult: 24245dde6f..e6ad06342e
* src/tools: 2368b0170e..dd5eb50b22
DEPS diff: fb9bbbcec6..5f9161e0e5/DEPS

No update to Clang.

TBR=
BUG=None

Review-Url: https://codereview.webrtc.org/2913963003
Cr-Commit-Position: refs/heads/master@{#18361}
2017-06-01 01:12:07 +00:00
ec8f9ab2d7 Roll chromium_revision f9718e6fb6..fb9bbbcec6 (475932:476046)
Change log: f9718e6fb6..fb9bbbcec6
Full diff: f9718e6fb6..fb9bbbcec6

Changed dependencies:
* src/base: 22f4756f22..06a6be4a52
* src/build: 0312f982ba..9d7577f96b
* src/ios: 32399b6e20..13f7c40f07
* src/testing: 9f221c86ab..4c9733c8dd
* src/third_party: 0f039912f8..28abc5f9c8
* src/third_party/gtest-parallel: 21b383f81a..38b08579e2
* src/third_party/libvpx/source/libvpx: b3bf91bdc6..b9649d2407
* src/tools: 52d6a1f907..2368b0170e
DEPS diff: f9718e6fb6..fb9bbbcec6/DEPS

No update to Clang.

TBR=marpan@webrtc.org,
BUG=None

Review-Url: https://codereview.webrtc.org/2916703003
Cr-Commit-Position: refs/heads/master@{#18360}
2017-05-31 22:16:28 +00:00
de4db11798 Support epoll in PhysicalSocketServer.
Only will be used if WEBRTC_POSIX and WEBRTC_LINUX are both defined and
"epoll_create" doesn't return an error. Otherwise the default "select"-based
IO loop will be used.

BUG=webrtc:7585

Review-Url: https://codereview.webrtc.org/2880923002
Cr-Commit-Position: refs/heads/master@{#18359}
2017-05-31 20:09:18 +00:00
0cdb0ff0d6 Roll chromium_revision cb625841aa..f9718e6fb6 (475892:475932)
Change log: cb625841aa..f9718e6fb6
Full diff: cb625841aa..f9718e6fb6

Changed dependencies:
* src/base: 8c44e82f0c..22f4756f22
* src/ios: 48c41db651..32399b6e20
* src/testing: 91ca2948e0..9f221c86ab
* src/third_party: 1a8e730e59..0f039912f8
* src/third_party/catapult: 29612b077d..24245dde6f
* src/tools: e0b51947e6..52d6a1f907
DEPS diff: cb625841aa..f9718e6fb6/DEPS

No update to Clang.

TBR=
BUG=None

Review-Url: https://codereview.webrtc.org/2918603002
Cr-Commit-Position: refs/heads/master@{#18358}
2017-05-31 16:38:21 +00:00
760a076a52 Create unit tests for RtpDemuxer
1. Create unit tests for RtpDemuxer.
2. Add an RTC_DCHECK in RtpDemuxer that makes sure that the sink<->ssrc multimap does not allow multiple instances of the same association.

BUG=None

Review-Url: https://codereview.webrtc.org/2902823004
Cr-Commit-Position: refs/heads/master@{#18357}
2017-05-31 16:12:25 +00:00
6d3e866ab1 Fix spelling mistake in field trial key name.
TBR=peah@webrtc.org, magjed@webrtc.org

Bug: None
Change-Id: Id0ba96387dcaa41b8821245a067ca08d6740bf62
Notry: true
Reviewed-on: https://chromium-review.googlesource.com/519388
Commit-Queue: Kári Tristan Helgason <kthelgason@webrtc.org>
Reviewed-by: Kári Tristan Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18356}
2017-05-31 15:39:43 +00:00
eb80679c79 Disable flaky test EndToEndTest.TestFlexfecRtpStatePreservation on linux for now.
BUG=webrtc:7737

Review-Url: https://codereview.webrtc.org/2917673002
Cr-Commit-Position: refs/heads/master@{#18355}
2017-05-31 14:46:56 +00:00
be3e539600 Small cleanup of rtp_rtcp testAPI tests.
Delete unused member |rtp_receiver_|, and simplify a return statement.

BUG=webrtc:5565

Review-Url: https://codereview.webrtc.org/2912363002
Cr-Commit-Position: refs/heads/master@{#18354}
2017-05-31 14:35:16 +00:00
0a0a2f12b3 Add back key for AGC field trial.
It seems it got lost in a rebase with this CL:
https://codereview.webrtc.org/2893843003/

Bug: None
Change-Id: Iaf4952593c1a1a9490d31c595b05ab155c0a809e
Reviewed-on: https://chromium-review.googlesource.com/519167
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Per Åhgren <peah@webrtc.org>
Commit-Queue: Kári Tristan Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18353}
2017-05-31 14:04:00 +00:00
029ef77f72 Roll chromium_revision 39b0c40647..cb625841aa (475869:475892)
Change log: 39b0c40647..cb625841aa
Full diff: 39b0c40647..cb625841aa

Changed dependencies:
* src/ios: 40761c2a79..48c41db651
* src/third_party: b8bcdc0031..1a8e730e59
* src/third_party/catapult: deb4a2aa8f..29612b077d
* src/tools: 3349fedb52..e0b51947e6
DEPS diff: 39b0c40647..cb625841aa/DEPS

No update to Clang.

TBR=
BUG=None

Review-Url: https://codereview.webrtc.org/2918473003
Cr-Commit-Position: refs/heads/master@{#18352}
2017-05-31 13:41:01 +00:00
01d5a0b48d Propagate input capture time in ViEEncoder::OnFrame.
BUG=webrtc:6977

Review-Url: https://codereview.webrtc.org/2763023002
Cr-Commit-Position: refs/heads/master@{#18351}
2017-05-31 13:33:21 +00:00
8b2b9efab6 Use oneof in event log proto to reduce memory consumption.
BUG=webrtc:7732

Review-Url: https://codereview.webrtc.org/2919483002
Cr-Commit-Position: refs/heads/master@{#18350}
2017-05-31 12:45:56 +00:00
2c8ac1beda Avoid to build most of webrtc/sdk in chromium
BUG=webrtc:4867
NOTRY=True

Review-Url: https://codereview.webrtc.org/2910153003
Cr-Commit-Position: refs/heads/master@{#18349}
2017-05-31 12:14:26 +00:00
2b356ae664 Roll chromium_revision 4927f54d0e..39b0c40647 (475836:475869)
Change log: 4927f54d0e..39b0c40647
Full diff: 4927f54d0e..39b0c40647

Changed dependencies:
* src/base: e85d450258..8c44e82f0c
* src/ios: 7398b17c1d..40761c2a79
* src/testing: 581ab8ef3f..91ca2948e0
* src/third_party: 04e88297e5..b8bcdc0031
* src/tools: 3a6f3d82f5..3349fedb52
DEPS diff: 4927f54d0e..39b0c40647/DEPS

No update to Clang.

TBR=
BUG=None

Review-Url: https://codereview.webrtc.org/2916563002
Cr-Commit-Position: refs/heads/master@{#18348}
2017-05-31 10:55:51 +00:00
108904cba1 Use overloaded UpdateNetworkMetrics()
Use an overloaded version of UpdateNetworkMetrics() which does not require us to explicitly pass in an rtc::Optional.

BUG=None

Review-Url: https://codereview.webrtc.org/2899313004
Cr-Commit-Position: refs/heads/master@{#18347}
2017-05-31 09:46:00 +00:00
8fdf95728f Allow FPS reduction to be applied to frame listeners.
BUG=None

Review-Url: https://codereview.webrtc.org/2897043002
Cr-Commit-Position: refs/heads/master@{#18346}
2017-05-31 09:43:10 +00:00
76e62b0d38 Address some violations of chromium-style.
BUG=webrtc:163

Review-Url: https://codereview.webrtc.org/2913793002
Cr-Commit-Position: refs/heads/master@{#18345}
2017-05-31 09:24:52 +00:00
210832696f Delete Filesystem::IterateDirectory and Filesystem::OpenFile.
BUG=webrtc:7345, webrtc:6424

Review-Url: https://codereview.webrtc.org/2894583002
Cr-Commit-Position: refs/heads/master@{#18344}
2017-05-31 09:07:21 +00:00
8fbc765421 Ensure the RtcEventLog parser is backwards compatible
The old video send stream configs could contain multiple SSRCs and RTX SSRCs (in case of simulcast). To ensure that the RtcEventLog parser is backwards compatible, we have to return one config for every SSRC.

Also update the parsing functions for the other config types to return the config instead of passing in an output parameter.

BUG=webrtc:7731

Review-Url: https://codereview.webrtc.org/2912113002
Cr-Commit-Position: refs/heads/master@{#18343}
2017-05-31 09:03:16 +00:00
f93f5a4a99 Re-add removed sdk headers to the framework target.
Bug: None
Change-Id: I67a2463c3995e0d83a6b189712b77c0c322bdf0d
Reviewed-on: https://chromium-review.googlesource.com/518942
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18342}
2017-05-31 08:44:41 +00:00
10cf684aee Roll chromium_revision 7ef7f57bb6..4927f54d0e (475783:475836)
Change log: 7ef7f57bb6..4927f54d0e
Full diff: 7ef7f57bb6..4927f54d0e

Changed dependencies:
* src/base: 57036f1eaa..e85d450258
* src/third_party: b16ba71854..04e88297e5
* src/third_party/catapult: 32a3f0b8f4..deb4a2aa8f
* src/third_party/ced/src: e21eb6aed1..910cca22d8
* src/tools: 949b1b8fd9..3a6f3d82f5
DEPS diff: 7ef7f57bb6..4927f54d0e/DEPS

No update to Clang.

TBR=
BUG=None

Review-Url: https://codereview.webrtc.org/2910403002
Cr-Commit-Position: refs/heads/master@{#18341}
2017-05-31 07:34:01 +00:00
6412e4c85f Drop the rtp_rtcp module's dependency on call.
Also deletes a couple of includes of call.h, which seem
unnecessary.

BUG=None

Review-Url: https://codereview.webrtc.org/2907403003
Cr-Commit-Position: refs/heads/master@{#18340}
2017-05-31 06:38:14 +00:00
83cd7f341f Roll chromium_revision a3671ded59..7ef7f57bb6 (475709:475783)
Change log: a3671ded59..7ef7f57bb6
Full diff: a3671ded59..7ef7f57bb6

Changed dependencies:
* src/ios: a5d3e4157f..7398b17c1d
* src/testing: 8ca82d2124..581ab8ef3f
* src/third_party: 3b49368bb0..b16ba71854
* src/third_party/catapult: e18c0f9c79..32a3f0b8f4
* src/tools: 73d4e5ddbf..949b1b8fd9
DEPS diff: a3671ded59..7ef7f57bb6/DEPS

No update to Clang.

TBR=
BUG=None

Review-Url: https://codereview.webrtc.org/2909993005
Cr-Commit-Position: refs/heads/master@{#18339}
2017-05-31 04:10:48 +00:00
f56923b245 Roll chromium_revision 9a6a2ee988..a3671ded59 (475612:475709)
Change log: 9a6a2ee988..a3671ded59
Full diff: 9a6a2ee988..a3671ded59

Changed dependencies:
* src/base: 1759a05cc7..57036f1eaa
* src/build: d9c28f7e9a..0312f982ba
* src/ios: 430595f748..a5d3e4157f
* src/testing: d567057354..8ca82d2124
* src/third_party: b398a428ce..3b49368bb0
* src/third_party/catapult: ea7d9cf8f4..e18c0f9c79
* src/tools: 9c0478b41d..73d4e5ddbf
DEPS diff: 9a6a2ee988..a3671ded59/DEPS

No update to Clang.

TBR=
BUG=None

Review-Url: https://codereview.webrtc.org/2913043003
Cr-Commit-Position: refs/heads/master@{#18338}
2017-05-31 01:39:51 +00:00
cff9dfdc4a FecControler disables FEC when *below* threshold
(This CL concerns both the PLR-based as well as the RPLR-based versions of FecController.)
1. Make FecController disable only when below the disabling-threshold, so as to prevent toggling when the enabling-curve and the disabling-curve are identical.
2. Extend unit-test coverage accordingly.

BUG=None

Review-Url: https://codereview.webrtc.org/2906663002
Cr-Commit-Position: refs/heads/master@{#18337}
2017-05-30 21:44:50 +00:00
7ec573aeff Roll chromium_revision aa76e566ca..9a6a2ee988 (475541:475612)
Change log: aa76e566ca..9a6a2ee988
Full diff: aa76e566ca..9a6a2ee988

Changed dependencies:
* src/build: 99466ee9da..d9c28f7e9a
* src/ios: 0794d5f8e1..430595f748
* src/testing: a33b34f229..d567057354
* src/third_party: 49dd29b2ed..b398a428ce
* src/tools: d454d276be..9c0478b41d
DEPS diff: aa76e566ca..9a6a2ee988/DEPS

No update to Clang.

TBR=
BUG=None

Review-Url: https://codereview.webrtc.org/2913863002
Cr-Commit-Position: refs/heads/master@{#18336}
2017-05-30 19:38:07 +00:00
c41d0c4913 Have audio_device only depend on X11 if use_x11 is set.
BUG=None
NOTRY=True

Review-Url: https://codereview.webrtc.org/2909343002
Cr-Commit-Position: refs/heads/master@{#18335}
2017-05-30 19:06:04 +00:00
b5f5bdba77 Add unit tests for qp parser.
Add test for vp8/vp9 qp parser in both videoprocessor_integrationtest.
Check the qp from parser equal to that from the encoder
on every frame in every test.

Add test for vp8/vp9 qp parser in vp8/vp9_impl_test.
Check the qp parser on a single key frame.

BUG=None

Review-Url: https://codereview.webrtc.org/2903163002
Cr-Commit-Position: refs/heads/master@{#18334}
2017-05-30 17:57:25 +00:00
6c4bbfa06f Update max TL0 frame interval for screensharing.
The previous limit leaved no margin for RTT.

BUG=webrtc:4172

Review-Url: https://codereview.webrtc.org/2911243002
Cr-Commit-Position: refs/heads/master@{#18333}
2017-05-30 17:08:23 +00:00
9aa5c2c7d4 Roll chromium_revision 42f1569588..aa76e566ca (475502:475541)
Change log: 42f1569588..aa76e566ca
Full diff: 42f1569588..aa76e566ca

Changed dependencies:
* src/base: 5dff497cb6..1759a05cc7
* src/build: 602a85066e..99466ee9da
* src/ios: e8957f9172..0794d5f8e1
* src/third_party: 01d906ccef..49dd29b2ed
* src/tools: c68efc94ac..d454d276be
DEPS diff: 42f1569588..aa76e566ca/DEPS

No update to Clang.

TBR=
BUG=None

Review-Url: https://codereview.webrtc.org/2915613002
Cr-Commit-Position: refs/heads/master@{#18332}
2017-05-30 16:58:25 +00:00
12de077b14 Avoiding check on reordering configs in ANA if there is no controller has scoring point.
BUG=webrtc:7729

Review-Url: https://codereview.webrtc.org/2910193002
Cr-Commit-Position: refs/heads/master@{#18331}
2017-05-30 15:56:08 +00:00
d4d2ecec18 Change from stderr to output, add new line and replace return with break.
BUG=webrtc:7698

Review-Url: https://codereview.webrtc.org/2912933002
Cr-Commit-Position: refs/heads/master@{#18330}
2017-05-30 14:48:06 +00:00
678d2ee651 Cosmetic change in ANA: renaming characteristic points for consistency.
BUG=none

Review-Url: https://codereview.webrtc.org/2907153004
Cr-Commit-Position: refs/heads/master@{#18329}
2017-05-30 14:36:20 +00:00
07502d4f14 Fixing absolute path that was breaking chromium
BUG=None
NOTRY=True

Review-Url: https://codereview.webrtc.org/2908973005
Cr-Commit-Position: refs/heads/master@{#18328}
2017-05-30 13:23:41 +00:00
2d9e32e868 Roll chromium_revision 571d7e8c75..42f1569588 (475484:475502)
Change log: 571d7e8c75..42f1569588
Full diff: 571d7e8c75..42f1569588

Changed dependencies:
* src/third_party: 10e709bd2f..01d906ccef
DEPS diff: 571d7e8c75..42f1569588/DEPS

No update to Clang.

TBR=
BUG=None

Review-Url: https://codereview.webrtc.org/2908363002
Cr-Commit-Position: refs/heads/master@{#18327}
2017-05-30 13:20:57 +00:00
13941912b1 ObjC: Add interface for injecting custom shaders in video views
This CL adds a way for external clients to inject their own OpenGL(ES)
shaders to RTCEAGLVideoView/RTCNSGLVideoView. The shader interface
takes textures as arguments, and not RTCVideoFrame, so that
implementations only has to deal with actual OpenGL rendering, and not
converting frames into textures.

This CL also moves the internal shader code around a bit. The current
RTCShader interface with the implementations RTCI420Shader and
RTCNativeNV12Shader are removed. RTCEAGLVideoView and RTCNSGLVideoView
will be responsible for uploading the frames to textures instead
using the helper classes RTCI420TextureCache and RTCNV12TextureCache.
They then call the shader implementation with these textures. The
rendering code that used to be in RTCI420Shader and RTCNativeNV12Shader
have been merged into one RTCDefaultShaderDelegate class.

BUG=webrtc:7473

Review-Url: https://codereview.webrtc.org/2869143002
Cr-Commit-Position: refs/heads/master@{#18326}
2017-05-30 13:11:58 +00:00
2cc70facaf Add magjed as an owner of webrtc/sdk
magjed is already an owner of the two subfolders webrtc/sdk/android and
webrtc/sdk/objc, but that misses webrtc/sdk/BUILD.gn (as well as
possible future changes to the webrtc/sdk folder).

BUG=None
NOTRY=True

Review-Url: https://codereview.webrtc.org/2910073004
Cr-Commit-Position: refs/heads/master@{#18325}
2017-05-30 12:54:52 +00:00