Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Side by Side Diff: webrtc/api/webrtcsession.h

Issue 1766653002: Replace SetCapturer and SetCaptureDevice by SetSource. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Make SetSource tolerate unknown ssrc and source == NULL. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 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 15 matching lines...) Expand all
26 #include "webrtc/base/thread.h" 26 #include "webrtc/base/thread.h"
27 #include "webrtc/media/base/mediachannel.h" 27 #include "webrtc/media/base/mediachannel.h"
28 #include "webrtc/p2p/base/transportcontroller.h" 28 #include "webrtc/p2p/base/transportcontroller.h"
29 #include "webrtc/pc/mediasession.h" 29 #include "webrtc/pc/mediasession.h"
30 30
31 namespace cricket { 31 namespace cricket {
32 32
33 class ChannelManager; 33 class ChannelManager;
34 class DataChannel; 34 class DataChannel;
35 class StatsReport; 35 class StatsReport;
36 class VideoCapturer;
37 class VideoChannel; 36 class VideoChannel;
38 class VoiceChannel; 37 class VoiceChannel;
39 38
40 } // namespace cricket 39 } // namespace cricket
41 40
42 namespace webrtc { 41 namespace webrtc {
43 42
44 class IceRestartAnswerLatch; 43 class IceRestartAnswerLatch;
45 class JsepIceCandidate; 44 class JsepIceCandidate;
46 class MediaStreamSignaling; 45 class MediaStreamSignaling;
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 void SetAudioPlayout(uint32_t ssrc, bool enable) override; 232 void SetAudioPlayout(uint32_t ssrc, bool enable) override;
234 void SetAudioSend(uint32_t ssrc, 233 void SetAudioSend(uint32_t ssrc,
235 bool enable, 234 bool enable,
236 const cricket::AudioOptions& options, 235 const cricket::AudioOptions& options,
237 cricket::AudioRenderer* renderer) override; 236 cricket::AudioRenderer* renderer) override;
238 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override; 237 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override;
239 void SetRawAudioSink(uint32_t ssrc, 238 void SetRawAudioSink(uint32_t ssrc,
240 rtc::scoped_ptr<AudioSinkInterface> sink) override; 239 rtc::scoped_ptr<AudioSinkInterface> sink) override;
241 240
242 // Implements VideoMediaProviderInterface. 241 // Implements VideoMediaProviderInterface.
243 bool SetCaptureDevice(uint32_t ssrc, cricket::VideoCapturer* camera) override; 242 bool SetSource(
243 uint32_t ssrc,
244 rtc::VideoSourceInterface<cricket::VideoFrame>* source) override;
244 void SetVideoPlayout( 245 void SetVideoPlayout(
245 uint32_t ssrc, 246 uint32_t ssrc,
246 bool enable, 247 bool enable,
247 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override; 248 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
248 void SetVideoSend(uint32_t ssrc, 249 void SetVideoSend(uint32_t ssrc,
249 bool enable, 250 bool enable,
250 const cricket::VideoOptions* options) override; 251 const cricket::VideoOptions* options) override;
251 252
252 // Implements DtmfProviderInterface. 253 // Implements DtmfProviderInterface.
253 virtual bool CanInsertDtmf(const std::string& track_id); 254 virtual bool CanInsertDtmf(const std::string& track_id);
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 PeerConnectionInterface::BundlePolicy bundle_policy_; 498 PeerConnectionInterface::BundlePolicy bundle_policy_;
498 499
499 // Declares the RTCP mux policy for the WebRTCSession. 500 // Declares the RTCP mux policy for the WebRTCSession.
500 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 501 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
501 502
502 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 503 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
503 }; 504 };
504 } // namespace webrtc 505 } // namespace webrtc
505 506
506 #endif // WEBRTC_API_WEBRTCSESSION_H_ 507 #endif // WEBRTC_API_WEBRTCSESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698