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

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: Rebased, no longer any proxy object changes. Created 4 years, 8 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
« no previous file with comments | « webrtc/api/videotracksource.h ('k') | webrtc/api/webrtcsession.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 16 matching lines...) Expand all
27 #include "webrtc/media/base/mediachannel.h" 27 #include "webrtc/media/base/mediachannel.h"
28 #include "webrtc/p2p/base/candidate.h" 28 #include "webrtc/p2p/base/candidate.h"
29 #include "webrtc/p2p/base/transportcontroller.h" 29 #include "webrtc/p2p/base/transportcontroller.h"
30 #include "webrtc/pc/mediasession.h" 30 #include "webrtc/pc/mediasession.h"
31 31
32 namespace cricket { 32 namespace cricket {
33 33
34 class ChannelManager; 34 class ChannelManager;
35 class DataChannel; 35 class DataChannel;
36 class StatsReport; 36 class StatsReport;
37 class VideoCapturer;
38 class VideoChannel; 37 class VideoChannel;
39 class VoiceChannel; 38 class VoiceChannel;
40 39
41 } // namespace cricket 40 } // namespace cricket
42 41
43 namespace webrtc { 42 namespace webrtc {
44 43
45 class IceRestartAnswerLatch; 44 class IceRestartAnswerLatch;
46 class JsepIceCandidate; 45 class JsepIceCandidate;
47 class MediaStreamSignaling; 46 class MediaStreamSignaling;
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 cricket::AudioSource* source) override; 242 cricket::AudioSource* source) override;
244 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override; 243 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override;
245 void SetRawAudioSink(uint32_t ssrc, 244 void SetRawAudioSink(uint32_t ssrc,
246 rtc::scoped_ptr<AudioSinkInterface> sink) override; 245 rtc::scoped_ptr<AudioSinkInterface> sink) override;
247 246
248 RtpParameters GetAudioRtpParameters(uint32_t ssrc) const override; 247 RtpParameters GetAudioRtpParameters(uint32_t ssrc) const override;
249 bool SetAudioRtpParameters(uint32_t ssrc, 248 bool SetAudioRtpParameters(uint32_t ssrc,
250 const RtpParameters& parameters) override; 249 const RtpParameters& parameters) override;
251 250
252 // Implements VideoMediaProviderInterface. 251 // Implements VideoMediaProviderInterface.
253 bool SetCaptureDevice(uint32_t ssrc, cricket::VideoCapturer* camera) override; 252 bool SetSource(
253 uint32_t ssrc,
254 rtc::VideoSourceInterface<cricket::VideoFrame>* source) override;
254 void SetVideoPlayout( 255 void SetVideoPlayout(
255 uint32_t ssrc, 256 uint32_t ssrc,
256 bool enable, 257 bool enable,
257 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override; 258 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
258 void SetVideoSend(uint32_t ssrc, 259 void SetVideoSend(uint32_t ssrc,
259 bool enable, 260 bool enable,
260 const cricket::VideoOptions* options) override; 261 const cricket::VideoOptions* options) override;
261 262
262 RtpParameters GetVideoRtpParameters(uint32_t ssrc) const override; 263 RtpParameters GetVideoRtpParameters(uint32_t ssrc) const override;
263 bool SetVideoRtpParameters(uint32_t ssrc, 264 bool SetVideoRtpParameters(uint32_t ssrc,
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 PeerConnectionInterface::BundlePolicy bundle_policy_; 514 PeerConnectionInterface::BundlePolicy bundle_policy_;
514 515
515 // Declares the RTCP mux policy for the WebRTCSession. 516 // Declares the RTCP mux policy for the WebRTCSession.
516 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 517 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
517 518
518 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 519 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
519 }; 520 };
520 } // namespace webrtc 521 } // namespace webrtc
521 522
522 #endif // WEBRTC_API_WEBRTCSESSION_H_ 523 #endif // WEBRTC_API_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « webrtc/api/videotracksource.h ('k') | webrtc/api/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698