From 9fe3603dc1db32a89c08f0facebddac20799ba5a Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Thu, 21 Nov 2013 23:00:40 +0000 Subject: [PATCH] Renaming ViEEncoderObserver::VideoSuspended New name is ViEEncoderObserver::SuspendChange. BUG=2436 TBR=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/4199004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5157 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video_engine/include/vie_codec.h | 2 +- .../test/auto_test/source/vie_autotest_codec.cc | 8 ++++---- .../test/auto_test/source/vie_autotest_custom_call.cc | 4 ++-- webrtc/video_engine/vie_encoder.cc | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/webrtc/video_engine/include/vie_codec.h b/webrtc/video_engine/include/vie_codec.h index d5b5602511..bddcc3a654 100644 --- a/webrtc/video_engine/include/vie_codec.h +++ b/webrtc/video_engine/include/vie_codec.h @@ -39,7 +39,7 @@ class WEBRTC_DLLEXPORT ViEEncoderObserver { // This method is called whenever the state of the SuspendBelowMinBitrate // changes, i.e., when |is_suspended| toggles. // TODO(hlundin): Remove the default implementation when possible. - virtual void VideoSuspended(int video_channel, bool is_suspended) {} + virtual void SuspendChange(int video_channel, bool is_suspended) {} protected: virtual ~ViEEncoderObserver() {} diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_codec.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_codec.cc index b3ca9261dd..0ebfbecbec 100644 --- a/webrtc/video_engine/test/auto_test/source/vie_autotest_codec.cc +++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_codec.cc @@ -44,7 +44,7 @@ class TestCodecObserver : public webrtc::ViEEncoderObserver, unsigned int last_outgoing_bitrate_; unsigned int last_incoming_framerate_; unsigned int last_incoming_bitrate_; - unsigned int video_suspended_called_; + unsigned int suspend_change_called_; webrtc::VideoCodec incoming_codec_; @@ -60,7 +60,7 @@ class TestCodecObserver : public webrtc::ViEEncoderObserver, last_outgoing_bitrate_(0), last_incoming_framerate_(0), last_incoming_bitrate_(0), - video_suspended_called_(0) { + suspend_change_called_(0) { memset(&incoming_codec_, 0, sizeof(incoming_codec_)); } virtual void IncomingCodecChanged(const int video_channel, @@ -100,8 +100,8 @@ class TestCodecObserver : public webrtc::ViEEncoderObserver, last_outgoing_bitrate_ += bitrate; } - virtual void VideoSuspended(int video_channel, bool is_suspended) OVERRIDE { - video_suspended_called_++; + virtual void SuspendChange(int video_channel, bool is_suspended) OVERRIDE { + suspend_change_called_++; } virtual void RequestNewKeyFrame(const int video_channel) { diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc index 8e1f2c0c1b..f9a5c220c3 100644 --- a/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc +++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc @@ -73,8 +73,8 @@ class ViEAutotestEncoderObserver : public webrtc::ViEEncoderObserver { << " BR: " << bitrate << std::endl; } - virtual void VideoSuspended(int video_channel, bool is_suspended) OVERRIDE { - std::cout << "VideoSuspended: " << is_suspended << std::endl; + virtual void SuspendChange(int video_channel, bool is_suspended) OVERRIDE { + std::cout << "SuspendChange: " << is_suspended << std::endl; } }; diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc index c5b469cc46..9733a89848 100644 --- a/webrtc/video_engine/vie_encoder.cc +++ b/webrtc/video_engine/vie_encoder.cc @@ -1124,7 +1124,7 @@ void ViEEncoder::OnNetworkChanged(const uint32_t bitrate_bps, ViEId(engine_id_, channel_id_), "%s: video_suspended_ changed to %i", __FUNCTION__, video_is_suspended); - codec_observer_->VideoSuspended(channel_id_, video_is_suspended); + codec_observer_->SuspendChange(channel_id_, video_is_suspended); } }