| 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 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 rtc::Buffer encode_buffer_ GUARDED_BY(acm_crit_sect_); | 244 rtc::Buffer encode_buffer_ GUARDED_BY(acm_crit_sect_); |
| 245 int id_; // TODO(henrik.lundin) Make const. | 245 int id_; // TODO(henrik.lundin) Make const. |
| 246 uint32_t expected_codec_ts_ GUARDED_BY(acm_crit_sect_); | 246 uint32_t expected_codec_ts_ GUARDED_BY(acm_crit_sect_); |
| 247 uint32_t expected_in_ts_ GUARDED_BY(acm_crit_sect_); | 247 uint32_t expected_in_ts_ GUARDED_BY(acm_crit_sect_); |
| 248 ACMResampler resampler_ GUARDED_BY(acm_crit_sect_); | 248 ACMResampler resampler_ GUARDED_BY(acm_crit_sect_); |
| 249 AcmReceiver receiver_; // AcmReceiver has it's own internal lock. | 249 AcmReceiver receiver_; // AcmReceiver has it's own internal lock. |
| 250 ChangeLogger bitrate_logger_ GUARDED_BY(acm_crit_sect_); | 250 ChangeLogger bitrate_logger_ GUARDED_BY(acm_crit_sect_); |
| 251 CodecManager codec_manager_ GUARDED_BY(acm_crit_sect_); | 251 CodecManager codec_manager_ GUARDED_BY(acm_crit_sect_); |
| 252 RentACodec rent_a_codec_ GUARDED_BY(acm_crit_sect_); | 252 RentACodec rent_a_codec_ GUARDED_BY(acm_crit_sect_); |
| 253 | 253 |
| 254 // Last encoder stack obtained from rent_a_codec_.RentEncoderStack. |
| 255 AudioEncoder* encoder_stack_ GUARDED_BY(acm_crit_sect_); |
| 256 |
| 254 // This is to keep track of CN instances where we can send DTMFs. | 257 // This is to keep track of CN instances where we can send DTMFs. |
| 255 uint8_t previous_pltype_ GUARDED_BY(acm_crit_sect_); | 258 uint8_t previous_pltype_ GUARDED_BY(acm_crit_sect_); |
| 256 | 259 |
| 257 // Used when payloads are pushed into ACM without any RTP info | 260 // Used when payloads are pushed into ACM without any RTP info |
| 258 // One example is when pre-encoded bit-stream is pushed from | 261 // One example is when pre-encoded bit-stream is pushed from |
| 259 // a file. | 262 // a file. |
| 260 // IMPORTANT: this variable is only used in IncomingPayload(), therefore, | 263 // IMPORTANT: this variable is only used in IncomingPayload(), therefore, |
| 261 // no lock acquired when interacting with this variable. If it is going to | 264 // no lock acquired when interacting with this variable. If it is going to |
| 262 // be used in other methods, locks need to be taken. | 265 // be used in other methods, locks need to be taken. |
| 263 rtc::scoped_ptr<WebRtcRTPHeader> aux_rtp_header_; | 266 rtc::scoped_ptr<WebRtcRTPHeader> aux_rtp_header_; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 274 mutable rtc::CriticalSection callback_crit_sect_; | 277 mutable rtc::CriticalSection callback_crit_sect_; |
| 275 AudioPacketizationCallback* packetization_callback_ | 278 AudioPacketizationCallback* packetization_callback_ |
| 276 GUARDED_BY(callback_crit_sect_); | 279 GUARDED_BY(callback_crit_sect_); |
| 277 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); | 280 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); |
| 278 }; | 281 }; |
| 279 | 282 |
| 280 } // namespace acm2 | 283 } // namespace acm2 |
| 281 } // namespace webrtc | 284 } // namespace webrtc |
| 282 | 285 |
| 283 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ | 286 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ |
| OLD | NEW |