Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 31 #include <string> | 31 #include <string> |
| 32 #include <vector> | 32 #include <vector> |
| 33 | 33 |
| 34 #include "talk/app/webrtc/datachannel.h" | 34 #include "talk/app/webrtc/datachannel.h" |
| 35 #include "talk/app/webrtc/dtmfsender.h" | 35 #include "talk/app/webrtc/dtmfsender.h" |
| 36 #include "talk/app/webrtc/mediacontroller.h" | 36 #include "talk/app/webrtc/mediacontroller.h" |
| 37 #include "talk/app/webrtc/mediastreamprovider.h" | 37 #include "talk/app/webrtc/mediastreamprovider.h" |
| 38 #include "talk/app/webrtc/peerconnectioninterface.h" | 38 #include "talk/app/webrtc/peerconnectioninterface.h" |
| 39 #include "talk/app/webrtc/statstypes.h" | 39 #include "talk/app/webrtc/statstypes.h" |
| 40 #include "talk/media/base/mediachannel.h" | 40 #include "talk/media/base/mediachannel.h" |
| 41 #include "webrtc/p2p/base/transportcontroller.h" | |
| 42 #include "talk/session/media/mediasession.h" | 41 #include "talk/session/media/mediasession.h" |
| 43 #include "webrtc/base/sigslot.h" | 42 #include "webrtc/base/sigslot.h" |
| 44 #include "webrtc/base/sslidentity.h" | 43 #include "webrtc/base/sslidentity.h" |
| 45 #include "webrtc/base/thread.h" | 44 #include "webrtc/base/thread.h" |
| 45 #include "webrtc/base/thread_checker.h" | |
|
the sun
2015/12/11 16:32:04
AFAICT no thread checker is used here?
tommi (sloooow) - chröme
2015/12/11 17:51:18
Removed
| |
| 46 #include "webrtc/p2p/base/transportcontroller.h" | |
| 46 | 47 |
| 47 namespace cricket { | 48 namespace cricket { |
| 48 | 49 |
| 49 class ChannelManager; | 50 class ChannelManager; |
| 50 class DataChannel; | 51 class DataChannel; |
| 51 class StatsReport; | 52 class StatsReport; |
| 52 class VideoCapturer; | 53 class VideoCapturer; |
| 53 class VideoChannel; | 54 class VideoChannel; |
| 54 class VoiceChannel; | 55 class VoiceChannel; |
| 55 | 56 |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 243 virtual bool GetLocalTrackIdBySsrc(uint32_t ssrc, std::string* track_id); | 244 virtual bool GetLocalTrackIdBySsrc(uint32_t ssrc, std::string* track_id); |
| 244 virtual bool GetRemoteTrackIdBySsrc(uint32_t ssrc, std::string* track_id); | 245 virtual bool GetRemoteTrackIdBySsrc(uint32_t ssrc, std::string* track_id); |
| 245 | 246 |
| 246 // AudioMediaProviderInterface implementation. | 247 // AudioMediaProviderInterface implementation. |
| 247 void SetAudioPlayout(uint32_t ssrc, bool enable) override; | 248 void SetAudioPlayout(uint32_t ssrc, bool enable) override; |
| 248 void SetAudioSend(uint32_t ssrc, | 249 void SetAudioSend(uint32_t ssrc, |
| 249 bool enable, | 250 bool enable, |
| 250 const cricket::AudioOptions& options, | 251 const cricket::AudioOptions& options, |
| 251 cricket::AudioRenderer* renderer) override; | 252 cricket::AudioRenderer* renderer) override; |
| 252 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override; | 253 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override; |
| 254 void SetRawAudioSink(uint32_t ssrc, | |
| 255 rtc::scoped_ptr<AudioSinkInterface> sink) override; | |
| 253 | 256 |
| 254 // Implements VideoMediaProviderInterface. | 257 // Implements VideoMediaProviderInterface. |
| 255 bool SetCaptureDevice(uint32_t ssrc, cricket::VideoCapturer* camera) override; | 258 bool SetCaptureDevice(uint32_t ssrc, cricket::VideoCapturer* camera) override; |
| 256 void SetVideoPlayout(uint32_t ssrc, | 259 void SetVideoPlayout(uint32_t ssrc, |
| 257 bool enable, | 260 bool enable, |
| 258 cricket::VideoRenderer* renderer) override; | 261 cricket::VideoRenderer* renderer) override; |
| 259 void SetVideoSend(uint32_t ssrc, | 262 void SetVideoSend(uint32_t ssrc, |
| 260 bool enable, | 263 bool enable, |
| 261 const cricket::VideoOptions* options) override; | 264 const cricket::VideoOptions* options) override; |
| 262 | 265 |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 508 PeerConnectionInterface::BundlePolicy bundle_policy_; | 511 PeerConnectionInterface::BundlePolicy bundle_policy_; |
| 509 | 512 |
| 510 // Declares the RTCP mux policy for the WebRTCSession. | 513 // Declares the RTCP mux policy for the WebRTCSession. |
| 511 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; | 514 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; |
| 512 | 515 |
| 513 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); | 516 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); |
| 514 }; | 517 }; |
| 515 } // namespace webrtc | 518 } // namespace webrtc |
| 516 | 519 |
| 517 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ | 520 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ |
| OLD | NEW |