Don't trigger false ViE SetReceiveCodec warning.

Review URL: http://webrtc-codereview.appspot.com/250001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@820 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mflodman@webrtc.org 2011-10-26 11:30:52 +00:00
parent 6b7799021c
commit 8fc663b3ae

View File

@ -533,9 +533,13 @@ WebRtc_Word32 ViEChannel::SetReceiveCodec(const VideoCodec& videoCodec)
WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId, _channelId), WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId, _channelId),
"%s", __FUNCTION__); "%s", __FUNCTION__);
_rtpRtcp.DeRegisterReceivePayload(videoCodec.plType); WebRtc_Word8 old_pltype = -1;
if (_rtpRtcp.RegisterReceivePayload(videoCodec) if (_rtpRtcp.ReceivePayloadType(videoCodec, &old_pltype) != -1)
!= 0) {
_rtpRtcp.DeRegisterReceivePayload(old_pltype);
}
if (_rtpRtcp.RegisterReceivePayload(videoCodec) != 0)
{ {
WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideo, WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideo,
ViEId(_engineId, _channelId), ViEId(_engineId, _channelId),