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

Side by Side Diff: talk/app/webrtc/webrtcsession.h

Issue 1668493002: Replace uses of cricket::VideoRenderer by rtc::VideoSinkInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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 | « talk/app/webrtc/rtpsenderreceiver_unittest.cc ('k') | talk/app/webrtc/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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 void SetAudioSend(uint32_t ssrc, 252 void SetAudioSend(uint32_t ssrc,
253 bool enable, 253 bool enable,
254 const cricket::AudioOptions& options, 254 const cricket::AudioOptions& options,
255 cricket::AudioRenderer* renderer) override; 255 cricket::AudioRenderer* renderer) override;
256 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override; 256 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override;
257 void SetRawAudioSink(uint32_t ssrc, 257 void SetRawAudioSink(uint32_t ssrc,
258 rtc::scoped_ptr<AudioSinkInterface> sink) override; 258 rtc::scoped_ptr<AudioSinkInterface> sink) override;
259 259
260 // Implements VideoMediaProviderInterface. 260 // Implements VideoMediaProviderInterface.
261 bool SetCaptureDevice(uint32_t ssrc, cricket::VideoCapturer* camera) override; 261 bool SetCaptureDevice(uint32_t ssrc, cricket::VideoCapturer* camera) override;
262 void SetVideoPlayout(uint32_t ssrc, 262 void SetVideoPlayout(
263 bool enable, 263 uint32_t ssrc,
264 cricket::VideoRenderer* renderer) override; 264 bool enable,
265 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
265 void SetVideoSend(uint32_t ssrc, 266 void SetVideoSend(uint32_t ssrc,
266 bool enable, 267 bool enable,
267 const cricket::VideoOptions* options) override; 268 const cricket::VideoOptions* options) override;
268 269
269 // Implements DtmfProviderInterface. 270 // Implements DtmfProviderInterface.
270 virtual bool CanInsertDtmf(const std::string& track_id); 271 virtual bool CanInsertDtmf(const std::string& track_id);
271 virtual bool InsertDtmf(const std::string& track_id, 272 virtual bool InsertDtmf(const std::string& track_id,
272 int code, int duration); 273 int code, int duration);
273 virtual sigslot::signal0<>* GetOnDestroyedSignal(); 274 virtual sigslot::signal0<>* GetOnDestroyedSignal();
274 275
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 PeerConnectionInterface::BundlePolicy bundle_policy_; 517 PeerConnectionInterface::BundlePolicy bundle_policy_;
517 518
518 // Declares the RTCP mux policy for the WebRTCSession. 519 // Declares the RTCP mux policy for the WebRTCSession.
519 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 520 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
520 521
521 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 522 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
522 }; 523 };
523 } // namespace webrtc 524 } // namespace webrtc
524 525
525 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ 526 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/rtpsenderreceiver_unittest.cc ('k') | talk/app/webrtc/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698