zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix stats for encoder target bitrate when target rate is zero.

Browse Source 
When the target bitrate is zero, currently  VideoSendStream.Stats.target_media_bitrate_bps show the last set rate before the target was set to zero.

BUG=webrtc::5687 b/29574845

Review-Url: https://codereview.webrtc.org/2122743003
Cr-Commit-Position: refs/heads/master@{#13386}
This commit is contained in:
perkj
2016-07-05 08:34:04 -07:00
committed by Commit bot
parent 0e7000b20a
commit f5b2e519b4
18 changed files with 49 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
webrtc/modules/video_coding/video_coding_impl.cc
View File

@ -73,12 +73,11 @@ class VideoCodingModuleImpl : public VideoCodingModule {
public:
VideoCodingModuleImpl(Clock* clock,
EventFactory* event_factory,
VideoEncoderRateObserver* encoder_rate_observer,
NackSender* nack_sender,
KeyFrameRequestSender* keyframe_request_sender,
EncodedImageCallback* pre_decode_image_callback)
: VideoCodingModule(),
sender_(clock, &post_encode_callback_, encoder_rate_observer, nullptr),
sender_(clock, &post_encode_callback_, nullptr),
receiver_(clock,
event_factory,
pre_decode_image_callback,
@ -263,29 +262,15 @@ void VideoCodingModule::Codec(VideoCodecType codecType, VideoCodec* codec) {
VCMCodecDataBase::Codec(codecType, codec);
}
// Create method for current interface, will be removed when the
// new jitter buffer is in place.
VideoCodingModule* VideoCodingModule::Create(
Clock* clock,
VideoEncoderRateObserver* encoder_rate_observer,
VCMQMSettingsCallback* qm_settings_callback) {
return VideoCodingModule::Create(clock, encoder_rate_observer,
qm_settings_callback,
nullptr, // NackSender
nullptr, // KeyframeRequestSender
nullptr); // Pre-decode image callback
}
// Create method for the new jitter buffer.
VideoCodingModule* VideoCodingModule::Create(
Clock* clock,
VideoEncoderRateObserver* encoder_rate_observer,
VCMQMSettingsCallback* qm_settings_callback,
NackSender* nack_sender,
KeyFrameRequestSender* keyframe_request_sender,
EncodedImageCallback* pre_decode_image_callback) {
return new VideoCodingModuleImpl(clock, nullptr, encoder_rate_observer,
nack_sender, keyframe_request_sender,
return new VideoCodingModuleImpl(clock, nullptr, nack_sender,
keyframe_request_sender,
pre_decode_image_callback);
}
@ -306,7 +291,7 @@ VideoCodingModule* VideoCodingModule::Create(
KeyFrameRequestSender* keyframe_request_sender) {
assert(clock);
assert(event_factory);
return new VideoCodingModuleImpl(clock, event_factory, nullptr, nack_sender,
return new VideoCodingModuleImpl(clock, event_factory, nack_sender,
keyframe_request_sender, nullptr);
}