| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| (...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1084     } | 1084     } | 
| 1085 | 1085 | 
| 1086     return opt_codec; | 1086     return opt_codec; | 
| 1087   }; | 1087   }; | 
| 1088 | 1088 | 
| 1089   for (const auto& spec : specs) { | 1089   for (const auto& spec : specs) { | 
| 1090     // We need to do some extra stuff before adding the main codecs to out. | 1090     // We need to do some extra stuff before adding the main codecs to out. | 
| 1091     rtc::Optional<AudioCodec> opt_codec = map_format(spec.format, nullptr); | 1091     rtc::Optional<AudioCodec> opt_codec = map_format(spec.format, nullptr); | 
| 1092     if (opt_codec) { | 1092     if (opt_codec) { | 
| 1093       AudioCodec& codec = *opt_codec; | 1093       AudioCodec& codec = *opt_codec; | 
| 1094       if (spec.supports_network_adaption) { | 1094       if (spec.info.supports_network_adaption) { | 
| 1095         codec.AddFeedbackParam( | 1095         codec.AddFeedbackParam( | 
| 1096             FeedbackParam(kRtcpFbParamTransportCc, kParamValueEmpty)); | 1096             FeedbackParam(kRtcpFbParamTransportCc, kParamValueEmpty)); | 
| 1097       } | 1097       } | 
| 1098 | 1098 | 
| 1099       if (spec.allow_comfort_noise) { | 1099       if (spec.info.allow_comfort_noise) { | 
| 1100         // Generate a CN entry if the decoder allows it and we support the | 1100         // Generate a CN entry if the decoder allows it and we support the | 
| 1101         // clockrate. | 1101         // clockrate. | 
| 1102         auto cn = generate_cn.find(spec.format.clockrate_hz); | 1102         auto cn = generate_cn.find(spec.format.clockrate_hz); | 
| 1103         if (cn != generate_cn.end()) { | 1103         if (cn != generate_cn.end()) { | 
| 1104           cn->second = true; | 1104           cn->second = true; | 
| 1105         } | 1105         } | 
| 1106       } | 1106       } | 
| 1107 | 1107 | 
| 1108       // Generate a telephone-event entry if we support the clockrate. | 1108       // Generate a telephone-event entry if we support the clockrate. | 
| 1109       auto dtmf = generate_dtmf.find(spec.format.clockrate_hz); | 1109       auto dtmf = generate_dtmf.find(spec.format.clockrate_hz); | 
| (...skipping 1516 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2626                       ssrc); | 2626                       ssrc); | 
| 2627   if (it != unsignaled_recv_ssrcs_.end()) { | 2627   if (it != unsignaled_recv_ssrcs_.end()) { | 
| 2628     unsignaled_recv_ssrcs_.erase(it); | 2628     unsignaled_recv_ssrcs_.erase(it); | 
| 2629     return true; | 2629     return true; | 
| 2630   } | 2630   } | 
| 2631   return false; | 2631   return false; | 
| 2632 } | 2632 } | 
| 2633 }  // namespace cricket | 2633 }  // namespace cricket | 
| 2634 | 2634 | 
| 2635 #endif  // HAVE_WEBRTC_VOICE | 2635 #endif  // HAVE_WEBRTC_VOICE | 
| OLD | NEW | 
|---|