Commit Graph

649 Commits

Author SHA1 Message Date
pbos@webrtc.org
97fdeb8329 Remove static initializer in WebRtcVideoEngine2.
Blocks import into chromium.

R=tommi@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/18249004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6954 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-22 10:36:23 +00:00
phoglund@webrtc.org
7bd5fefb17 Making sure muc members get recorded.
This is an upstream of a change I made; will describe in a separate
email thread.

Essentially, the members map wasn't getting populated in the callclient
example, so it was always empty. Now it will be populated correctly.

R=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/13189004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6950 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-21 09:53:28 +00:00
henrik.lundin@webrtc.org
6908b84179 Disable two tests in TurnPortTest
The tests are flaky.

BUG=3720
TBR=jiayl@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/17159004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6934 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-20 09:47:58 +00:00
buildbot@webrtc.org
95bbd18696 (Auto)update libjingle 73627179-> 73695227
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6933 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-20 07:49:30 +00:00
buildbot@webrtc.org
5a60aed80f (Auto)update libjingle 73626701-> 73627179
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6930 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-19 15:11:45 +00:00
buildbot@webrtc.org
84532e59dd (Auto)update libjingle 73626167-> 73626701
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6929 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-19 15:05:18 +00:00
henrike@webrtc.org
0481f15f02 (Auto)update libjingle 73399579-> 73626167
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6928 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-19 14:56:59 +00:00
houssainy@google.com
d5b292e450 Active connection stats [LocalAddress,RemoteAddress,LocalCandidateType...etc]
is now printed in the head-up display in Android appRTC.

This printing will be usefull in debugging switching ICE candidates.

R=andresp@webrtc.org, glaznev@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/13189005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6927 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-19 11:43:32 +00:00
buildbot@webrtc.org
353cd37ae9 (Auto)update libjingle 73370064-> 73399579
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6911 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-15 18:26:12 +00:00
tommi@webrtc.org
5b06b06cc0 Revert 6897 (i.e. Reland 6863) - "Revert 6863 "Refactor StatsCollector and associated..."
The bot that had the problem was using an old version of STL, so relanding.

> Revert 6863 "Refactor StatsCollector and associated types."
> 
> Breaks chrome compilation on Mac:
> 
> /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/usr/include/c++/4.2.1/bits/vector.tcc:252:8:
> error: no matching constructor for initialization of
> 'webrtc::StatsReport'
>           _Tp __x_copy = __x;
>               ^          ~~~
> /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/usr/include/c++/4.2.1/bits/stl_vector.h:608:4:
> note: in instantiation of member function
> 'std::vector<webrtc::StatsReport, std::allocator<webrtc::StatsReport>
> >::_M_insert_aux' requested here
>           _M_insert_aux(end(), __x);
>           ^
> ../../content/renderer/media/mock_peer_connection_impl.cc:282:11:
> note: in instantiation of member function
> 'std::vector<webrtc::StatsReport, std::allocator<webrtc::StatsReport>
> >::push_back' requested here
>   reports.push_back(report1);
>           ^
> ../../third_party/libjingle/source/talk/app/webrtc/statstypes.h:49:3:
> note: candidate constructor not viable: requires 0 arguments, but 1
> was provided
>   StatsReport() : timestamp(0) {}
> 
> 
> 
> > Refactor StatsCollector and associated types.
> > * Due to the type changes, I'm going to update the OnCompleted event in two phases to sync with Chrome. This is the first phase.
> > * Reports are now managed in a set, not a map, since it's enough to store the id in one place.
> > * Report ids are now const.
> > * Copying of data has been greatly reduced.
> > * This change includes preparation work for making GetStats fully async.
> > 
> > This is a reland of r6778 which was reverted due to fyi bots failing.
> > I found and fixed the issue which was that in a couple of places I needed to replace a report instead of finding+updating an existing one.
> > 
> > R=xians@webrtc.org
> > 
> > Review URL: https://webrtc-codereview.appspot.com/15119004
> 
> TBR=tommi@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/21169004

TBR=niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/22099004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6908 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-15 08:38:30 +00:00
buildbot@webrtc.org
c3df61e351 (Auto)update libjingle 73256845-> 73260148
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6898 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 23:57:23 +00:00
niklas.enbom@webrtc.org
22fa032f22 Revert 6863 "Refactor StatsCollector and associated types."
Breaks chrome compilation on Mac:

/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/usr/include/c++/4.2.1/bits/vector.tcc:252:8:
error: no matching constructor for initialization of
'webrtc::StatsReport'
          _Tp __x_copy = __x;
              ^          ~~~
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/usr/include/c++/4.2.1/bits/stl_vector.h:608:4:
note: in instantiation of member function
'std::vector<webrtc::StatsReport, std::allocator<webrtc::StatsReport>
>::_M_insert_aux' requested here
          _M_insert_aux(end(), __x);
          ^
../../content/renderer/media/mock_peer_connection_impl.cc:282:11:
note: in instantiation of member function
'std::vector<webrtc::StatsReport, std::allocator<webrtc::StatsReport>
>::push_back' requested here
  reports.push_back(report1);
          ^
../../third_party/libjingle/source/talk/app/webrtc/statstypes.h:49:3:
note: candidate constructor not viable: requires 0 arguments, but 1
was provided
  StatsReport() : timestamp(0) {}



> Refactor StatsCollector and associated types.
> * Due to the type changes, I'm going to update the OnCompleted event in two phases to sync with Chrome. This is the first phase.
> * Reports are now managed in a set, not a map, since it's enough to store the id in one place.
> * Report ids are now const.
> * Copying of data has been greatly reduced.
> * This change includes preparation work for making GetStats fully async.
> 
> This is a reland of r6778 which was reverted due to fyi bots failing.
> I found and fixed the issue which was that in a couple of places I needed to replace a report instead of finding+updating an existing one.
> 
> R=xians@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/15119004

TBR=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/21169004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6897 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 23:11:04 +00:00
buildbot@webrtc.org
449ad98aeb (Auto)update libjingle 73248599-> 73249894
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6896 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 21:55:18 +00:00
pbos@webrtc.org
ef8bb8d9b0 Make sure that muting muted streams succeeds.
We don't want to report an error here, and PeerConnection relies on
being able to mute already-muted streams (I hit an assert when testing
manually).

BUG=1788
R=pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14139004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6895 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 21:36:18 +00:00
pbos@webrtc.org
432893a100 Remove TODO saying to remove WebRtcVideoFrame.
Comment was added prematurely, there's no decision to get rid of this
type.

BUG=1788
R=pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/19049004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6894 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 21:17:22 +00:00
pbos@webrtc.org
b15dddf7ae Remove files from talk/PRESUBMIT.py blacklist.
Many files can now be submitted here and do not have to be rolled in.

BUG=
R=henrike@webrtc.org, pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14109004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6893 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 20:38:53 +00:00
henrike@webrtc.org
d968dd039a Fixes failure triggered by include order re-ordering.
BUG=N/A
TBR=marpan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/18129004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6892 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 18:39:43 +00:00
buildbot@webrtc.org
a09a99950e (Auto)update libjingle 73222930-> 73226398
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6891 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 17:26:08 +00:00
buildbot@webrtc.org
2c0fb05f16 (Auto)update libjingle 73221069-> 73222930
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6889 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 16:47:12 +00:00
buildbot@webrtc.org
67f849575c (Auto)update libjingle 73215194-> 73221069
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6888 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 16:22:04 +00:00
henrike@webrtc.org
4eeeefebb2 (Auto)update libjingle 73072800 -> 73215194
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6887 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 14:57:30 +00:00
xians@webrtc.org
38d88816e3 Fix the audio source failure due to unsupported constraints.
Some constraints, like kEchoCancellation, kMediaStreamAudioDucking are supported in Chrome but not in Libjingle, if the users set it in mandatory, LocalAudioSource::Initialize() will fail the getUserMedia call.

This patch fixes the problem by fully initializing the LocalAudioSource even though some constraints are not supported in libjingle.

BUT=crbug/398080
TEST=manual test:
var constraints = {audio: { mandatory: { googEchoCancellation: true } }};
getUserMedia(constraints, gotStream, gotStreamFailed);
verify you get a gotStream callback

R=henrika@webrtc.org, tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/21049004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6885 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 13:51:58 +00:00
mallinath@webrtc.org
e999bd087b Removing ASSERT for tcp candidate for port 0 and 9, as Android clients
may not be called with set_allow_tcp_listen(false).

This CL will also sends tcp candidate in RFC 6544 format.

BUG=https://code.google.com/p/webrtc/issues/detail?id=3677
R=braveyao@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14119004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6880 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 06:05:55 +00:00
pbos@webrtc.org
afb554f404 Move default-recv-channels to a separate class.
BUG=1788,3099
R=pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/20119004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6879 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-12 23:17:13 +00:00
pbos@webrtc.org
c3d2bd28a3 Fix GetStats() crash.
GetStats() can be called before codecs are set and the underlying
webrtc::VideoSendStream is created, leading to a null-pointer
dereference.

BUG=1788
R=pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14099004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6876 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-12 20:55:10 +00:00
buildbot@webrtc.org
8d57f08902 (Auto)update libjingle 73072800-> 73072800
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6873 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-12 14:41:46 +00:00
henrike@webrtc.org
6ac22e6b47 Remove more dependencies on openssl, add dependency on boringssl. Continues on r6798
R=andrew@webrtc.org, fbarchard@chromium.org, kjellander@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14029004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6867 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-11 21:06:30 +00:00
tommi@webrtc.org
730bf30da7 Refactor StatsCollector and associated types.
* Due to the type changes, I'm going to update the OnCompleted event in two phases to sync with Chrome. This is the first phase.
* Reports are now managed in a set, not a map, since it's enough to store the id in one place.
* Report ids are now const.
* Copying of data has been greatly reduced.
* This change includes preparation work for making GetStats fully async.

This is a reland of r6778 which was reverted due to fyi bots failing.
I found and fixed the issue which was that in a couple of places I needed to replace a report instead of finding+updating an existing one.

R=xians@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/15119004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6863 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-11 14:08:33 +00:00
jiayl@webrtc.org
7ec3f9f838 Fix a bug in parsing IceCandidate with IPV6 address.
It used to treat ":" as a candidate delimiter and got confused by the ":" in the IPV6 address.
The new logic is to check if the input has multiple lines. If so, returns error.

BUG=3669
R=pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/18079004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6859 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-08 23:09:15 +00:00
buildbot@webrtc.org
9eabe5e912 (Auto)update libjingle 72931377-> 72931377
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6858 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-08 22:48:28 +00:00
mallinath@webrtc.org
2d60c5e8bc Encoding and Decoding of TCP candidates as defined in RFC 6544.
R=juberti@chromium.org, jiayl@webrtc.org, juberti@webrtc.org
BUG=2204

Review URL: https://webrtc-codereview.appspot.com/21479004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6857 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-08 22:29:20 +00:00
buildbot@webrtc.org
53df88c1bc (Auto)update libjingle 72847605-> 72850595
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6855 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 22:46:01 +00:00
buildbot@webrtc.org
65b98d12c3 (Auto)update libjingle 72839629-> 72847605
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6854 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 22:09:08 +00:00
tkchin@webrtc.org
c8554be6dd Support for TURN/TLS.
Wrap the socket in an SSL adapter, then simply call StartSSL() on the
SSLAdapter instance.

Cloned from: https://webrtc-codereview.appspot.com/21799004/

R=juberti@chromium.org, juberti@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/14059004

Patch from Manish Jethani <manish.jethani@gmail.com>.

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6852 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 20:39:08 +00:00
tkchin@webrtc.org
cb46de24fb Add new OWNERS file to talk/examples.
R=juberti@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/15039004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6851 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 20:01:34 +00:00
buildbot@webrtc.org
5b1ebacca2 (Auto)update libjingle 72820109-> 72822008
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6850 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 17:18:00 +00:00
buildbot@webrtc.org
d509678a4e (Auto)update libjingle 72819313-> 72820109
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6849 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 16:57:07 +00:00
buildbot@webrtc.org
94b996cc18 (Auto)update libjingle 72785516-> 72819313
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6848 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 16:47:14 +00:00
buildbot@webrtc.org
476efa2031 (Auto)update libjingle 72785180-> 72785516
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6842 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 04:55:21 +00:00
buildbot@webrtc.org
4f0d401fae (Auto)update libjingle 72682155-> 72785180
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6841 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 04:47:36 +00:00
jiayl@webrtc.org
56d8e05238 A followup to r6828 to fix a condition check in mediasession.cc.
BUG=2395
R=juberti@chromium.org, juberti@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/17029004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6832 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-05 23:52:36 +00:00
buildbot@webrtc.org
624a504f5b (Auto)update libjingle 72659510-> 72673987
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6829 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-05 22:13:05 +00:00
jiayl@webrtc.org
e7d47a1473 Maintain the order of the m-lines in CreateOffer and CreateAnswer.
The order in the offer follows the order in the current local description.
The order in the answer follows the order in the current offer.

BUG=2395
R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/12799004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6828 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-05 19:19:05 +00:00
buildbot@webrtc.org
8e885990ae (Auto)update libjingle 72566057-> 72591796
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6824 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-04 23:56:14 +00:00
jiayl@webrtc.org
b18bf5e47d Adds the support of RTCOfferOptions for PeerConnectionInterface::CreateOffer.
Constraints are still supported for CreateOffer, but converted to RTCOfferOptions internally.

BUG=3282
R=pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/20029004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6822 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-04 18:34:16 +00:00
buildbot@webrtc.org
a27342b7af (Auto)update libjingle 72446860-> 72550257
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6818 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-04 15:22:32 +00:00
buildbot@webrtc.org
e0d03f13e4 (Auto)update libjingle 72443101-> 72446860
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6815 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-02 03:04:01 +00:00
buildbot@webrtc.org
6e203d50a3 (Auto)update libjingle 72442050-> 72443101
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6814 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-02 01:13:04 +00:00
buildbot@webrtc.org
52148c2f74 (Auto)update libjingle 72430895-> 72442050
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6813 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-02 00:56:56 +00:00
buildbot@webrtc.org
7cb60ccae1 (Auto)update libjingle 72407428-> 72430895
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6812 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-01 22:03:36 +00:00