generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Connect pacer/padding to SuspendBelowMinBitrate

Browse Source 
The suspend function must not be engaged unless padding is also enabled.
This CL makes the connection so that the pacer and padding is enabled
when SuspendBelowMinBitrate is.

Had to change the unit test to make it aware of the padding packets.

BUG=2606
R=mflodman@webrtc.org, pbos@webrtc.org, stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/4089004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5153 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org 2013-11-21 14:05:40 +00:00
parent ffe1b17b57
commit 331d4402fc
5 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/video/video_send_stream.cc
View File

@ -104,6 +104,8 @@ VideoSendStream::VideoSendStream(newapi::Transport* transport,
static_cast<unsigned char>(i));
}
}
if (config_.suspend_below_min_bitrate)
config_.pacing = true;
rtp_rtcp_->SetTransmissionSmoothingStatus(channel_, config_.pacing);
if (!config_.rtp.rtx.ssrcs.empty()) {
assert(config_.rtp.rtx.ssrcs.size() == config_.rtp.ssrcs.size());

15
webrtc/video/video_send_stream_tests.cc
View File

@ -596,9 +596,20 @@ TEST_F(VideoSendStreamTest, SuspendBelowMinBitrate) {
SendRtcpFeedback(low_remb_bps_);
test_state_ = kDuringSuspend;
} else if (test_state_ == kDuringSuspend) {
suspended_frame_count_ = 0;
if (header.paddingLength == 0) {
// Received non-padding packet during suspension period. Reset the
// counter.
// TODO(hlundin): We should probably make this test more advanced in
// the future, so that it verifies that the bitrate can go below the
// min_bitrate. This requires that the fake encoder sees the
// min_bitrate, and never goes below it. See WebRTC Issue 2655.
suspended_frame_count_ = 0;
}
} else if (test_state_ == kWaitingForPacket) {
observation_complete_->Set();
if (header.paddingLength == 0) {
// Non-padding packet observed. Test is complete.
observation_complete_->Set();
}
}
return SEND_PACKET;

13
webrtc/video_engine/vie_codec_impl.cc
View File

@ -724,7 +724,18 @@ void ViECodecImpl::SuspendBelowMinBitrate(int video_channel) {
"%s: No encoder %d", __FUNCTION__, video_channel);
return;
}
return vie_encoder->SuspendBelowMinBitrate();
vie_encoder->SuspendBelowMinBitrate();
ViEChannel* vie_channel = cs.Channel(video_channel);
if (!vie_channel) {
WEBRTC_TRACE(kTraceError, kTraceVideo,
ViEId(shared_data_->instance_id(), video_channel),
"%s: No channel %d", __FUNCTION__, video_channel);
return;
}
// Must enable pacing when enabling SuspendBelowMinBitrate. Otherwise, no
// padding will be sent when the video is suspended so the video will be
// unable to recover.
vie_channel->SetTransmissionSmoothingStatus(true);
}
bool ViECodecImpl::CodecValid(const VideoCodec& video_codec) {

12
webrtc/video_engine/vie_encoder.cc
View File

@ -525,7 +525,12 @@ bool ViEEncoder::TimeToSendPacket(uint32_t ssrc,
}
int ViEEncoder::TimeToSendPadding(int bytes) {
if (send_padding_) {
bool send_padding;
{
CriticalSectionScoped cs(data_cs_.get());
send_padding = send_padding_ || video_suspended_;
}
if (send_padding) {
return default_rtp_rtcp_->TimeToSendPadding(bytes);
}
return 0;
@ -1109,7 +1114,10 @@ void ViEEncoder::OnNetworkChanged(const uint32_t bitrate_bps,
default_rtp_rtcp_->SetTargetSendBitrate(stream_bitrates);
if (video_is_suspended != video_suspended_) {
// State changed now. Send callback to inform about that.
video_suspended_ = video_is_suspended;
{
CriticalSectionScoped cs(data_cs_.get());
video_suspended_ = video_is_suspended;
}
if (codec_observer_) {
WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo,
ViEId(engine_id_, channel_id_),

2
webrtc/video_send_stream.h
View File

@ -145,6 +145,8 @@ class VideoSendStream {
// True if the stream should be suspended when the available bitrate fall
// below the minimum configured bitrate. If this variable is false, the
// stream may send at a rate higher than the estimated available bitrate.
// Enabling suspend_below_min_bitrate will also enable pacing and padding,
// otherwise, the video will be unable to recover from suspension.
bool suspend_below_min_bitrate;
};