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

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

Issue 1838413002: Combining SetVideoSend and SetSource into one method. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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
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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 cricket::AudioSource* source) override; 243 cricket::AudioSource* source) override;
244 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override; 244 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override;
245 void SetRawAudioSink(uint32_t ssrc, 245 void SetRawAudioSink(uint32_t ssrc,
246 rtc::scoped_ptr<AudioSinkInterface> sink) override; 246 rtc::scoped_ptr<AudioSinkInterface> sink) override;
247 247
248 RtpParameters GetAudioRtpParameters(uint32_t ssrc) const override; 248 RtpParameters GetAudioRtpParameters(uint32_t ssrc) const override;
249 bool SetAudioRtpParameters(uint32_t ssrc, 249 bool SetAudioRtpParameters(uint32_t ssrc,
250 const RtpParameters& parameters) override; 250 const RtpParameters& parameters) override;
251 251
252 // Implements VideoMediaProviderInterface. 252 // Implements VideoMediaProviderInterface.
253 bool SetCaptureDevice(uint32_t ssrc, cricket::VideoCapturer* camera) override;
254 void SetVideoPlayout( 253 void SetVideoPlayout(
255 uint32_t ssrc, 254 uint32_t ssrc,
256 bool enable, 255 bool enable,
257 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override; 256 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
258 void SetVideoSend(uint32_t ssrc, 257 void SetVideoSend(uint32_t ssrc,
259 bool enable, 258 bool enable,
260 const cricket::VideoOptions* options) override; 259 const cricket::VideoOptions* options,
260 cricket::VideoCapturer* camera) override;
261 261
262 RtpParameters GetVideoRtpParameters(uint32_t ssrc) const override; 262 RtpParameters GetVideoRtpParameters(uint32_t ssrc) const override;
263 bool SetVideoRtpParameters(uint32_t ssrc, 263 bool SetVideoRtpParameters(uint32_t ssrc,
264 const RtpParameters& parameters) override; 264 const RtpParameters& parameters) override;
265 265
266 // Implements DtmfProviderInterface. 266 // Implements DtmfProviderInterface.
267 virtual bool CanInsertDtmf(const std::string& track_id); 267 virtual bool CanInsertDtmf(const std::string& track_id);
268 virtual bool InsertDtmf(const std::string& track_id, 268 virtual bool InsertDtmf(const std::string& track_id,
269 int code, int duration); 269 int code, int duration);
270 virtual sigslot::signal0<>* GetOnDestroyedSignal(); 270 virtual sigslot::signal0<>* GetOnDestroyedSignal();
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 PeerConnectionInterface::BundlePolicy bundle_policy_; 513 PeerConnectionInterface::BundlePolicy bundle_policy_;
514 514
515 // Declares the RTCP mux policy for the WebRTCSession. 515 // Declares the RTCP mux policy for the WebRTCSession.
516 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 516 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
517 517
518 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 518 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
519 }; 519 };
520 } // namespace webrtc 520 } // namespace webrtc
521 521
522 #endif // WEBRTC_API_WEBRTCSESSION_H_ 522 #endif // WEBRTC_API_WEBRTCSESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698