diff options
author | mikhal@webrtc.org <mikhal@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-02-10 18:42:55 +0000 |
---|---|---|
committer | mikhal@webrtc.org <mikhal@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-02-10 18:42:55 +0000 |
commit | 0c66de6e75821a8e86fcbd166d725a5a859cab79 (patch) | |
tree | f2cb78033475ad90e120a320975b2f6909b06532 /video_engine/vie_rtp_rtcp_impl.cc | |
parent | ce42660aa3102e2e8ecd0c1a281bb1f712ccef6d (diff) | |
download | webrtc-0c66de6e75821a8e86fcbd166d725a5a859cab79.tar.gz |
Updates to send side streaming mode:
1. Disabling frame-droppers from the vie encoder and not the channel.
2. Accounting for qpMax in the VP8 wrapper.
Review URL: https://webrtc-codereview.appspot.com/1101007
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3492 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_rtp_rtcp_impl.cc')
-rw-r--r-- | video_engine/vie_rtp_rtcp_impl.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/video_engine/vie_rtp_rtcp_impl.cc b/video_engine/vie_rtp_rtcp_impl.cc index f04e0e75..c57d361a 100644 --- a/video_engine/vie_rtp_rtcp_impl.cc +++ b/video_engine/vie_rtp_rtcp_impl.cc @@ -568,6 +568,15 @@ int ViERTP_RTCPImpl::EnableSenderStreamingMode(int video_channel, shared_data_->SetLastError(kViERtpRtcpInvalidChannelId); return -1; } + ViEEncoder* vie_encoder = cs.Encoder(video_channel); + if (!vie_encoder) { + WEBRTC_TRACE(kTraceError, kTraceVideo, + ViEId(shared_data_->instance_id(), video_channel), + "%s: Could not get encoder for channel %d", __FUNCTION__, + video_channel); + shared_data_->SetLastError(kViERtpRtcpInvalidChannelId); + return -1; + } // Update the channel's streaming mode settings. if (vie_channel->EnableSenderStreamingMode(target_delay_ms) != 0) { @@ -577,6 +586,9 @@ int ViERTP_RTCPImpl::EnableSenderStreamingMode(int video_channel, shared_data_->SetLastError(kViERtpRtcpUnknownError); return -1; } + + // Update the encoder's streaming mode settings. + vie_encoder->EnableSenderStreamingMode(target_delay_ms); return 0; } |