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

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

Issue 1315903004: ABANDONED: Remove the default receive channel in WVoE. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@mediacontroller
Patch Set: test 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 1490 matching lines...) Expand 10 before | Expand all | Expand 10 after
1501 SafeSetError("Can't find audio content in remote description.", error_desc); 1501 SafeSetError("Can't find audio content in remote description.", error_desc);
1502 return false; 1502 return false;
1503 } 1503 }
1504 1504
1505 if (!SetRtpTransportParameters_w(content, action, CS_REMOTE, error_desc)) { 1505 if (!SetRtpTransportParameters_w(content, action, CS_REMOTE, error_desc)) {
1506 return false; 1506 return false;
1507 } 1507 }
1508 1508
1509 AudioSendParameters send_params = last_send_params_; 1509 AudioSendParameters send_params = last_send_params_;
1510 RtpSendParametersFromMediaDescription(audio, &send_params); 1510 RtpSendParametersFromMediaDescription(audio, &send_params);
1511 if (audio->conference_mode()) {
1512 send_params.options.conference_mode.Set(true);
1513 }
1514 if (audio->agc_minus_10db()) { 1511 if (audio->agc_minus_10db()) {
1515 send_params.options.adjust_agc_delta.Set(kAgcMinus10db); 1512 send_params.options.adjust_agc_delta.Set(kAgcMinus10db);
1516 } 1513 }
1517 if (!media_channel()->SetSendParameters(send_params)) { 1514 if (!media_channel()->SetSendParameters(send_params)) {
1518 SafeSetError("Failed to set remote audio description send parameters.", 1515 SafeSetError("Failed to set remote audio description send parameters.",
1519 error_desc); 1516 error_desc);
1520 return false; 1517 return false;
1521 } 1518 }
1522 last_send_params_ = send_params; 1519 last_send_params_ = send_params;
1523 1520
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
2296 return (data_channel_type_ == DCT_RTP); 2293 return (data_channel_type_ == DCT_RTP);
2297 } 2294 }
2298 2295
2299 void DataChannel::OnStreamClosedRemotely(uint32 sid) { 2296 void DataChannel::OnStreamClosedRemotely(uint32 sid) {
2300 rtc::TypedMessageData<uint32>* message = 2297 rtc::TypedMessageData<uint32>* message =
2301 new rtc::TypedMessageData<uint32>(sid); 2298 new rtc::TypedMessageData<uint32>(sid);
2302 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); 2299 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
2303 } 2300 }
2304 2301
2305 } // namespace cricket 2302 } // 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