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

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

Issue 1978783002: Revert of Remove ViEEncoder::SetNetworkStatus (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@move_pacer
Patch Set: 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
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video/vie_encoder.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
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 friend class ViEBitrateObserver; 57 friend class ViEBitrateObserver;
58 58
59 ViEEncoder(uint32_t number_of_cores, 59 ViEEncoder(uint32_t number_of_cores,
60 ProcessThread* module_process_thread, 60 ProcessThread* module_process_thread,
61 SendStatisticsProxy* stats_proxy, 61 SendStatisticsProxy* stats_proxy,
62 OveruseFrameDetector* overuse_detector); 62 OveruseFrameDetector* overuse_detector);
63 ~ViEEncoder(); 63 ~ViEEncoder();
64 64
65 vcm::VideoSender* video_sender(); 65 vcm::VideoSender* video_sender();
66 66
67 void SetNetworkTransmissionState(bool is_transmitting);
68
67 // Returns the id of the owning channel. 69 // Returns the id of the owning channel.
68 int Owner() const; 70 int Owner() const;
69 71
70 void Start(); 72 void Start();
71 // Drops incoming packets before they get to the encoder. 73 // Drops incoming packets before they get to the encoder.
72 void Pause(); 74 void Pause();
73 75
74 // Codec settings. 76 // Codec settings.
75 int32_t RegisterExternalEncoder(VideoEncoder* encoder, 77 int32_t RegisterExternalEncoder(VideoEncoder* encoder,
76 uint8_t pl_type, 78 uint8_t pl_type,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 SendStatisticsProxy* const stats_proxy_; 132 SendStatisticsProxy* const stats_proxy_;
131 OveruseFrameDetector* const overuse_detector_; 133 OveruseFrameDetector* const overuse_detector_;
132 134
133 // The time we last received an input frame or encoded frame. This is used to 135 // The time we last received an input frame or encoded frame. This is used to
134 // track when video is stopped long enough that we also want to stop sending 136 // track when video is stopped long enough that we also want to stop sending
135 // padding. 137 // padding.
136 int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_); 138 int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_);
137 VideoCodec encoder_config_ GUARDED_BY(data_cs_); 139 VideoCodec encoder_config_ GUARDED_BY(data_cs_);
138 int min_transmit_bitrate_bps_ GUARDED_BY(data_cs_); 140 int min_transmit_bitrate_bps_ GUARDED_BY(data_cs_);
139 uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_); 141 uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_);
142 bool network_is_transmitting_ GUARDED_BY(data_cs_);
140 bool encoder_paused_ GUARDED_BY(data_cs_); 143 bool encoder_paused_ GUARDED_BY(data_cs_);
141 bool encoder_paused_and_dropped_frame_ GUARDED_BY(data_cs_); 144 bool encoder_paused_and_dropped_frame_ GUARDED_BY(data_cs_);
142 145
143 rtc::CriticalSection sink_cs_; 146 rtc::CriticalSection sink_cs_;
144 EncodedImageCallback* sink_ GUARDED_BY(sink_cs_); 147 EncodedImageCallback* sink_ GUARDED_BY(sink_cs_);
145 148
146 ProcessThread* module_process_thread_; 149 ProcessThread* module_process_thread_;
147 150
148 bool has_received_sli_ GUARDED_BY(data_cs_); 151 bool has_received_sli_ GUARDED_BY(data_cs_);
149 uint8_t picture_id_sli_ GUARDED_BY(data_cs_); 152 uint8_t picture_id_sli_ GUARDED_BY(data_cs_);
150 bool has_received_rpsi_ GUARDED_BY(data_cs_); 153 bool has_received_rpsi_ GUARDED_BY(data_cs_);
151 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_); 154 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_);
152 155
153 bool video_suspended_ GUARDED_BY(data_cs_); 156 bool video_suspended_ GUARDED_BY(data_cs_);
154 }; 157 };
155 158
156 } // namespace webrtc 159 } // namespace webrtc
157 160
158 #endif // WEBRTC_VIDEO_VIE_ENCODER_H_ 161 #endif // WEBRTC_VIDEO_VIE_ENCODER_H_
OLDNEW
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video/vie_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698