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

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

Issue 1426443007: Revert of Adding the ability to create an RtpSender without a track. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 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
« no previous file with comments | « talk/app/webrtc/peerconnectioninterface_unittest.cc ('k') | talk/app/webrtc/rtpsender.h » ('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 25 matching lines...) Expand all
36 // Define proxy for PeerConnectionInterface. 36 // Define proxy for PeerConnectionInterface.
37 BEGIN_PROXY_MAP(PeerConnection) 37 BEGIN_PROXY_MAP(PeerConnection)
38 PROXY_METHOD0(rtc::scoped_refptr<StreamCollectionInterface>, 38 PROXY_METHOD0(rtc::scoped_refptr<StreamCollectionInterface>,
39 local_streams) 39 local_streams)
40 PROXY_METHOD0(rtc::scoped_refptr<StreamCollectionInterface>, 40 PROXY_METHOD0(rtc::scoped_refptr<StreamCollectionInterface>,
41 remote_streams) 41 remote_streams)
42 PROXY_METHOD1(bool, AddStream, MediaStreamInterface*) 42 PROXY_METHOD1(bool, AddStream, MediaStreamInterface*)
43 PROXY_METHOD1(void, RemoveStream, MediaStreamInterface*) 43 PROXY_METHOD1(void, RemoveStream, MediaStreamInterface*)
44 PROXY_METHOD1(rtc::scoped_refptr<DtmfSenderInterface>, 44 PROXY_METHOD1(rtc::scoped_refptr<DtmfSenderInterface>,
45 CreateDtmfSender, AudioTrackInterface*) 45 CreateDtmfSender, AudioTrackInterface*)
46 PROXY_METHOD1(rtc::scoped_refptr<RtpSenderInterface>,
47 CreateSender,
48 const std::string&)
49 PROXY_CONSTMETHOD0(std::vector<rtc::scoped_refptr<RtpSenderInterface>>, 46 PROXY_CONSTMETHOD0(std::vector<rtc::scoped_refptr<RtpSenderInterface>>,
50 GetSenders) 47 GetSenders)
51 PROXY_CONSTMETHOD0(std::vector<rtc::scoped_refptr<RtpReceiverInterface>>, 48 PROXY_CONSTMETHOD0(std::vector<rtc::scoped_refptr<RtpReceiverInterface>>,
52 GetReceivers) 49 GetReceivers)
53 PROXY_METHOD3(bool, GetStats, StatsObserver*, 50 PROXY_METHOD3(bool, GetStats, StatsObserver*,
54 MediaStreamTrackInterface*, 51 MediaStreamTrackInterface*,
55 StatsOutputLevel) 52 StatsOutputLevel)
56 PROXY_METHOD2(rtc::scoped_refptr<DataChannelInterface>, 53 PROXY_METHOD2(rtc::scoped_refptr<DataChannelInterface>,
57 CreateDataChannel, const std::string&, const DataChannelInit*) 54 CreateDataChannel, const std::string&, const DataChannelInit*)
58 PROXY_CONSTMETHOD0(const SessionDescriptionInterface*, local_description) 55 PROXY_CONSTMETHOD0(const SessionDescriptionInterface*, local_description)
(...skipping 14 matching lines...) Expand all
73 PROXY_METHOD0(SignalingState, signaling_state) 70 PROXY_METHOD0(SignalingState, signaling_state)
74 PROXY_METHOD0(IceState, ice_state) 71 PROXY_METHOD0(IceState, ice_state)
75 PROXY_METHOD0(IceConnectionState, ice_connection_state) 72 PROXY_METHOD0(IceConnectionState, ice_connection_state)
76 PROXY_METHOD0(IceGatheringState, ice_gathering_state) 73 PROXY_METHOD0(IceGatheringState, ice_gathering_state)
77 PROXY_METHOD0(void, Close) 74 PROXY_METHOD0(void, Close)
78 END_PROXY() 75 END_PROXY()
79 76
80 } // namespace webrtc 77 } // namespace webrtc
81 78
82 #endif // TALK_APP_WEBRTC_PEERCONNECTIONPROXY_H_ 79 #endif // TALK_APP_WEBRTC_PEERCONNECTIONPROXY_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/peerconnectioninterface_unittest.cc ('k') | talk/app/webrtc/rtpsender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698