| 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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 int EnableOpusDtx() override; | 228 int EnableOpusDtx() override; |
| 229 | 229 |
| 230 int DisableOpusDtx() override; | 230 int DisableOpusDtx() override; |
| 231 | 231 |
| 232 int UnregisterReceiveCodec(uint8_t payload_type) override; | 232 int UnregisterReceiveCodec(uint8_t payload_type) override; |
| 233 | 233 |
| 234 int EnableNack(size_t max_nack_list_size) override; | 234 int EnableNack(size_t max_nack_list_size) override; |
| 235 | 235 |
| 236 void DisableNack() override; | 236 void DisableNack() override; |
| 237 | 237 |
| 238 void SetEventLog(RtcEventLog* event_log) override; |
| 239 |
| 238 std::vector<uint16_t> GetNackList(int64_t round_trip_time_ms) const override; | 240 std::vector<uint16_t> GetNackList(int64_t round_trip_time_ms) const override; |
| 239 | 241 |
| 240 void GetDecodingCallStatistics(AudioDecodingCallStats* stats) const override; | 242 void GetDecodingCallStatistics(AudioDecodingCallStats* stats) const override; |
| 241 | 243 |
| 242 private: | 244 private: |
| 243 struct InputData { | 245 struct InputData { |
| 244 uint32_t input_timestamp; | 246 uint32_t input_timestamp; |
| 245 const int16_t* audio; | 247 const int16_t* audio; |
| 246 uint16_t length_per_channel; | 248 uint16_t length_per_channel; |
| 247 uint8_t audio_channel; | 249 uint8_t audio_channel; |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 bool first_10ms_data_ GUARDED_BY(acm_crit_sect_); | 323 bool first_10ms_data_ GUARDED_BY(acm_crit_sect_); |
| 322 | 324 |
| 323 bool first_frame_ GUARDED_BY(acm_crit_sect_); | 325 bool first_frame_ GUARDED_BY(acm_crit_sect_); |
| 324 uint32_t last_timestamp_ GUARDED_BY(acm_crit_sect_); | 326 uint32_t last_timestamp_ GUARDED_BY(acm_crit_sect_); |
| 325 uint32_t last_rtp_timestamp_ GUARDED_BY(acm_crit_sect_); | 327 uint32_t last_rtp_timestamp_ GUARDED_BY(acm_crit_sect_); |
| 326 | 328 |
| 327 CriticalSectionWrapper* callback_crit_sect_; | 329 CriticalSectionWrapper* callback_crit_sect_; |
| 328 AudioPacketizationCallback* packetization_callback_ | 330 AudioPacketizationCallback* packetization_callback_ |
| 329 GUARDED_BY(callback_crit_sect_); | 331 GUARDED_BY(callback_crit_sect_); |
| 330 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); | 332 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); |
| 333 |
| 334 CriticalSectionWrapper* event_log_ptr_crit_sect_; |
| 335 RtcEventLog* event_log_ GUARDED_BY(event_log_ptr_crit_sect_); |
| 331 }; | 336 }; |
| 332 | 337 |
| 333 } // namespace acm2 | 338 } // namespace acm2 |
| 334 | 339 |
| 335 class AudioCodingImpl : public AudioCoding { | 340 class AudioCodingImpl : public AudioCoding { |
| 336 public: | 341 public: |
| 337 AudioCodingImpl(const Config& config); | 342 AudioCodingImpl(const Config& config); |
| 338 ~AudioCodingImpl() override; | 343 ~AudioCodingImpl() override; |
| 339 | 344 |
| 340 bool RegisterSendCodec(AudioEncoder* send_codec) override; | 345 bool RegisterSendCodec(AudioEncoder* send_codec) override; |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 int playout_frequency_hz_; | 405 int playout_frequency_hz_; |
| 401 // TODO(henrik.lundin): All members below this line are temporary and should | 406 // TODO(henrik.lundin): All members below this line are temporary and should |
| 402 // be removed after refactoring is completed. | 407 // be removed after refactoring is completed. |
| 403 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_; | 408 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_; |
| 404 CodecInst current_send_codec_; | 409 CodecInst current_send_codec_; |
| 405 }; | 410 }; |
| 406 | 411 |
| 407 } // namespace webrtc | 412 } // namespace webrtc |
| 408 | 413 |
| 409 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_ | 414 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_ |
| OLD | NEW |