Chromium Code Reviews| 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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 268 std::unique_ptr<EncoderFactory> encoder_factory_ GUARDED_BY(acm_crit_sect_); | 268 std::unique_ptr<EncoderFactory> encoder_factory_ GUARDED_BY(acm_crit_sect_); |
| 269 | 269 |
| 270 // Current encoder stack, either obtained from | 270 // Current encoder stack, either obtained from |
| 271 // encoder_factory_->rent_a_codec.RentEncoderStack or provided by a call to | 271 // encoder_factory_->rent_a_codec.RentEncoderStack or provided by a call to |
| 272 // RegisterEncoder. | 272 // RegisterEncoder. |
| 273 std::unique_ptr<AudioEncoder> encoder_stack_ GUARDED_BY(acm_crit_sect_); | 273 std::unique_ptr<AudioEncoder> encoder_stack_ GUARDED_BY(acm_crit_sect_); |
| 274 | 274 |
| 275 std::unique_ptr<AudioDecoder> isac_decoder_16k_ GUARDED_BY(acm_crit_sect_); | 275 std::unique_ptr<AudioDecoder> isac_decoder_16k_ GUARDED_BY(acm_crit_sect_); |
| 276 std::unique_ptr<AudioDecoder> isac_decoder_32k_ GUARDED_BY(acm_crit_sect_); | 276 std::unique_ptr<AudioDecoder> isac_decoder_32k_ GUARDED_BY(acm_crit_sect_); |
| 277 | 277 |
| 278 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; | |
|
ossu
2016/05/19 16:08:48
This is already removed by patch set 3 of https://
kwiberg-webrtc
2016/05/30 10:04:27
Acknowledged.
| |
| 279 | |
| 280 // This is to keep track of CN instances where we can send DTMFs. | 278 // This is to keep track of CN instances where we can send DTMFs. |
| 281 uint8_t previous_pltype_ GUARDED_BY(acm_crit_sect_); | 279 uint8_t previous_pltype_ GUARDED_BY(acm_crit_sect_); |
| 282 | 280 |
| 283 // Used when payloads are pushed into ACM without any RTP info | 281 // Used when payloads are pushed into ACM without any RTP info |
| 284 // One example is when pre-encoded bit-stream is pushed from | 282 // One example is when pre-encoded bit-stream is pushed from |
| 285 // a file. | 283 // a file. |
| 286 // IMPORTANT: this variable is only used in IncomingPayload(), therefore, | 284 // IMPORTANT: this variable is only used in IncomingPayload(), therefore, |
| 287 // no lock acquired when interacting with this variable. If it is going to | 285 // no lock acquired when interacting with this variable. If it is going to |
| 288 // be used in other methods, locks need to be taken. | 286 // be used in other methods, locks need to be taken. |
| 289 std::unique_ptr<WebRtcRTPHeader> aux_rtp_header_; | 287 std::unique_ptr<WebRtcRTPHeader> aux_rtp_header_; |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 304 | 302 |
| 305 int codec_histogram_bins_log_[static_cast<size_t>( | 303 int codec_histogram_bins_log_[static_cast<size_t>( |
| 306 AudioEncoder::CodecType::kMaxLoggedAudioCodecTypes)]; | 304 AudioEncoder::CodecType::kMaxLoggedAudioCodecTypes)]; |
| 307 int number_of_consecutive_empty_packets_; | 305 int number_of_consecutive_empty_packets_; |
| 308 }; | 306 }; |
| 309 | 307 |
| 310 } // namespace acm2 | 308 } // namespace acm2 |
| 311 } // namespace webrtc | 309 } // namespace webrtc |
| 312 | 310 |
| 313 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ | 311 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ |
| OLD | NEW |