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

Revert 2214 - Bugfix

Browse Source 
A series of CL:s by Patrik W. is breaking the auto-test. It started with CL 2211, but the later CL:s seems dependent on another. So I decided to go in reverse order and revert all of them.

TBR
Review URL: https://webrtc-codereview.appspot.com/570007

TBR=pwestin@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/571010

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2223 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
turaj@webrtc.org 2012-05-10 22:54:39 +00:00
parent f02ee061ab
commit 449b525453
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View File

@ -41,7 +41,7 @@ RtpRtcp* RtpRtcp::CreateRtpRtcp(const RtpRtcp::Configuration& configuration) {
return new ModuleRtpRtcpImpl(configuration); return new ModuleRtpRtcpImpl(configuration);
} else { } else {
RtpRtcp::Configuration configuration_copy; RtpRtcp::Configuration configuration_copy;
memcpy(&configuration_copy, &configuration, memcpy(&configuration_copy, &configuration_copy,
sizeof(RtpRtcp::Configuration)); sizeof(RtpRtcp::Configuration));
configuration_copy.clock = ModuleRTPUtility::GetSystemClock(); configuration_copy.clock = ModuleRTPUtility::GetSystemClock();
ModuleRtpRtcpImpl* rtp_rtcp_instance = ModuleRtpRtcpImpl* rtp_rtcp_instance =
@ -484,6 +484,7 @@ WebRtc_Word32 ModuleRtpRtcpImpl::IncomingPacket(
_id, _id,
"IncomingPacket(packetLength:%u)", "IncomingPacket(packetLength:%u)",
incomingPacketLength); incomingPacketLength);
// minimum RTP is 12 bytes // minimum RTP is 12 bytes
// minimum RTCP is 8 bytes (RTCP BYE) // minimum RTCP is 8 bytes (RTCP BYE)
if (incomingPacketLength < 8 || incomingPacket == NULL) { if (incomingPacketLength < 8 || incomingPacket == NULL) {

1
src/video_engine/vie_channel.cc
View File

@ -93,7 +93,6 @@ ViEChannel::ViEChannel(WebRtc_Word32 channel_id,
configuration.bitrate_observer = bitrate_observer; configuration.bitrate_observer = bitrate_observer;
rtp_rtcp_.reset(RtpRtcp::CreateRtpRtcp(configuration)); rtp_rtcp_.reset(RtpRtcp::CreateRtpRtcp(configuration));
vie_receiver_.SetRtpRtcpModule(rtp_rtcp_.get());
} }
WebRtc_Word32 ViEChannel::Init() { WebRtc_Word32 ViEChannel::Init() {