summaryrefslogtreecommitdiff
path: root/voice_engine/voe_video_sync_impl.cc
diff options
context:
space:
mode:
authortnakamura@webrtc.org <tnakamura@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-07-16 19:25:04 +0000
committertnakamura@webrtc.org <tnakamura@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-07-16 19:25:04 +0000
commit0ba496bf33feea212277927f212b4b02556c8f8b (patch)
treeeabccaba985d5ee504a512dde757988fe73f8a0e /voice_engine/voe_video_sync_impl.cc
parent2eb721ebb84bca84978adaa024a2c09eb9a3b923 (diff)
downloadwebrtc-0ba496bf33feea212277927f212b4b02556c8f8b.tar.gz
Revert r4301
R=mikhal@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1809004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4357 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/voe_video_sync_impl.cc')
-rw-r--r--voice_engine/voe_video_sync_impl.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/voice_engine/voe_video_sync_impl.cc b/voice_engine/voe_video_sync_impl.cc
index a0654f75..91c07503 100644
--- a/voice_engine/voe_video_sync_impl.cc
+++ b/voice_engine/voe_video_sync_impl.cc
@@ -216,8 +216,7 @@ int VoEVideoSyncImpl::GetPlayoutBufferSize(int& bufferMs)
return 0;
}
-int VoEVideoSyncImpl::GetRtpRtcp(int channel, RtpRtcp** rtpRtcpModule,
- RtpReceiver** rtp_receiver)
+int VoEVideoSyncImpl::GetRtpRtcp(int channel, RtpRtcp* &rtpRtcpModule)
{
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
"GetRtpRtcp(channel=%i)", channel);
@@ -235,7 +234,7 @@ int VoEVideoSyncImpl::GetRtpRtcp(int channel, RtpRtcp** rtpRtcpModule,
"GetPlayoutTimestamp() failed to locate channel");
return -1;
}
- return channelPtr->GetRtpRtcp(rtpRtcpModule, rtp_receiver);
+ return channelPtr->GetRtpRtcp(rtpRtcpModule);
}
int VoEVideoSyncImpl::GetLeastRequiredDelayMs(int channel) const {