| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2004 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 | 
| 11 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ | 11 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ | 
| 12 #define WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ | 12 #define WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ | 
| 13 | 13 | 
| 14 #include <map> | 14 #include <map> | 
| 15 #include <memory> | 15 #include <memory> | 
| 16 #include <string> | 16 #include <string> | 
| 17 #include <vector> | 17 #include <vector> | 
| 18 | 18 | 
| 19 #include "webrtc/audio_state.h" | 19 #include "webrtc/api/call/audio_state.h" | 
| 20 #include "webrtc/base/buffer.h" | 20 #include "webrtc/base/buffer.h" | 
| 21 #include "webrtc/base/constructormagic.h" | 21 #include "webrtc/base/constructormagic.h" | 
| 22 #include "webrtc/base/networkroute.h" | 22 #include "webrtc/base/networkroute.h" | 
| 23 #include "webrtc/base/scoped_ref_ptr.h" | 23 #include "webrtc/base/scoped_ref_ptr.h" | 
| 24 #include "webrtc/base/stream.h" | 24 #include "webrtc/base/stream.h" | 
| 25 #include "webrtc/base/thread_checker.h" | 25 #include "webrtc/base/thread_checker.h" | 
| 26 #include "webrtc/call.h" | 26 #include "webrtc/call.h" | 
| 27 #include "webrtc/common.h" | 27 #include "webrtc/common.h" | 
| 28 #include "webrtc/config.h" | 28 #include "webrtc/config.h" | 
| 29 #include "webrtc/media/base/rtputils.h" | 29 #include "webrtc/media/base/rtputils.h" | 
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 296   std::map<uint32_t, WebRtcAudioReceiveStream*> recv_streams_; | 296   std::map<uint32_t, WebRtcAudioReceiveStream*> recv_streams_; | 
| 297   std::vector<webrtc::RtpExtension> recv_rtp_extensions_; | 297   std::vector<webrtc::RtpExtension> recv_rtp_extensions_; | 
| 298 | 298 | 
| 299   SendCodecSpec send_codec_spec_; | 299   SendCodecSpec send_codec_spec_; | 
| 300 | 300 | 
| 301   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel); | 301   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel); | 
| 302 }; | 302 }; | 
| 303 }  // namespace cricket | 303 }  // namespace cricket | 
| 304 | 304 | 
| 305 #endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ | 305 #endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ | 
| OLD | NEW | 
|---|