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

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

Issue 1385893002: Remove default receive channel from WVoE; baby step 3. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Don't blow up if unable to set playout on added recv stream Created 5 years, 2 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
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 1479 matching lines...) Expand 10 before | Expand all | Expand 10 after
1490 SafeSetError("Can't find audio content in remote description.", error_desc); 1490 SafeSetError("Can't find audio content in remote description.", error_desc);
1491 return false; 1491 return false;
1492 } 1492 }
1493 1493
1494 if (!SetRtpTransportParameters_w(content, action, CS_REMOTE, error_desc)) { 1494 if (!SetRtpTransportParameters_w(content, action, CS_REMOTE, error_desc)) {
1495 return false; 1495 return false;
1496 } 1496 }
1497 1497
1498 AudioSendParameters send_params = last_send_params_; 1498 AudioSendParameters send_params = last_send_params_;
1499 RtpSendParametersFromMediaDescription(audio, &send_params); 1499 RtpSendParametersFromMediaDescription(audio, &send_params);
1500 if (audio->conference_mode()) {
1501 send_params.options.conference_mode.Set(true);
1502 }
1503 if (audio->agc_minus_10db()) { 1500 if (audio->agc_minus_10db()) {
1504 send_params.options.adjust_agc_delta.Set(kAgcMinus10db); 1501 send_params.options.adjust_agc_delta.Set(kAgcMinus10db);
1505 } 1502 }
1506 if (!media_channel()->SetSendParameters(send_params)) { 1503 if (!media_channel()->SetSendParameters(send_params)) {
1507 SafeSetError("Failed to set remote audio description send parameters.", 1504 SafeSetError("Failed to set remote audio description send parameters.",
1508 error_desc); 1505 error_desc);
1509 return false; 1506 return false;
1510 } 1507 }
1511 last_send_params_ = send_params; 1508 last_send_params_ = send_params;
1512 1509
(...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after
2287 return (data_channel_type_ == DCT_RTP); 2284 return (data_channel_type_ == DCT_RTP);
2288 } 2285 }
2289 2286
2290 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { 2287 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
2291 rtc::TypedMessageData<uint32_t>* message = 2288 rtc::TypedMessageData<uint32_t>* message =
2292 new rtc::TypedMessageData<uint32_t>(sid); 2289 new rtc::TypedMessageData<uint32_t>(sid);
2293 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); 2290 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
2294 } 2291 }
2295 2292
2296 } // namespace cricket 2293 } // namespace cricket
OLDNEW
« talk/media/webrtc/webrtcvoiceengine.cc ('K') | « talk/media/webrtc/webrtcvoiceengine_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698