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

(Auto)update libjingle 73891518-> 73927658

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6957 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-08-22 22:24:54 +00:00
parent 2b0554f0e7
commit 309a611670
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2018,25 +2018,6 @@ bool WebRtcVideoMediaChannel::AddRecvStream(const StreamParams& sp) {
return false; return false;
} }
// Get the default renderer.
VideoRenderer* default_renderer = NULL;
if (InConferenceMode()) {
// The recv_channels_ size start out being 1, so if it is two here
// this is the first receive channel created (default_channel_id_
// is not used for receiving in a conference call). This means
// that the renderer stored inside default_channel_id_ should be
// used for the just created channel.
if (recv_channels_.size() == 2 && GetDefaultRecvChannel()) {
GetDefaultRenderer(&default_renderer);
}
}
// The first recv stream reuses the default renderer (if a default renderer
// has been set).
if (default_renderer) {
SetRenderer(sp.first_ssrc(), default_renderer);
}
LOG(LS_INFO) << "New video stream " << sp.first_ssrc() LOG(LS_INFO) << "New video stream " << sp.first_ssrc()
<< " registered to VideoEngine channel #" << " registered to VideoEngine channel #"
<< channel_id << " and connected to channel #" << channel_id << " and connected to channel #"
@ -3139,10 +3120,6 @@ bool WebRtcVideoMediaChannel::GetRenderer(uint32 ssrc,
return true; return true;
} }
bool WebRtcVideoMediaChannel::GetDefaultRenderer(VideoRenderer** renderer) {
return GetRenderer(kDefaultChannelSsrcKey, renderer);
}
bool WebRtcVideoMediaChannel::GetVideoAdapter( bool WebRtcVideoMediaChannel::GetVideoAdapter(
uint32 ssrc, CoordinatedVideoAdapter** video_adapter) { uint32 ssrc, CoordinatedVideoAdapter** video_adapter) {
WebRtcVideoChannelSendInfo* send_channel = GetSendChannelBySsrc(ssrc); WebRtcVideoChannelSendInfo* send_channel = GetSendChannelBySsrc(ssrc);

2
talk/media/webrtc/webrtcvideoengine.h
View File

@ -387,8 +387,6 @@ class WebRtcVideoMediaChannel : public rtc::MessageHandler,
bool IsDefaultChannelId(int channel_id) const { bool IsDefaultChannelId(int channel_id) const {
return channel_id == default_channel_id_; return channel_id == default_channel_id_;
} }
bool GetDefaultRenderer(VideoRenderer** renderer);
bool DeleteSendChannel(uint32 ssrc_key); bool DeleteSendChannel(uint32 ssrc_key);
WebRtcVideoChannelRecvInfo* GetDefaultRecvChannel(); WebRtcVideoChannelRecvInfo* GetDefaultRecvChannel();