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

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

Issue 1538673002: Adding a MediaStream parameter to createSender. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Just take a string as a parameter, for simplicity. Created 5 years 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 * 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override; 96 rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override;
97 bool AddStream(MediaStreamInterface* local_stream) override; 97 bool AddStream(MediaStreamInterface* local_stream) override;
98 void RemoveStream(MediaStreamInterface* local_stream) override; 98 void RemoveStream(MediaStreamInterface* local_stream) override;
99 99
100 virtual WebRtcSession* session() { return session_.get(); } 100 virtual WebRtcSession* session() { return session_.get(); }
101 101
102 rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender( 102 rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender(
103 AudioTrackInterface* track) override; 103 AudioTrackInterface* track) override;
104 104
105 rtc::scoped_refptr<RtpSenderInterface> CreateSender( 105 rtc::scoped_refptr<RtpSenderInterface> CreateSender(
106 const std::string& kind) override; 106 const std::string& kind,
107 const std::string& stream_id) override;
107 108
108 std::vector<rtc::scoped_refptr<RtpSenderInterface>> GetSenders() 109 std::vector<rtc::scoped_refptr<RtpSenderInterface>> GetSenders()
109 const override; 110 const override;
110 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> GetReceivers() 111 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> GetReceivers()
111 const override; 112 const override;
112 113
113 rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( 114 rtc::scoped_refptr<DataChannelInterface> CreateDataChannel(
114 const std::string& label, 115 const std::string& label,
115 const DataChannelInit* config) override; 116 const DataChannelInit* config) override;
116 bool GetStats(StatsObserver* observer, 117 bool GetStats(StatsObserver* observer,
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 // because its destruction fires signals (such as VoiceChannelDestroyed) 400 // because its destruction fires signals (such as VoiceChannelDestroyed)
400 // which will trigger some final actions in PeerConnection... 401 // which will trigger some final actions in PeerConnection...
401 rtc::scoped_ptr<WebRtcSession> session_; 402 rtc::scoped_ptr<WebRtcSession> session_;
402 // ... But stats_ depends on session_ so it should be destroyed even earlier. 403 // ... But stats_ depends on session_ so it should be destroyed even earlier.
403 rtc::scoped_ptr<StatsCollector> stats_; 404 rtc::scoped_ptr<StatsCollector> stats_;
404 }; 405 };
405 406
406 } // namespace webrtc 407 } // namespace webrtc
407 408
408 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ 409 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/java/src/org/webrtc/PeerConnection.java ('k') | talk/app/webrtc/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698