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

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

Issue 1398823003: Remove MediaChannel::SetRemoteRenderer(). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 2 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 } 195 }
196 const cricket::SessionDescription* base_remote_description() const { 196 const cricket::SessionDescription* base_remote_description() const {
197 return BaseSession::remote_description(); 197 return BaseSession::remote_description();
198 } 198 }
199 199
200 // Get the id used as a media stream track's "id" field from ssrc. 200 // Get the id used as a media stream track's "id" field from ssrc.
201 virtual bool GetLocalTrackIdBySsrc(uint32_t ssrc, std::string* track_id); 201 virtual bool GetLocalTrackIdBySsrc(uint32_t ssrc, std::string* track_id);
202 virtual bool GetRemoteTrackIdBySsrc(uint32_t ssrc, std::string* track_id); 202 virtual bool GetRemoteTrackIdBySsrc(uint32_t ssrc, std::string* track_id);
203 203
204 // AudioMediaProviderInterface implementation. 204 // AudioMediaProviderInterface implementation.
205 void SetAudioPlayout(uint32_t ssrc, 205 void SetAudioPlayout(uint32_t ssrc, bool enable) override;
206 bool enable,
207 cricket::AudioRenderer* renderer) override;
208 void SetAudioSend(uint32_t ssrc, 206 void SetAudioSend(uint32_t ssrc,
209 bool enable, 207 bool enable,
210 const cricket::AudioOptions& options, 208 const cricket::AudioOptions& options,
211 cricket::AudioRenderer* renderer) override; 209 cricket::AudioRenderer* renderer) override;
212 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override; 210 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override;
213 211
214 // Implements VideoMediaProviderInterface. 212 // Implements VideoMediaProviderInterface.
215 bool SetCaptureDevice(uint32_t ssrc, cricket::VideoCapturer* camera) override; 213 bool SetCaptureDevice(uint32_t ssrc, cricket::VideoCapturer* camera) override;
216 void SetVideoPlayout(uint32_t ssrc, 214 void SetVideoPlayout(uint32_t ssrc,
217 bool enable, 215 bool enable,
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 PeerConnectionInterface::BundlePolicy bundle_policy_; 423 PeerConnectionInterface::BundlePolicy bundle_policy_;
426 424
427 // Declares the RTCP mux policy for the WebRTCSession. 425 // Declares the RTCP mux policy for the WebRTCSession.
428 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 426 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
429 427
430 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 428 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
431 }; 429 };
432 } // namespace webrtc 430 } // namespace webrtc
433 431
434 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ 432 #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