From 08994cc525110d7cef1e3990aef7f2d6fa0a8f2c Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Wed, 29 May 2013 13:28:21 +0000 Subject: [PATCH] Fix a return value mismatch introduced in r4129. TBR=mflodman@webrtc.org TEST=vie_auto_test, trybots Review URL: https://webrtc-codereview.appspot.com/1584005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4131 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video_engine/vie_channel.cc | 4 ++-- webrtc/video_engine/vie_receiver.cc | 4 ++-- webrtc/video_engine/vie_receiver.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc index 9dc37c22bd..975a8bf7a8 100644 --- a/webrtc/video_engine/vie_channel.cc +++ b/webrtc/video_engine/vie_channel.cc @@ -873,7 +873,7 @@ int ViEChannel::SetSendTimestampOffsetStatus(bool enable, int id) { } int ViEChannel::SetReceiveTimestampOffsetStatus(bool enable, int id) { - return vie_receiver_.SetReceiveTimestampOffsetStatus(enable, id); + return vie_receiver_.SetReceiveTimestampOffsetStatus(enable, id) ? 0 : -1; } int ViEChannel::SetSendAbsoluteSendTimeStatus(bool enable, int id) { @@ -909,7 +909,7 @@ int ViEChannel::SetSendAbsoluteSendTimeStatus(bool enable, int id) { int ViEChannel::SetReceiveAbsoluteSendTimeStatus(bool enable, int id) { receive_absolute_send_time_enabled_ = enable; - return vie_receiver_.SetReceiveAbsoluteSendTimeStatus(enable, id); + return vie_receiver_.SetReceiveAbsoluteSendTimeStatus(enable, id) ? 0 : -1; } bool ViEChannel::GetReceiveAbsoluteSendTimeStatus() const { diff --git a/webrtc/video_engine/vie_receiver.cc b/webrtc/video_engine/vie_receiver.cc index 2270c070b1..3ec0eed8cd 100644 --- a/webrtc/video_engine/vie_receiver.cc +++ b/webrtc/video_engine/vie_receiver.cc @@ -89,7 +89,7 @@ void ViEReceiver::RegisterSimulcastRtpRtcpModules( } } -int ViEReceiver::SetReceiveTimestampOffsetStatus(bool enable, int id) { +bool ViEReceiver::SetReceiveTimestampOffsetStatus(bool enable, int id) { if (enable) { return rtp_header_parser_->RegisterRtpHeaderExtension( kRtpExtensionTransmissionTimeOffset, id); @@ -99,7 +99,7 @@ int ViEReceiver::SetReceiveTimestampOffsetStatus(bool enable, int id) { } } -int ViEReceiver::SetReceiveAbsoluteSendTimeStatus(bool enable, int id) { +bool ViEReceiver::SetReceiveAbsoluteSendTimeStatus(bool enable, int id) { if (enable) { return rtp_header_parser_->RegisterRtpHeaderExtension( kRtpExtensionAbsoluteSendTime, id); diff --git a/webrtc/video_engine/vie_receiver.h b/webrtc/video_engine/vie_receiver.h index 056a104de4..efa6712790 100644 --- a/webrtc/video_engine/vie_receiver.h +++ b/webrtc/video_engine/vie_receiver.h @@ -42,8 +42,8 @@ class ViEReceiver : public RtpData { void RegisterSimulcastRtpRtcpModules(const std::list& rtp_modules); - int SetReceiveTimestampOffsetStatus(bool enable, int id); - int SetReceiveAbsoluteSendTimeStatus(bool enable, int id); + bool SetReceiveTimestampOffsetStatus(bool enable, int id); + bool SetReceiveAbsoluteSendTimeStatus(bool enable, int id); void StartReceive(); void StopReceive();