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

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

Issue 1588693002: Revert of Storing raw audio sink for default audio track. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 virtual bool GetLocalTrackIdBySsrc(uint32_t ssrc, std::string* track_id); 243 virtual bool GetLocalTrackIdBySsrc(uint32_t ssrc, std::string* track_id);
244 virtual bool GetRemoteTrackIdBySsrc(uint32_t ssrc, std::string* track_id); 244 virtual bool GetRemoteTrackIdBySsrc(uint32_t ssrc, std::string* track_id);
245 245
246 // AudioMediaProviderInterface implementation. 246 // AudioMediaProviderInterface implementation.
247 void SetAudioPlayout(uint32_t ssrc, bool enable) override; 247 void SetAudioPlayout(uint32_t ssrc, bool enable) override;
248 void SetAudioSend(uint32_t ssrc, 248 void SetAudioSend(uint32_t ssrc,
249 bool enable, 249 bool enable,
250 const cricket::AudioOptions& options, 250 const cricket::AudioOptions& options,
251 cricket::AudioRenderer* renderer) override; 251 cricket::AudioRenderer* renderer) override;
252 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override; 252 void SetAudioPlayoutVolume(uint32_t ssrc, double volume) override;
253 void SetRawAudioSink( 253 void SetRawAudioSink(uint32_t ssrc,
254 uint32_t ssrc, 254 rtc::scoped_ptr<AudioSinkInterface> sink) override;
255 const rtc::scoped_refptr<AudioSinkInterface>& sink) override;
256 255
257 // Implements VideoMediaProviderInterface. 256 // Implements VideoMediaProviderInterface.
258 bool SetCaptureDevice(uint32_t ssrc, cricket::VideoCapturer* camera) override; 257 bool SetCaptureDevice(uint32_t ssrc, cricket::VideoCapturer* camera) override;
259 void SetVideoPlayout(uint32_t ssrc, 258 void SetVideoPlayout(uint32_t ssrc,
260 bool enable, 259 bool enable,
261 cricket::VideoRenderer* renderer) override; 260 cricket::VideoRenderer* renderer) override;
262 void SetVideoSend(uint32_t ssrc, 261 void SetVideoSend(uint32_t ssrc,
263 bool enable, 262 bool enable,
264 const cricket::VideoOptions* options) override; 263 const cricket::VideoOptions* options) override;
265 264
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 PeerConnectionInterface::BundlePolicy bundle_policy_; 510 PeerConnectionInterface::BundlePolicy bundle_policy_;
512 511
513 // Declares the RTCP mux policy for the WebRTCSession. 512 // Declares the RTCP mux policy for the WebRTCSession.
514 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 513 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
515 514
516 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 515 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
517 }; 516 };
518 } // namespace webrtc 517 } // namespace webrtc
519 518
520 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ 519 #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