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

Side by Side Diff: webrtc/video_engine/vie_channel_group.h

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add missing updated_options Created 5 years, 2 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
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_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_ 11 #ifndef WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_
12 #define WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_ 12 #define WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_
13 13
14 #include <list> 14 #include <list>
15 #include <map> 15 #include <map>
16 #include <set> 16 #include <set>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/base/criticalsection.h" 19 #include "webrtc/base/criticalsection.h"
20 #include "webrtc/base/scoped_ptr.h" 20 #include "webrtc/base/scoped_ptr.h"
21 #include "webrtc/base/socket.h"
21 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" 22 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
22 #include "webrtc/video_receive_stream.h" 23 #include "webrtc/video_receive_stream.h"
23 #include "webrtc/video_send_stream.h" 24 #include "webrtc/video_send_stream.h"
24 25
25 namespace webrtc { 26 namespace webrtc {
26 27
27 class BitrateAllocator; 28 class BitrateAllocator;
28 class CallStats; 29 class CallStats;
29 class Config; 30 class Config;
30 class EncoderStateFeedback; 31 class EncoderStateFeedback;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 CallStats* GetCallStats() const; 76 CallStats* GetCallStats() const;
76 RemoteBitrateEstimator* GetRemoteBitrateEstimator() const; 77 RemoteBitrateEstimator* GetRemoteBitrateEstimator() const;
77 EncoderStateFeedback* GetEncoderStateFeedback() const; 78 EncoderStateFeedback* GetEncoderStateFeedback() const;
78 int64_t GetPacerQueuingDelayMs() const; 79 int64_t GetPacerQueuingDelayMs() const;
79 80
80 // Implements BitrateObserver. 81 // Implements BitrateObserver.
81 void OnNetworkChanged(uint32_t target_bitrate_bps, 82 void OnNetworkChanged(uint32_t target_bitrate_bps,
82 uint8_t fraction_loss, 83 uint8_t fraction_loss,
83 int64_t rtt) override; 84 int64_t rtt) override;
84 85
86 void OnSentPacket(const rtc::SentPacket& sent_packet);
87
85 private: 88 private:
86 typedef std::map<int, ViEChannel*> ChannelMap; 89 typedef std::map<int, ViEChannel*> ChannelMap;
87 typedef std::map<int, ViEEncoder*> EncoderMap; 90 typedef std::map<int, ViEEncoder*> EncoderMap;
88 91
89 bool CreateChannel(int channel_id, 92 bool CreateChannel(int channel_id,
90 Transport* transport, 93 Transport* transport,
91 int number_of_cores, 94 int number_of_cores,
92 ViEEncoder* vie_encoder, 95 ViEEncoder* vie_encoder,
93 size_t max_rtp_streams, 96 size_t max_rtp_streams,
94 bool sender, 97 bool sender,
(...skipping 19 matching lines...) Expand all
114 rtc::scoped_ptr<ProcessThread> pacer_thread_; 117 rtc::scoped_ptr<ProcessThread> pacer_thread_;
115 118
116 rtc::scoped_ptr<BitrateController> bitrate_controller_; 119 rtc::scoped_ptr<BitrateController> bitrate_controller_;
117 rtc::scoped_ptr<TransportFeedbackAdapter> transport_feedback_adapter_; 120 rtc::scoped_ptr<TransportFeedbackAdapter> transport_feedback_adapter_;
118 int min_bitrate_bps_; 121 int min_bitrate_bps_;
119 }; 122 };
120 123
121 } // namespace webrtc 124 } // namespace webrtc
122 125
123 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_ 126 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698