2d25b44f47
Check associated payload type when negotiate RTX codecs.
...
At the moment, only payload name is checked when match two RTX codecs.
This will cause wrong behavior of codec negotiation if multiple RTX codecs
are added.
BUG=
R=pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/34189004
Cr-Commit-Position: refs/heads/master@{#8727}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8727 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-03-16 04:15:23 +00:00
a747093334
After another round of reviews.
...
Cr-Commit-Position: refs/heads/master@{#8483}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8483 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-24 20:20:19 +00:00
9616196c38
Merging definitions of IsSctp.
...
Cr-Commit-Position: refs/heads/master@{#8482}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8482 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-24 20:20:18 +00:00
12aa8a68f9
Post-rebase.
...
Cr-Commit-Position: refs/heads/master@{#8481}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8481 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-24 20:20:17 +00:00
1730869596
Added raw SCTP to IsSctp.
...
Cr-Commit-Position: refs/heads/master@{#8480}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8480 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-24 20:19:32 +00:00
871b1c373a
Review comments -- added IsSctp()
...
Cr-Commit-Position: refs/heads/master@{#8479}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8479 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-24 20:19:31 +00:00
d324546ced
Misc. cleanup split out of https://webrtc-codereview.appspot.com/37699004/ :
...
* Move constants into the files/functions that use them
* Declare variables in the narrowest scope possible
* Use correct (expected, actual) order for gtest macros
* Remove unused functions
* Untabify
* 80-column limit
* Avoid C-style casts
* Prefer true typed constants to "enum hack" constants
* Print size_t using the right format macro
* Shorten and simplify code
* Other random cleanup bits and style fixes
BUG=none
TEST=none
R=henrik.lundin@webrtc.org , tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/36179004
Cr-Commit-Position: refs/heads/master@{#8467}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8467 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-23 21:29:45 +00:00
a744a28b92
Templatize and clean up codec wildcards.
...
BUG=4123
R=pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/39209004
Cr-Commit-Position: refs/heads/master@{#8422}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8422 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-18 21:38:20 +00:00
e9facf8bb3
Add range checks in a variety of places where the values will subsequently be
...
expected to be 0-127.
BUG=none
TEST=none
R=juberti@webrtc.org
TBR=henrika
Review URL: https://webrtc-codereview.appspot.com/37759004
Cr-Commit-Position: refs/heads/master@{#8399}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8399 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-17 20:37:35 +00:00
3341b401cc
Fix bug parsing media descriptions: the final field isn't a codec type for any of DTLS/SCTP, SCTP, or SCTP/DTLS.
...
BUG=none
TEST=none
R=juberti@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/34029004
Cr-Commit-Position: refs/heads/master@{#8369}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8369 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-13 21:14:44 +00:00
57ac2c84dd
Default destination used by c line should be IPv4 only to avoid parsing error in legacy client.
...
Make sure the IP family overwrites the preference of candidates. Also,
make sure only UDP is used as default destination.
BUG=4269
R=juberti@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/36009004
Cr-Commit-Position: refs/heads/master@{#8258}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8258 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-06 00:45:43 +00:00
5f93d0a140
Update libjingle license statements at top of talk files for consistency
...
BUG=2133
R=juberti@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/39559004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8105 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-01-20 21:36:13 +00:00
61c1247224
Fix a case where empty candidate id is used
...
BUG=4161
R=juberti@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/35749004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8071 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-01-15 06:53:07 +00:00
8af11042cb
Avoid reading past end of string in GetLine.
...
BUG=3881
R=pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/39369004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8017 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-01-07 19:15:51 +00:00
950c518251
Add adapter_type into Candidate object.
...
Expose adapter_type from Candidate such that we could add jmidata on top of this.
Created a new type of report just for Ice candidate. The candidate's id is used as part of report identifier. This code change only reports the best connection's local candidate's adapter type. There should be cleaning later to move other candidate's attributes to the new report.
This is migrated from issue 32599004
BUG=
R=juberti@webrtc.org
Committed: https://code.google.com/p/webrtc/source/detail?r=7885
Committed: https://code.google.com/p/webrtc/source/detail?r=7906
Review URL: https://webrtc-codereview.appspot.com/36379004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7925 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-16 23:01:31 +00:00
e2b7585bc2
Move ViewRequest and MediaStreams to streamparams.h, and remove dependency on mediasessionclient.h and mediamessages.h. This is part of the effort to remove Jingle-specific code from WebRTC and into its own repository.
...
R=juberti@webrtc.org , pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/36519004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7921 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-16 21:09:08 +00:00
55360ae402
Revert "Add adapter_type into Candidate object."
...
This reverts commit aaf02cc2d4f696345ce0e6d5715f2cfa22aea689.
BUG=
TBR=juberti@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/35539004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7908 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-16 05:28:10 +00:00
aaf02cc2d4
Add adapter_type into Candidate object.
...
Expose adapter_type from Candidate such that we could add jmidata on top of this.
Created a new type of report just for Ice candidate. The candidate's id is used as part of report identifier. This code change only reports the best connection's local candidate's adapter type. There should be cleaning later to move other candidate's attributes to the new report.
This is migrated from issue 32599004
BUG=
R=juberti@webrtc.org
Committed: https://code.google.com/p/webrtc/source/detail?r=7885
Review URL: https://webrtc-codereview.appspot.com/36379004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7906 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-15 23:03:10 +00:00
fb108b5a28
Revert r7885.
...
Breaks compile step of other code where network name of
cricket::Candidate is used.
TBR=guoweis@webrtc.org ,juberti@webrtc.org
BUG=
Review URL: https://webrtc-codereview.appspot.com/31229004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7892 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-15 08:04:50 +00:00
18a3896bd2
Revert r7886:7887.
...
Broke build steps in other code that uses securetunnelsessionclient.cc
and others.
TBR=tommi@webrtc.org ,pthatcher@webrtc.org
BUG=
Review URL: https://webrtc-codereview.appspot.com/36439004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7890 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-15 07:03:04 +00:00
dee76f3b89
Move the obvious/easy Jingle-specific code into webrtc/libjingle.
...
R=tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/32669004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7886 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-12 21:04:42 +00:00
8c9d79a29d
Add adapter_type into Candidate object.
...
Expose adapter_type from Candidate such that we could add jmidata on top of this.
Created a new type of report just for Ice candidate. The candidate's id is used as part of report identifier. This code change only reports the best connection's local candidate's adapter type. There should be cleaning later to move other candidate's attributes to the new report.
This is migrated from issue 32599004
BUG=
R=juberti@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/36379004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7885 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-12 19:21:14 +00:00
d105cc81dc
Change dummy address to use 0.0.0.0 instead of ::
...
This is to not break compatiblity with FF.
https://code.google.com/p/chromium/issues/detail?id=430333
TBR=pthatcher@webrtc.org , juberti@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/31979004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7661 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-07 11:22:06 +00:00
269fb4bc90
move xmpp and p2p to webrtc
...
Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and
webrtc/p2p. Also makes libjingle use those version instead of the one in the talk folder.
BUG=3379
Review URL: https://webrtc-codereview.appspot.com/26999004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7549 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-28 22:20:11 +00:00
c9d6d14020
patch from issue 25469004
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7517 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-23 23:37:22 +00:00
28100cb388
Reverts r7459 "Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and webrtc/p2p."
...
BUG=N/A
TBR=niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/29829004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7472 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-17 22:03:39 +00:00
d1ba6d9cbf
Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and webrtc/p2p.
...
BUG=3379
R=niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/27709005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7459 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-15 17:30:28 +00:00
5d639b3ef3
(Auto)update libjingle 75141932-> 75179475
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7129 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-10 07:57:12 +00:00
0e52772aa9
Fix a bot-breaking memory leak from early returning in ParseMediaDescription.
...
BUG=3791
R=henrike@webrtc.org , pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/22589004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7109 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-08 21:43:43 +00:00
ddb85ab85b
Updated SCTP SDP attributes according to draft-ietf-mmusic-sctp-sdp-07
...
- SDP sctpmap attribute replaced with fmtp attribute
- SDP sctp-port attribute is newly added
BUG=3592
R=jiayl@webrtc.org , juberti@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/16169004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7087 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-05 16:31:56 +00:00
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
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
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
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
d4e598d57a
(Auto)update libjingle 72097588-> 72159069
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6799 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-29 17:36:52 +00:00
4c3e9917e7
Make sure b lines appear before all the a lines. Per RFC 4566, the order of media description should be:
...
m= (media name and transport address)
i=* (media title)
c=* (connection information -- optional if included at
session level)
b=* (zero or more bandwidth information lines)
k=* (encryption key)
a=* (zero or more media attribute lines)
BUG=2260
R=jiayl@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/15889004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6708 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-16 21:03:13 +00:00
ec9f5fb34c
Change SdpSerializeCandidate to output candidate line without the "a=" and without the leading \r\n", i.e. candidate-attribute as defined in section 15.1 of [ICE].
...
BUG=crbug/387632
R=juberti@google.com
Review URL: https://webrtc-codereview.appspot.com/17779004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6533 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-24 17:05:10 +00:00
85d2794e5b
Adds support for the "apt" format parameter and turns on the RTX feature.
...
BUG=1811,1095
R=henrike@webrtc.org , mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/12579009
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6372 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-09 12:51:39 +00:00
ed97bb0eb4
(Auto)update libjingle 66340694-> 66388864
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6071 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-07 11:15:20 +00:00
9c16c39e61
Sets the SCTP port codec in the native SessionDescription.
...
Previously it's only set when a SDP string is parsed into SessionDescription, causing failuring for native client.
BUG=3141
R=juberti@webrtc.org , wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/11999004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6036 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-01 18:30:30 +00:00
36eda7cf0e
Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=996329 , where the m line from firefox have a space at the end.
...
For example:
"m=application 38233 DTLS/SCTP 5000 "
BUG=3212
TEST=manually try to use DataChannel between FF 28 and Chrome with rtccopy.com
R=jiayl@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/12029005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5915 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-04-15 20:37:30 +00:00
5e760e7b94
Check the return value of the FromString call and return failure when then value is invalid. I.e. uses
...
bool FromString(const std::string& s, T* t)
instead of
T FromString(const std::string& str)
Before this change we will silently continue the parsing and take whatever default value returned by FromString.
TEST=new tests
BUG=2507
R=mallinath@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/11069004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5834 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-04-02 23:19:09 +00:00
e42b8ab129
Cleanups in libjingle to make it compile with chromium_code=1
...
Fixed all warnings that show up when compiling libjingle
in chromium with compiling with chromium_code=1.
chromium_code=1 enables various warnings that are off by
default. Most changes are for unused variables and consts.
R=pthatcher@google.com , wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/9699004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5769 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-03-25 00:31:35 +00:00
704bf9ebec
(Auto)update libjingle 62063505-> 62278774
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5617 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-02-27 17:52:04 +00:00
571df2dca9
Update libjingle 61759961->61834300
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5580 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-02-19 23:04:26 +00:00
5bc25c41fc
Update libjingle to 57692857
...
R=wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/4999004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5217 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-12-05 00:24:06 +00:00
cecfd1832d
Update talk to 55821645.
...
TEST=try bots
R=mallinath@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/3139004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5053 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-10-30 05:18:12 +00:00
19f27e6a24
Update talk to 54527154.
...
TBR=wu
Review URL: https://webrtc-codereview.appspot.com/2389004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4954 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-10-13 17:18:27 +00:00
7818752566
Update libjingle to 53856368.
...
R=mallinath@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2366004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4941 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-10-07 23:32:02 +00:00
1112c30e1e
Update libjingle to 53057474.
...
R=wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2274004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4818 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-09-23 20:34:45 +00:00