OLD | NEW |
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 1484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1495 SafeSetError("Can't find audio content in remote description.", error_desc); | 1495 SafeSetError("Can't find audio content in remote description.", error_desc); |
1496 return false; | 1496 return false; |
1497 } | 1497 } |
1498 | 1498 |
1499 if (!SetRtpTransportParameters_w(content, action, CS_REMOTE, error_desc)) { | 1499 if (!SetRtpTransportParameters_w(content, action, CS_REMOTE, error_desc)) { |
1500 return false; | 1500 return false; |
1501 } | 1501 } |
1502 | 1502 |
1503 AudioSendParameters send_params = last_send_params_; | 1503 AudioSendParameters send_params = last_send_params_; |
1504 RtpSendParametersFromMediaDescription(audio, &send_params); | 1504 RtpSendParametersFromMediaDescription(audio, &send_params); |
1505 if (audio->conference_mode()) { | |
1506 send_params.options.conference_mode.Set(true); | |
1507 } | |
1508 if (audio->agc_minus_10db()) { | 1505 if (audio->agc_minus_10db()) { |
1509 send_params.options.adjust_agc_delta.Set(kAgcMinus10db); | 1506 send_params.options.adjust_agc_delta.Set(kAgcMinus10db); |
1510 } | 1507 } |
1511 if (!media_channel()->SetSendParameters(send_params)) { | 1508 if (!media_channel()->SetSendParameters(send_params)) { |
1512 SafeSetError("Failed to set remote audio description send parameters.", | 1509 SafeSetError("Failed to set remote audio description send parameters.", |
1513 error_desc); | 1510 error_desc); |
1514 return false; | 1511 return false; |
1515 } | 1512 } |
1516 last_send_params_ = send_params; | 1513 last_send_params_ = send_params; |
1517 | 1514 |
(...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2292 return (data_channel_type_ == DCT_RTP); | 2289 return (data_channel_type_ == DCT_RTP); |
2293 } | 2290 } |
2294 | 2291 |
2295 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { | 2292 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { |
2296 rtc::TypedMessageData<uint32_t>* message = | 2293 rtc::TypedMessageData<uint32_t>* message = |
2297 new rtc::TypedMessageData<uint32_t>(sid); | 2294 new rtc::TypedMessageData<uint32_t>(sid); |
2298 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); | 2295 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); |
2299 } | 2296 } |
2300 | 2297 |
2301 } // namespace cricket | 2298 } // namespace cricket |
OLD | NEW |