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

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: Addressing pbos@'s comments. Created 4 years, 7 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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 cricket::AudioSource* source) override; 241 cricket::AudioSource* source) override;
242 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override; 242 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override;
243 void SetRawAudioSink(uint32_t ssrc, 243 void SetRawAudioSink(uint32_t ssrc,
244 std::unique_ptr<AudioSinkInterface> sink) override; 244 std::unique_ptr<AudioSinkInterface> sink) override;
245 245
246 RtpParameters GetAudioRtpParameters(uint32_t ssrc) const override; 246 RtpParameters GetAudioRtpParameters(uint32_t ssrc) const override;
247 bool SetAudioRtpParameters(uint32_t ssrc, 247 bool SetAudioRtpParameters(uint32_t ssrc,
248 const RtpParameters& parameters) override; 248 const RtpParameters& parameters) override;
249 249
250 // Implements VideoMediaProviderInterface. 250 // Implements VideoMediaProviderInterface.
251 bool SetSource(
252 uint32_t ssrc,
253 rtc::VideoSourceInterface<cricket::VideoFrame>* source) override;
254 void SetVideoPlayout( 251 void SetVideoPlayout(
255 uint32_t ssrc, 252 uint32_t ssrc,
256 bool enable, 253 bool enable,
257 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override; 254 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
258 void SetVideoSend(uint32_t ssrc, 255 void SetVideoSend(
259 bool enable, 256 uint32_t ssrc,
260 const cricket::VideoOptions* options) override; 257 bool enable,
258 const cricket::VideoOptions* options,
259 rtc::VideoSourceInterface<cricket::VideoFrame>* source) override;
261 260
262 RtpParameters GetVideoRtpParameters(uint32_t ssrc) const override; 261 RtpParameters GetVideoRtpParameters(uint32_t ssrc) const override;
263 bool SetVideoRtpParameters(uint32_t ssrc, 262 bool SetVideoRtpParameters(uint32_t ssrc,
264 const RtpParameters& parameters) override; 263 const RtpParameters& parameters) override;
265 264
266 // Implements DtmfProviderInterface. 265 // Implements DtmfProviderInterface.
267 bool CanInsertDtmf(const std::string& track_id) override; 266 bool CanInsertDtmf(const std::string& track_id) override;
268 bool InsertDtmf(const std::string& track_id, 267 bool InsertDtmf(const std::string& track_id,
269 int code, int duration) override; 268 int code, int duration) override;
270 sigslot::signal0<>* GetOnDestroyedSignal() override; 269 sigslot::signal0<>* GetOnDestroyedSignal() override;
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 PeerConnectionInterface::BundlePolicy bundle_policy_; 509 PeerConnectionInterface::BundlePolicy bundle_policy_;
511 510
512 // Declares the RTCP mux policy for the WebRTCSession. 511 // Declares the RTCP mux policy for the WebRTCSession.
513 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 512 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
514 513
515 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 514 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
516 }; 515 };
517 } // namespace webrtc 516 } // namespace webrtc
518 517
519 #endif // WEBRTC_API_WEBRTCSESSION_H_ 518 #endif // WEBRTC_API_WEBRTCSESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698