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

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

Issue 1932683002: Remove ViEEncoder::SetNetworkStatus (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@move_pacer
Patch Set: Addressed comments 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 const std::vector<uint32_t>& ssrcs, 61 const std::vector<uint32_t>& ssrcs,
62 ProcessThread* module_process_thread, 62 ProcessThread* module_process_thread,
63 SendStatisticsProxy* stats_proxy, 63 SendStatisticsProxy* stats_proxy,
64 OveruseFrameDetector* overuse_detector); 64 OveruseFrameDetector* overuse_detector);
65 ~ViEEncoder(); 65 ~ViEEncoder();
66 66
67 bool Init(); 67 bool Init();
68 68
69 vcm::VideoSender* video_sender(); 69 vcm::VideoSender* video_sender();
70 70
71 void SetNetworkTransmissionState(bool is_transmitting);
72
73 // Returns the id of the owning channel. 71 // Returns the id of the owning channel.
74 int Owner() const; 72 int Owner() const;
75 73
76 void Start(); 74 void Start();
77 // Drops incoming packets before they get to the encoder. 75 // Drops incoming packets before they get to the encoder.
78 void Pause(); 76 void Pause();
79 77
80 // Codec settings. 78 // Codec settings.
81 int32_t RegisterExternalEncoder(VideoEncoder* encoder, 79 int32_t RegisterExternalEncoder(VideoEncoder* encoder,
82 uint8_t pl_type, 80 uint8_t pl_type,
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 SendStatisticsProxy* const stats_proxy_; 140 SendStatisticsProxy* const stats_proxy_;
143 OveruseFrameDetector* const overuse_detector_; 141 OveruseFrameDetector* const overuse_detector_;
144 142
145 // The time we last received an input frame or encoded frame. This is used to 143 // The time we last received an input frame or encoded frame. This is used to
146 // track when video is stopped long enough that we also want to stop sending 144 // track when video is stopped long enough that we also want to stop sending
147 // padding. 145 // padding.
148 int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_); 146 int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_);
149 VideoCodec encoder_config_ GUARDED_BY(data_cs_); 147 VideoCodec encoder_config_ GUARDED_BY(data_cs_);
150 int min_transmit_bitrate_bps_ GUARDED_BY(data_cs_); 148 int min_transmit_bitrate_bps_ GUARDED_BY(data_cs_);
151 uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_); 149 uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_);
152 bool network_is_transmitting_ GUARDED_BY(data_cs_);
153 bool encoder_paused_ GUARDED_BY(data_cs_); 150 bool encoder_paused_ GUARDED_BY(data_cs_);
154 bool encoder_paused_and_dropped_frame_ GUARDED_BY(data_cs_); 151 bool encoder_paused_and_dropped_frame_ GUARDED_BY(data_cs_);
155 std::vector<int64_t> time_last_intra_request_ms_ GUARDED_BY(data_cs_); 152 std::vector<int64_t> time_last_intra_request_ms_ GUARDED_BY(data_cs_);
156 153
157 rtc::CriticalSection sink_cs_; 154 rtc::CriticalSection sink_cs_;
158 EncodedImageCallback* sink_ GUARDED_BY(sink_cs_); 155 EncodedImageCallback* sink_ GUARDED_BY(sink_cs_);
159 156
160 ProcessThread* module_process_thread_; 157 ProcessThread* module_process_thread_;
161 158
162 bool has_received_sli_ GUARDED_BY(data_cs_); 159 bool has_received_sli_ GUARDED_BY(data_cs_);
163 uint8_t picture_id_sli_ GUARDED_BY(data_cs_); 160 uint8_t picture_id_sli_ GUARDED_BY(data_cs_);
164 bool has_received_rpsi_ GUARDED_BY(data_cs_); 161 bool has_received_rpsi_ GUARDED_BY(data_cs_);
165 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_); 162 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_);
166 163
167 bool video_suspended_ GUARDED_BY(data_cs_); 164 bool video_suspended_ GUARDED_BY(data_cs_);
168 165
169 std::unique_ptr<IvfFileWriter> file_writers_[kMaxLayers] GUARDED_BY(data_cs_); 166 std::unique_ptr<IvfFileWriter> file_writers_[kMaxLayers] GUARDED_BY(data_cs_);
170 }; 167 };
171 168
172 } // namespace webrtc 169 } // namespace webrtc
173 170
174 #endif // WEBRTC_VIDEO_VIE_ENCODER_H_ 171 #endif // WEBRTC_VIDEO_VIE_ENCODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698