diff options
Diffstat (limited to 'chromium/third_party/webrtc/video_engine/vie_encoder.h')
| -rw-r--r-- | chromium/third_party/webrtc/video_engine/vie_encoder.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/third_party/webrtc/video_engine/vie_encoder.h b/chromium/third_party/webrtc/video_engine/vie_encoder.h index 24bd720230b..3eb5f55a7bf 100644 --- a/chromium/third_party/webrtc/video_engine/vie_encoder.h +++ b/chromium/third_party/webrtc/video_engine/vie_encoder.h @@ -20,6 +20,7 @@ #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" +#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" #include "webrtc/frame_callback.h" #include "webrtc/video_engine/vie_defines.h" @@ -109,8 +110,7 @@ class ViEEncoder int32_t SendCodecStatistics(uint32_t* num_key_frames, uint32_t* num_delta_frames); - int32_t EstimatedSendBandwidth( - uint32_t* available_bandwidth) const; + int PacerQueuingDelayMs() const; int CodecTargetBitrate(uint32_t* bitrate) const; // Loss protection. @@ -153,6 +153,8 @@ class ViEEncoder // Sets SSRCs for all streams. bool SetSsrcs(const std::list<unsigned int>& ssrcs); + void SetMinTransmitBitrate(int min_transmit_bitrate_kbps); + // Effect filter. int32_t RegisterEffectFilter(ViEEffectFilter* effect_filter); @@ -206,6 +208,7 @@ class ViEEncoder int64_t time_of_last_incoming_frame_ms_; bool send_padding_; + int min_transmit_bitrate_kbps_ GUARDED_BY(data_cs_); int target_delay_ms_; bool network_is_transmitting_; bool encoder_paused_; @@ -215,7 +218,7 @@ class ViEEncoder bool fec_enabled_; bool nack_enabled_; - ViEEncoderObserver* codec_observer_; + ViEEncoderObserver* codec_observer_ GUARDED_BY(callback_cs_); ViEEffectFilter* effect_filter_; ProcessThread& module_process_thread_; |