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

Side by Side Diff: webrtc/media/base/rtpdataengine.h

Issue 2564333002: Reland of: Separating SCTP code from BaseChannel/MediaChannel. (Closed)
Patch Set: Merge with master. Created 3 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 | « webrtc/media/base/mediaengine.h ('k') | webrtc/media/base/rtpdataengine.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 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 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_MEDIA_BASE_RTPDATAENGINE_H_ 11 #ifndef WEBRTC_MEDIA_BASE_RTPDATAENGINE_H_
12 #define WEBRTC_MEDIA_BASE_RTPDATAENGINE_H_ 12 #define WEBRTC_MEDIA_BASE_RTPDATAENGINE_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <string> 15 #include <string>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/media/base/mediachannel.h" 18 #include "webrtc/media/base/mediachannel.h"
19 #include "webrtc/media/base/mediaconstants.h" 19 #include "webrtc/media/base/mediaconstants.h"
20 #include "webrtc/media/base/mediaengine.h" 20 #include "webrtc/media/base/mediaengine.h"
21 21
22 namespace cricket { 22 namespace cricket {
23 23
24 struct DataCodec; 24 struct DataCodec;
25 25
26 class RtpDataEngine : public DataEngineInterface { 26 class RtpDataEngine : public DataEngineInterface {
27 public: 27 public:
28 RtpDataEngine(); 28 RtpDataEngine();
29 29
30 virtual DataMediaChannel* CreateChannel(DataChannelType data_channel_type, 30 virtual DataMediaChannel* CreateChannel(const MediaConfig& config);
31 const MediaConfig& config);
32 31
33 virtual const std::vector<DataCodec>& data_codecs() { 32 virtual const std::vector<DataCodec>& data_codecs() {
34 return data_codecs_; 33 return data_codecs_;
35 } 34 }
36 35
37 private: 36 private:
38 std::vector<DataCodec> data_codecs_; 37 std::vector<DataCodec> data_codecs_;
39 }; 38 };
40 39
41 // Keep track of sequence number and timestamp of an RTP stream. The 40 // Keep track of sequence number and timestamp of an RTP stream. The
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 std::vector<DataCodec> recv_codecs_; 102 std::vector<DataCodec> recv_codecs_;
104 std::vector<StreamParams> send_streams_; 103 std::vector<StreamParams> send_streams_;
105 std::vector<StreamParams> recv_streams_; 104 std::vector<StreamParams> recv_streams_;
106 std::map<uint32_t, RtpClock*> rtp_clock_by_send_ssrc_; 105 std::map<uint32_t, RtpClock*> rtp_clock_by_send_ssrc_;
107 std::unique_ptr<rtc::RateLimiter> send_limiter_; 106 std::unique_ptr<rtc::RateLimiter> send_limiter_;
108 }; 107 };
109 108
110 } // namespace cricket 109 } // namespace cricket
111 110
112 #endif // WEBRTC_MEDIA_BASE_RTPDATAENGINE_H_ 111 #endif // WEBRTC_MEDIA_BASE_RTPDATAENGINE_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/mediaengine.h ('k') | webrtc/media/base/rtpdataengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698