| 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 310 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  321   bool first_10ms_data_ GUARDED_BY(acm_crit_sect_); |  321   bool first_10ms_data_ GUARDED_BY(acm_crit_sect_); | 
|  322  |  322  | 
|  323   bool first_frame_ GUARDED_BY(acm_crit_sect_); |  323   bool first_frame_ GUARDED_BY(acm_crit_sect_); | 
|  324   uint32_t last_timestamp_ GUARDED_BY(acm_crit_sect_); |  324   uint32_t last_timestamp_ GUARDED_BY(acm_crit_sect_); | 
|  325   uint32_t last_rtp_timestamp_ GUARDED_BY(acm_crit_sect_); |  325   uint32_t last_rtp_timestamp_ GUARDED_BY(acm_crit_sect_); | 
|  326  |  326  | 
|  327   CriticalSectionWrapper* callback_crit_sect_; |  327   CriticalSectionWrapper* callback_crit_sect_; | 
|  328   AudioPacketizationCallback* packetization_callback_ |  328   AudioPacketizationCallback* packetization_callback_ | 
|  329       GUARDED_BY(callback_crit_sect_); |  329       GUARDED_BY(callback_crit_sect_); | 
|  330   ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); |  330   ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); | 
 |  331  | 
 |  332   RtcEventLog* const event_log_; | 
|  331 }; |  333 }; | 
|  332  |  334  | 
|  333 }  // namespace acm2 |  335 }  // namespace acm2 | 
|  334  |  336  | 
|  335 class AudioCodingImpl : public AudioCoding { |  337 class AudioCodingImpl : public AudioCoding { | 
|  336  public: |  338  public: | 
|  337   AudioCodingImpl(const Config& config); |  339   AudioCodingImpl(const Config& config); | 
|  338   ~AudioCodingImpl() override; |  340   ~AudioCodingImpl() override; | 
|  339  |  341  | 
|  340   bool RegisterSendCodec(AudioEncoder* send_codec) override; |  342   bool RegisterSendCodec(AudioEncoder* send_codec) override; | 
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  400   int playout_frequency_hz_; |  402   int playout_frequency_hz_; | 
|  401   // TODO(henrik.lundin): All members below this line are temporary and should |  403   // TODO(henrik.lundin): All members below this line are temporary and should | 
|  402   // be removed after refactoring is completed. |  404   // be removed after refactoring is completed. | 
|  403   rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_; |  405   rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_; | 
|  404   CodecInst current_send_codec_; |  406   CodecInst current_send_codec_; | 
|  405 }; |  407 }; | 
|  406  |  408  | 
|  407 }  // namespace webrtc |  409 }  // namespace webrtc | 
|  408  |  410  | 
|  409 #endif  // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_ |  411 #endif  // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_ | 
| OLD | NEW |