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

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

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