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

Side by Side Diff: talk/session/media/channel.cc

Issue 1308023004: Add support for negotiating RTCP with reduced size. Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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 unified diff | Download patch
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.cc ('k') | talk/session/media/mediasession.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 // a description without codecs (currently a CA_UPDATE with just 153 // a description without codecs (currently a CA_UPDATE with just
154 // streams can). 154 // streams can).
155 if (desc->has_codecs()) { 155 if (desc->has_codecs()) {
156 params->codecs = desc->codecs(); 156 params->codecs = desc->codecs();
157 } 157 }
158 // TODO(pthatcher): See if we really need 158 // TODO(pthatcher): See if we really need
159 // rtp_header_extensions_set() and remove it if we don't. 159 // rtp_header_extensions_set() and remove it if we don't.
160 if (desc->rtp_header_extensions_set()) { 160 if (desc->rtp_header_extensions_set()) {
161 params->extensions = desc->rtp_header_extensions(); 161 params->extensions = desc->rtp_header_extensions();
162 } 162 }
163 params->rtcp.reduced_size = desc->rtcp_reduced_size();
163 } 164 }
164 165
165 template <class Codec, class Options> 166 template <class Codec, class Options>
166 void RtpSendParametersFromMediaDescription( 167 void RtpSendParametersFromMediaDescription(
167 const MediaContentDescriptionImpl<Codec>* desc, 168 const MediaContentDescriptionImpl<Codec>* desc,
168 RtpSendParameters<Codec, Options>* send_params) { 169 RtpSendParameters<Codec, Options>* send_params) {
169 RtpParametersFromMediaDescription(desc, send_params); 170 RtpParametersFromMediaDescription(desc, send_params);
170 send_params->max_bandwidth_bps = desc->bandwidth(); 171 send_params->max_bandwidth_bps = desc->bandwidth();
171 } 172 }
172 173
(...skipping 2255 matching lines...) Expand 10 before | Expand all | Expand 10 after
2428 return (data_channel_type_ == DCT_RTP); 2429 return (data_channel_type_ == DCT_RTP);
2429 } 2430 }
2430 2431
2431 void DataChannel::OnStreamClosedRemotely(uint32 sid) { 2432 void DataChannel::OnStreamClosedRemotely(uint32 sid) {
2432 rtc::TypedMessageData<uint32>* message = 2433 rtc::TypedMessageData<uint32>* message =
2433 new rtc::TypedMessageData<uint32>(sid); 2434 new rtc::TypedMessageData<uint32>(sid);
2434 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); 2435 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
2435 } 2436 }
2436 2437
2437 } // namespace cricket 2438 } // namespace cricket
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.cc ('k') | talk/session/media/mediasession.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698