Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Issue 2614813003: Revert of Separating SCTP code from BaseChannel/MediaChannel. (Closed)

Created:
3 years, 11 months ago by Taylor Brandstetter
Modified:
3 years, 11 months ago
Reviewers:
pthatcher1
CC:
webrtc-reviews_webrtc.org, the sun, tterriberry_mozilla.com
Target Ref:
refs/heads/master
Project:
webrtc
Visibility:
Public.

Description

Revert of Separating SCTP code from BaseChannel/MediaChannel. (patchset #14 id:240001 of https://codereview.webrtc.org/2564333002/ ) Reason for revert: Hitting DCHECK in chromium's WebrtcTransportTest.TerminateDataChannel and WebrtcTransportTest.DataStreamLate. Will investigate and reland. Original issue's description: > Separating SCTP code from BaseChannel/MediaChannel. > > The BaseChannel code is geared around RTP; the presence of media engines, > send and receive streams, SRTP, SDP directional attribute negotiation, etc. > It doesn't make sense to use it for SCTP as well. This separation should make > future work both on BaseChannel and the SCTP code paths easier. > > SctpDataEngine now becomes SctpTransport, and is used by WebRtcSession > directly. cricket::DataChannel is also renamed, to RtpDataChannel, so it > doesn't get confused with webrtc::DataChannel any more. > > Beyond just moving code around, some consequences of this CL: > - We'll now stop using the worker thread for SCTP. Packets will be > processed right on the network thread instead. > - The SDP directional attribute is ignored, as it's supposed to be. > > BUG=None > > Review-Url: https://codereview.webrtc.org/2564333002 > Cr-Commit-Position: refs/heads/master@{#15906} > Committed: https://chromium.googlesource.com/external/webrtc/+/67b3bbe639645ab719972682359acda303d94454 TBR=pthatcher@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/2614813003 Cr-Commit-Position: refs/heads/master@{#15908} Committed: https://chromium.googlesource.com/external/webrtc/+/c0dad89bed44c05a8a4c01f6c7a0fd58912479aa

Patch Set 1 #

Patch Set 2 : Also reverting https://codereview.webrtc.org/2612963002 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+2481 lines, -2825 lines) Patch
M webrtc/api/datachannel.h View 1 1 chunk +4 lines, -3 lines 0 comments Download
M webrtc/api/datachannel.cc View 1 7 chunks +15 lines, -14 lines 0 comments Download
M webrtc/api/datachannel_unittest.cc View 1 7 chunks +11 lines, -11 lines 0 comments Download
M webrtc/api/peerconnection.cc View 1 5 chunks +5 lines, -12 lines 0 comments Download
M webrtc/api/peerconnectioninterface_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/api/rtcstatscollector.cc View 1 1 chunk +3 lines, -9 lines 0 comments Download
M webrtc/api/test/mock_webrtcsession.h View 1 2 chunks +1 line, -3 lines 0 comments Download
M webrtc/api/webrtcsdp.cc View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/api/webrtcsession.h View 1 14 chunks +23 lines, -81 lines 0 comments Download
M webrtc/api/webrtcsession.cc View 1 28 chunks +137 lines, -346 lines 0 comments Download
M webrtc/api/webrtcsession_unittest.cc View 1 13 chunks +43 lines, -124 lines 0 comments Download
M webrtc/api/webrtcsessiondescriptionfactory.cc View 1 1 chunk +1 line, -1 line 0 comments Download
M webrtc/media/BUILD.gn View 1 3 chunks +4 lines, -4 lines 0 comments Download
M webrtc/media/base/fakemediaengine.h View 1 2 chunks +7 lines, -2 lines 0 comments Download
A webrtc/media/base/hybriddataengine.h View 1 chunk +60 lines, -0 lines 0 comments Download
M webrtc/media/base/mediachannel.h View 1 4 chunks +21 lines, -19 lines 0 comments Download
M webrtc/media/base/mediaconstants.h View 1 1 chunk +3 lines, -3 lines 0 comments Download
M webrtc/media/base/mediaengine.h View 1 1 chunk +2 lines, -1 line 0 comments Download
M webrtc/media/base/rtpdataengine.h View 1 1 chunk +2 lines, -1 line 0 comments Download
M webrtc/media/base/rtpdataengine.cc View 1 1 chunk +4 lines, -0 lines 0 comments Download
M webrtc/media/base/rtpdataengine_unittest.cc View 1 1 chunk +2 lines, -1 line 0 comments Download
A webrtc/media/sctp/sctpdataengine.h View 1 chunk +250 lines, -0 lines 0 comments Download
A webrtc/media/sctp/sctpdataengine.cc View 1 chunk +1066 lines, -0 lines 0 comments Download
A webrtc/media/sctp/sctpdataengine_unittest.cc View 1 chunk +523 lines, -0 lines 0 comments Download
D webrtc/media/sctp/sctptransport.h View 1 chunk +0 lines, -193 lines 0 comments Download
D webrtc/media/sctp/sctptransport.cc View 1 chunk +0 lines, -1090 lines 0 comments Download
D webrtc/media/sctp/sctptransport_unittest.cc View 1 chunk +0 lines, -563 lines 0 comments Download
D webrtc/media/sctp/sctptransportinternal.h View 1 chunk +0 lines, -137 lines 0 comments Download
M webrtc/pc/channel.h View 1 8 chunks +37 lines, -24 lines 0 comments Download
M webrtc/pc/channel.cc View 1 15 chunks +124 lines, -67 lines 0 comments Download
M webrtc/pc/channel_unittest.cc View 1 4 chunks +76 lines, -76 lines 0 comments Download
M webrtc/pc/channelmanager.h View 1 4 chunks +10 lines, -8 lines 0 comments Download
M webrtc/pc/channelmanager.cc View 1 3 chunks +37 lines, -22 lines 0 comments Download
M webrtc/pc/channelmanager_unittest.cc View 1 2 chunks +8 lines, -8 lines 0 comments Download

Messages

Total messages: 6 (3 generated)
Taylor Brandstetter
Created Revert of Separating SCTP code from BaseChannel/MediaChannel.
3 years, 11 months ago (2017-01-05 04:24:29 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/2614813003/270001
3 years, 11 months ago (2017-01-05 04:28:11 UTC) #3
commit-bot: I haz the power
3 years, 11 months ago (2017-01-05 04:28:24 UTC) #6
Message was sent while issue was closed.
Committed patchset #2 (id:270001) as
https://chromium.googlesource.com/external/webrtc/+/c0dad89bed44c05a8a4c01f6c...

Powered by Google App Engine
This is Rietveld 408576698