From 7f959980f8f9d88d5af04615027c3574f9a7df39 Mon Sep 17 00:00:00 2001 From: "sprang@webrtc.org" Date: Tue, 26 Nov 2013 09:30:04 +0000 Subject: [PATCH] Remove const in vie_rtp_rtcp, where there is conflict with mock defines in fakewebrtcvideoengine. BUG= R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/4399004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5176 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video_engine/include/vie_rtp_rtcp.h | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/webrtc/video_engine/include/vie_rtp_rtcp.h b/webrtc/video_engine/include/vie_rtp_rtcp.h index 7937d3552..9d899ad7f 100644 --- a/webrtc/video_engine/include/vie_rtp_rtcp.h +++ b/webrtc/video_engine/include/vie_rtp_rtcp.h @@ -314,16 +314,16 @@ class WEBRTC_DLLEXPORT ViERTP_RTCP { virtual int RegisterSendChannelRtcpStatisticsCallback( - const int video_channel, RtcpStatisticsCallback* callback) = 0; + int video_channel, RtcpStatisticsCallback* callback) = 0; virtual int DeregisterSendChannelRtcpStatisticsCallback( - const int video_channel, RtcpStatisticsCallback* callback) = 0; + int video_channel, RtcpStatisticsCallback* callback) = 0; virtual int RegisterReceiveChannelRtcpStatisticsCallback( - const int video_channel, RtcpStatisticsCallback* callback) = 0; + int video_channel, RtcpStatisticsCallback* callback) = 0; virtual int DeregisterReceiveChannelRtcpStatisticsCallback( - const int video_channel, RtcpStatisticsCallback* callback) = 0; + int video_channel, RtcpStatisticsCallback* callback) = 0; // The function gets statistics from the sent and received RTP streams. virtual int GetRtpStatistics(const int video_channel, @@ -348,16 +348,16 @@ class WEBRTC_DLLEXPORT ViERTP_RTCP { } virtual int RegisterSendChannelRtpStatisticsCallback( - const int video_channel, StreamDataCountersCallback* callback) = 0; + int video_channel, StreamDataCountersCallback* callback) = 0; virtual int DeregisterSendChannelRtpStatisticsCallback( - const int video_channel, StreamDataCountersCallback* callback) = 0; + int video_channel, StreamDataCountersCallback* callback) = 0; virtual int RegisterReceiveChannelRtpStatisticsCallback( - const int video_channel, StreamDataCountersCallback* callback) = 0; + int video_channel, StreamDataCountersCallback* callback) = 0; virtual int DeregisterReceiveChannelRtpStatisticsCallback( - const int video_channel, StreamDataCountersCallback* callback) = 0; + int video_channel, StreamDataCountersCallback* callback) = 0; // The function gets bandwidth usage statistics from the sent RTP streams in // bits/s. @@ -369,11 +369,11 @@ class WEBRTC_DLLEXPORT ViERTP_RTCP { // (De)Register an observer, called whenever the send bitrate is updated virtual int RegisterSendBitrateObserver( - const int video_channel, + int video_channel, BitrateStatisticsObserver* observer) = 0; virtual int DeregisterSendBitrateObserver( - const int video_channel, + int video_channel, BitrateStatisticsObserver* observer) = 0; // This function gets the send-side estimated bandwidth available for video, @@ -418,11 +418,11 @@ class WEBRTC_DLLEXPORT ViERTP_RTCP { // Registers and instance of a user implementation of ViEFrameCountObserver virtual int RegisterSendFrameCountObserver( - const int video_channel, FrameCountObserver* observer) = 0; + int video_channel, FrameCountObserver* observer) = 0; // Removes a registered instance of a ViEFrameCountObserver virtual int DeregisterSendFrameCountObserver( - const int video_channel, FrameCountObserver* observer) = 0; + int video_channel, FrameCountObserver* observer) = 0; protected: virtual ~ViERTP_RTCP() {}