talk/session/media/mediasession.h - Issue 1516993002: Properly handle different transports having different SSL roles.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: talk/session/media/mediasession.h

Issue 1516993002: Properly handle different transports having different SSL roles. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Fixing merge conflicts. Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: talk/session/media/mediasession.h

diff --git a/talk/session/media/mediasession.h b/talk/session/media/mediasession.h

index 8a7f4ccf06758db5453b84c43bfadc1f2dceddd6..d95b2ba0169cce50d511b1b98d935a7cf585d73d 100644

--- a/talk/session/media/mediasession.h

+++ b/talk/session/media/mediasession.h

@@ -144,7 +144,9 @@ struct MediaSessionOptions {

// bps. -1 == auto.

int video_bandwidth;

int data_bandwidth;

- TransportOptions transport_options;

+ TransportOptions audio_transport_options;

+ TransportOptions video_transport_options;

+ TransportOptions data_transport_options;

pthatcher1 2016/01/07 21:12:03 Can you put a TODO explaining why we have this and

Taylor Brandstetter 2016/01/07 22:25:55 Done.

struct Stream {

Stream(MediaType type,

« talk/app/webrtc/webrtcsession.cc ('K') | « talk/app/webrtc/webrtcsessiondescriptionfactory.cc ('k') | talk/session/media/mediasession.cc » ('j') | no next file with comments »