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

Side by Side Diff: webrtc/video/vie_encoder.h

Issue 1917793002: Remove SendPacer from ViEEncoder (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 7 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
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 public EncodedImageCallback, 45 public EncodedImageCallback,
46 public VCMPacketizationCallback, 46 public VCMPacketizationCallback,
47 public VCMSendStatisticsCallback { 47 public VCMSendStatisticsCallback {
48 public: 48 public:
49 friend class ViEBitrateObserver; 49 friend class ViEBitrateObserver;
50 50
51 ViEEncoder(uint32_t number_of_cores, 51 ViEEncoder(uint32_t number_of_cores,
52 const std::vector<uint32_t>& ssrcs, 52 const std::vector<uint32_t>& ssrcs,
53 ProcessThread* module_process_thread, 53 ProcessThread* module_process_thread,
54 SendStatisticsProxy* stats_proxy, 54 SendStatisticsProxy* stats_proxy,
55 // TODO(nisse): Used only for tests, delete?
56 rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback,
57 OveruseFrameDetector* overuse_detector, 55 OveruseFrameDetector* overuse_detector,
58 PacedSender* pacer,
59 PayloadRouter* payload_router, 56 PayloadRouter* payload_router,
60 EncodedImageCallback* post_encode_callback); 57 EncodedImageCallback* post_encode_callback);
61 ~ViEEncoder(); 58 ~ViEEncoder();
62 59
63 bool Init(); 60 bool Init();
64 61
65 vcm::VideoSender* video_sender(); 62 vcm::VideoSender* video_sender();
66 63
67 void SetNetworkTransmissionState(bool is_transmitting); 64 void SetNetworkTransmissionState(bool is_transmitting);
68 65
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 const uint32_t number_of_cores_; 123 const uint32_t number_of_cores_;
127 const std::vector<uint32_t> ssrcs_; 124 const std::vector<uint32_t> ssrcs_;
128 125
129 const std::unique_ptr<VideoProcessing> vp_; 126 const std::unique_ptr<VideoProcessing> vp_;
130 const std::unique_ptr<QMVideoSettingsCallback> qm_callback_; 127 const std::unique_ptr<QMVideoSettingsCallback> qm_callback_;
131 vcm::VideoSender video_sender_; 128 vcm::VideoSender video_sender_;
132 129
133 rtc::CriticalSection data_cs_; 130 rtc::CriticalSection data_cs_;
134 131
135 SendStatisticsProxy* const stats_proxy_; 132 SendStatisticsProxy* const stats_proxy_;
136 rtc::VideoSinkInterface<VideoFrame>* const pre_encode_callback_;
137 OveruseFrameDetector* const overuse_detector_; 133 OveruseFrameDetector* const overuse_detector_;
138 PacedSender* const pacer_;
139 PayloadRouter* const send_payload_router_; 134 PayloadRouter* const send_payload_router_;
140 EncodedImageCallback* const post_encode_callback_; 135 EncodedImageCallback* const post_encode_callback_;
141 136
142 // The time we last received an input frame or encoded frame. This is used to 137 // The time we last received an input frame or encoded frame. This is used to
143 // track when video is stopped long enough that we also want to stop sending 138 // track when video is stopped long enough that we also want to stop sending
144 // padding. 139 // padding.
145 int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_); 140 int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_);
146 VideoCodec encoder_config_ GUARDED_BY(data_cs_); 141 VideoCodec encoder_config_ GUARDED_BY(data_cs_);
147 int min_transmit_bitrate_bps_ GUARDED_BY(data_cs_); 142 int min_transmit_bitrate_bps_ GUARDED_BY(data_cs_);
148 uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_); 143 uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_);
(...skipping 10 matching lines...) Expand all
159 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_); 154 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_);
160 155
161 bool video_suspended_ GUARDED_BY(data_cs_); 156 bool video_suspended_ GUARDED_BY(data_cs_);
162 157
163 std::unique_ptr<IvfFileWriter> file_writers_[kMaxLayers] GUARDED_BY(data_cs_); 158 std::unique_ptr<IvfFileWriter> file_writers_[kMaxLayers] GUARDED_BY(data_cs_);
164 }; 159 };
165 160
166 } // namespace webrtc 161 } // namespace webrtc
167 162
168 #endif // WEBRTC_VIDEO_VIE_ENCODER_H_ 163 #endif // WEBRTC_VIDEO_VIE_ENCODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698