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

Renaming ViEEncoderObserver::VideoSuspended

Browse Source 
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
This commit is contained in:
henrik.lundin@webrtc.org 2013-11-21 23:00:40 +00:00
parent 484ee962b5
commit 9fe3603dc1
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/video_engine/include/vie_codec.h
View File

@ -39,7 +39,7 @@ class WEBRTC_DLLEXPORT ViEEncoderObserver {
// This method is called whenever the state of the SuspendBelowMinBitrate // This method is called whenever the state of the SuspendBelowMinBitrate
// changes, i.e., when |is_suspended| toggles. // changes, i.e., when |is_suspended| toggles.
// TODO(hlundin): Remove the default implementation when possible. // 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: protected:
virtual ~ViEEncoderObserver() {} virtual ~ViEEncoderObserver() {}

8
webrtc/video_engine/test/auto_test/source/vie_autotest_codec.cc
View File

@ -44,7 +44,7 @@ class TestCodecObserver : public webrtc::ViEEncoderObserver,
unsigned int last_outgoing_bitrate_; unsigned int last_outgoing_bitrate_;
unsigned int last_incoming_framerate_; unsigned int last_incoming_framerate_;
unsigned int last_incoming_bitrate_; unsigned int last_incoming_bitrate_;
unsigned int video_suspended_called_; unsigned int suspend_change_called_;
webrtc::VideoCodec incoming_codec_; webrtc::VideoCodec incoming_codec_;
@ -60,7 +60,7 @@ class TestCodecObserver : public webrtc::ViEEncoderObserver,
last_outgoing_bitrate_(0), last_outgoing_bitrate_(0),
last_incoming_framerate_(0), last_incoming_framerate_(0),
last_incoming_bitrate_(0), last_incoming_bitrate_(0),
video_suspended_called_(0) { suspend_change_called_(0) {
memset(&incoming_codec_, 0, sizeof(incoming_codec_)); memset(&incoming_codec_, 0, sizeof(incoming_codec_));
} }
virtual void IncomingCodecChanged(const int video_channel, virtual void IncomingCodecChanged(const int video_channel,
@ -100,8 +100,8 @@ class TestCodecObserver : public webrtc::ViEEncoderObserver,
last_outgoing_bitrate_ += bitrate; last_outgoing_bitrate_ += bitrate;
} }
virtual void VideoSuspended(int video_channel, bool is_suspended) OVERRIDE { virtual void SuspendChange(int video_channel, bool is_suspended) OVERRIDE {
video_suspended_called_++; suspend_change_called_++;
} }
virtual void RequestNewKeyFrame(const int video_channel) { virtual void RequestNewKeyFrame(const int video_channel) {

4
webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
View File

@ -73,8 +73,8 @@ class ViEAutotestEncoderObserver : public webrtc::ViEEncoderObserver {
<< " BR: " << bitrate << std::endl; << " BR: " << bitrate << std::endl;
} }
virtual void VideoSuspended(int video_channel, bool is_suspended) OVERRIDE { virtual void SuspendChange(int video_channel, bool is_suspended) OVERRIDE {
std::cout << "VideoSuspended: " << is_suspended << std::endl; std::cout << "SuspendChange: " << is_suspended << std::endl;
} }
}; };

2
webrtc/video_engine/vie_encoder.cc
View File

@ -1124,7 +1124,7 @@ void ViEEncoder::OnNetworkChanged(const uint32_t bitrate_bps,
ViEId(engine_id_, channel_id_), ViEId(engine_id_, channel_id_),
"%s: video_suspended_ changed to %i", "%s: video_suspended_ changed to %i",
__FUNCTION__, video_is_suspended); __FUNCTION__, video_is_suspended);
codec_observer_->VideoSuspended(channel_id_, video_is_suspended); codec_observer_->SuspendChange(channel_id_, video_is_suspended);
} }
} }