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

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

Issue 1418123003: Adding reduced size RTCP configuration down to the video stream level. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing patch conflicts Created 5 years 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_unittest.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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 // a description without codecs (currently a CA_UPDATE with just 144 // a description without codecs (currently a CA_UPDATE with just
145 // streams can). 145 // streams can).
146 if (desc->has_codecs()) { 146 if (desc->has_codecs()) {
147 params->codecs = desc->codecs(); 147 params->codecs = desc->codecs();
148 } 148 }
149 // TODO(pthatcher): See if we really need 149 // TODO(pthatcher): See if we really need
150 // rtp_header_extensions_set() and remove it if we don't. 150 // rtp_header_extensions_set() and remove it if we don't.
151 if (desc->rtp_header_extensions_set()) { 151 if (desc->rtp_header_extensions_set()) {
152 params->extensions = desc->rtp_header_extensions(); 152 params->extensions = desc->rtp_header_extensions();
153 } 153 }
154 params->rtcp.reduced_size = desc->rtcp_reduced_size();
154 } 155 }
155 156
156 template <class Codec, class Options> 157 template <class Codec, class Options>
157 void RtpSendParametersFromMediaDescription( 158 void RtpSendParametersFromMediaDescription(
158 const MediaContentDescriptionImpl<Codec>* desc, 159 const MediaContentDescriptionImpl<Codec>* desc,
159 RtpSendParameters<Codec, Options>* send_params) { 160 RtpSendParameters<Codec, Options>* send_params) {
160 RtpParametersFromMediaDescription(desc, send_params); 161 RtpParametersFromMediaDescription(desc, send_params);
161 send_params->max_bandwidth_bps = desc->bandwidth(); 162 send_params->max_bandwidth_bps = desc->bandwidth();
162 } 163 }
163 164
(...skipping 2102 matching lines...) Expand 10 before | Expand all | Expand 10 after
2266 return (data_channel_type_ == DCT_RTP); 2267 return (data_channel_type_ == DCT_RTP);
2267 } 2268 }
2268 2269
2269 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { 2270 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
2270 rtc::TypedMessageData<uint32_t>* message = 2271 rtc::TypedMessageData<uint32_t>* message =
2271 new rtc::TypedMessageData<uint32_t>(sid); 2272 new rtc::TypedMessageData<uint32_t>(sid);
2272 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); 2273 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
2273 } 2274 }
2274 2275
2275 } // namespace cricket 2276 } // namespace cricket
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2_unittest.cc ('k') | talk/session/media/mediasession.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698