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

Side by Side Diff: webrtc/examples/peerconnection/client/conductor.h

Issue 2505173002: Added a callback function OnAddTrack to PeerConnectionObserver (Closed)
Patch Set: Simple change on java and obj-c. Created 4 years, 1 month 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 * 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
11 #ifndef WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ 11 #ifndef WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_
12 #define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ 12 #define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_
13 #pragma once 13 #pragma once
14 14
15 #include <deque> 15 #include <deque>
16 #include <map> 16 #include <map>
17 #include <set> 17 #include <set>
18 #include <string> 18 #include <string>
19 #include <vector>
19 20
20 #include "webrtc/api/mediastreaminterface.h" 21 #include "webrtc/api/mediastreaminterface.h"
21 #include "webrtc/api/peerconnectioninterface.h" 22 #include "webrtc/api/peerconnectioninterface.h"
22 #include "webrtc/examples/peerconnection/client/main_wnd.h" 23 #include "webrtc/examples/peerconnection/client/main_wnd.h"
23 #include "webrtc/examples/peerconnection/client/peer_connection_client.h" 24 #include "webrtc/examples/peerconnection/client/peer_connection_client.h"
24 25
25 namespace webrtc { 26 namespace webrtc {
26 class VideoCaptureModule; 27 class VideoCaptureModule;
27 } // namespace webrtc 28 } // namespace webrtc
28 29
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) override; 73 rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) override;
73 void OnDataChannel( 74 void OnDataChannel(
74 rtc::scoped_refptr<webrtc::DataChannelInterface> channel) override {} 75 rtc::scoped_refptr<webrtc::DataChannelInterface> channel) override {}
75 void OnRenegotiationNeeded() override {} 76 void OnRenegotiationNeeded() override {}
76 void OnIceConnectionChange( 77 void OnIceConnectionChange(
77 webrtc::PeerConnectionInterface::IceConnectionState new_state) override{}; 78 webrtc::PeerConnectionInterface::IceConnectionState new_state) override{};
78 void OnIceGatheringChange( 79 void OnIceGatheringChange(
79 webrtc::PeerConnectionInterface::IceGatheringState new_state) override{}; 80 webrtc::PeerConnectionInterface::IceGatheringState new_state) override{};
80 void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override; 81 void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override;
81 void OnIceConnectionReceivingChange(bool receiving) override {} 82 void OnIceConnectionReceivingChange(bool receiving) override {}
83 void OnAddTrack(rtc::scoped_refptr<webrtc::RtpReceiverInterface> receiver,
84 std::vector<rtc::scoped_refptr<webrtc::MediaStreamInterface>>
85 streams) override {}
82 86
83 // 87 //
84 // PeerConnectionClientObserver implementation. 88 // PeerConnectionClientObserver implementation.
85 // 89 //
86 90
87 virtual void OnSignedIn(); 91 virtual void OnSignedIn();
88 92
89 virtual void OnDisconnected(); 93 virtual void OnDisconnected();
90 94
91 virtual void OnPeerConnected(int id, const std::string& name); 95 virtual void OnPeerConnected(int id, const std::string& name);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 peer_connection_factory_; 131 peer_connection_factory_;
128 PeerConnectionClient* client_; 132 PeerConnectionClient* client_;
129 MainWindow* main_wnd_; 133 MainWindow* main_wnd_;
130 std::deque<std::string*> pending_messages_; 134 std::deque<std::string*> pending_messages_;
131 std::map<std::string, rtc::scoped_refptr<webrtc::MediaStreamInterface> > 135 std::map<std::string, rtc::scoped_refptr<webrtc::MediaStreamInterface> >
132 active_streams_; 136 active_streams_;
133 std::string server_; 137 std::string server_;
134 }; 138 };
135 139
136 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ 140 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698