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

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: Adding TODO. Created 4 years, 6 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/rtpsenderreceiver_unittest.cc ('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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 std::unique_ptr<AudioSinkInterface> sink) override; 245 std::unique_ptr<AudioSinkInterface> sink) override;
246 246
247 RtpParameters GetAudioRtpSendParameters(uint32_t ssrc) const override; 247 RtpParameters GetAudioRtpSendParameters(uint32_t ssrc) const override;
248 bool SetAudioRtpSendParameters(uint32_t ssrc, 248 bool SetAudioRtpSendParameters(uint32_t ssrc,
249 const RtpParameters& parameters) override; 249 const RtpParameters& parameters) override;
250 RtpParameters GetAudioRtpReceiveParameters(uint32_t ssrc) const override; 250 RtpParameters GetAudioRtpReceiveParameters(uint32_t ssrc) const override;
251 bool SetAudioRtpReceiveParameters(uint32_t ssrc, 251 bool SetAudioRtpReceiveParameters(uint32_t ssrc,
252 const RtpParameters& parameters) override; 252 const RtpParameters& parameters) override;
253 253
254 // Implements VideoMediaProviderInterface. 254 // Implements VideoMediaProviderInterface.
255 bool SetSource(
256 uint32_t ssrc,
257 rtc::VideoSourceInterface<cricket::VideoFrame>* source) override;
258 void SetVideoPlayout( 255 void SetVideoPlayout(
259 uint32_t ssrc, 256 uint32_t ssrc,
260 bool enable, 257 bool enable,
261 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override; 258 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
262 void SetVideoSend(uint32_t ssrc, 259 void SetVideoSend(
263 bool enable, 260 uint32_t ssrc,
264 const cricket::VideoOptions* options) override; 261 bool enable,
262 const cricket::VideoOptions* options,
263 rtc::VideoSourceInterface<cricket::VideoFrame>* source) override;
265 264
266 RtpParameters GetVideoRtpSendParameters(uint32_t ssrc) const override; 265 RtpParameters GetVideoRtpSendParameters(uint32_t ssrc) const override;
267 bool SetVideoRtpSendParameters(uint32_t ssrc, 266 bool SetVideoRtpSendParameters(uint32_t ssrc,
268 const RtpParameters& parameters) override; 267 const RtpParameters& parameters) override;
269 RtpParameters GetVideoRtpReceiveParameters(uint32_t ssrc) const override; 268 RtpParameters GetVideoRtpReceiveParameters(uint32_t ssrc) const override;
270 bool SetVideoRtpReceiveParameters(uint32_t ssrc, 269 bool SetVideoRtpReceiveParameters(uint32_t ssrc,
271 const RtpParameters& parameters) override; 270 const RtpParameters& parameters) override;
272 271
273 // Implements DtmfProviderInterface. 272 // Implements DtmfProviderInterface.
274 bool CanInsertDtmf(const std::string& track_id) override; 273 bool CanInsertDtmf(const std::string& track_id) override;
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 PeerConnectionInterface::BundlePolicy bundle_policy_; 525 PeerConnectionInterface::BundlePolicy bundle_policy_;
527 526
528 // Declares the RTCP mux policy for the WebRTCSession. 527 // Declares the RTCP mux policy for the WebRTCSession.
529 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 528 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
530 529
531 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 530 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
532 }; 531 };
533 } // namespace webrtc 532 } // namespace webrtc
534 533
535 #endif // WEBRTC_API_WEBRTCSESSION_H_ 534 #endif // WEBRTC_API_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « webrtc/api/rtpsenderreceiver_unittest.cc ('k') | webrtc/api/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698