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

(Auto)update libjingle 75865376-> 75875619

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7234 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-09-19 05:36:18 +00:00
parent d7acf11e8d
commit b5a5c44ef7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
talk/media/webrtc/webrtcvideoengine.cc
View File

@ -3928,6 +3928,7 @@ bool WebRtcVideoMediaChannel::MaybeResetVieSendCodec(
int screencast_min_bitrate =
options_.screencast_min_bitrate.GetWithDefaultIfUnset(0);
bool leaky_bucket = options_.video_leaky_bucket.GetWithDefaultIfUnset(true);
StreamParams* send_params = send_channel->stream_params();
bool reset_send_codec =
target_width != cur_width || target_height != cur_height;
if (vie_codec.codecType == webrtc::kVideoCodecVP8) {
@ -4170,7 +4171,7 @@ bool WebRtcVideoMediaChannel::SetLimitedNumberOfSendSsrcs(
std::vector<uint32> ssrcs = sim_group->ssrcs;
for (size_t i = 0; i < ssrcs.size() && i < limit; ++i) {
if (!SetPrimaryAndRtxSsrcs(channel_id, i, ssrcs[i], sp)) {
if (!SetPrimaryAndRtxSsrcs(channel_id, static_cast<int>(i), ssrcs[i], sp)) {
return false;
}
}