OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
265 | 265 |
266 return codec_manager_.CurrentEncoder()->SampleRateHz(); | 266 return codec_manager_.CurrentEncoder()->SampleRateHz(); |
267 } | 267 } |
268 | 268 |
269 // Get encode bitrate. | 269 // Get encode bitrate. |
270 // Adaptive rate codecs return their current encode target rate, while other | 270 // Adaptive rate codecs return their current encode target rate, while other |
271 // codecs return there longterm avarage or their fixed rate. | 271 // codecs return there longterm avarage or their fixed rate. |
272 // TODO(henrik.lundin): Remove; not used. | 272 // TODO(henrik.lundin): Remove; not used. |
273 int AudioCodingModuleImpl::SendBitrate() const { | 273 int AudioCodingModuleImpl::SendBitrate() const { |
274 FATAL() << "Deprecated"; | 274 FATAL() << "Deprecated"; |
275 return -1; | |
turaj
2015/06/19 15:33:22
Please add a comment for the need of "return -1" a
Sébastien Marchand
2015/06/19 16:01:33
Done.
| |
275 // CriticalSectionScoped lock(acm_crit_sect_); | 276 // CriticalSectionScoped lock(acm_crit_sect_); |
276 // | 277 // |
277 // if (!codec_manager_.current_encoder()) { | 278 // if (!codec_manager_.current_encoder()) { |
278 // WEBRTC_TRACE(webrtc::kTraceStream, webrtc::kTraceAudioCoding, id_, | 279 // WEBRTC_TRACE(webrtc::kTraceStream, webrtc::kTraceAudioCoding, id_, |
279 // "SendBitrate Failed, no codec is registered"); | 280 // "SendBitrate Failed, no codec is registered"); |
280 // return -1; | 281 // return -1; |
281 // } | 282 // } |
282 // | 283 // |
283 // WebRtcACMCodecParams encoder_param; | 284 // WebRtcACMCodecParams encoder_param; |
284 // codec_manager_.current_encoder()->EncoderParams(&encoder_param); | 285 // codec_manager_.current_encoder()->EncoderParams(&encoder_param); |
(...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1258 *channels = 1; | 1259 *channels = 1; |
1259 break; | 1260 break; |
1260 #endif | 1261 #endif |
1261 default: | 1262 default: |
1262 FATAL() << "Codec type " << codec_type << " not supported."; | 1263 FATAL() << "Codec type " << codec_type << " not supported."; |
1263 } | 1264 } |
1264 return true; | 1265 return true; |
1265 } | 1266 } |
1266 | 1267 |
1267 } // namespace webrtc | 1268 } // namespace webrtc |
OLD | NEW |