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

AutoMute: Adding channel_id parameter to callback.

Browse Source 
BUG=2436
R=mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2390004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5006 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org 2013-10-21 12:37:13 +00:00
parent fe1ef935e7
commit 0d19ed9a06
4 changed files with 4 additions and 4 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 AutoMuter changes, i.e., // This method is called whenever the state of the AutoMuter changes, i.e.,
// when |is_muted| toggles. // when |is_muted| toggles.
// TODO(hlundin): Remove the default implementation when possible. // TODO(hlundin): Remove the default implementation when possible.
virtual void VideoAutoMuted(bool is_muted) {} virtual void VideoAutoMuted(int video_channel, bool is_muted) {}
protected: protected:
virtual ~ViEEncoderObserver() {} virtual ~ViEEncoderObserver() {}

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

@ -88,7 +88,7 @@ class TestCodecObserver
last_outgoing_bitrate_ += bitrate; last_outgoing_bitrate_ += bitrate;
} }
virtual void VideoAutoMuted(bool is_muted) { virtual void VideoAutoMuted(int video_channel, bool is_muted) {
video_auto_muted_called_++; video_auto_muted_called_++;
} }

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

@ -73,7 +73,7 @@ class ViEAutotestEncoderObserver : public webrtc::ViEEncoderObserver {
<< " BR: " << bitrate << std::endl; << " BR: " << bitrate << std::endl;
} }
virtual void VideoAutoMuted(bool is_muted) { virtual void VideoAutoMuted(int video_channel, bool is_muted) {
std::cout << "VideoAutoMuted: " << is_muted << std::endl; std::cout << "VideoAutoMuted: " << is_muted << std::endl;
} }
}; };

2
webrtc/video_engine/vie_encoder.cc
View File

@ -1113,7 +1113,7 @@ void ViEEncoder::OnNetworkChanged(const uint32_t bitrate_bps,
ViEId(engine_id_, channel_id_), ViEId(engine_id_, channel_id_),
"%s: video_auto_muted_ changed to %i", "%s: video_auto_muted_ changed to %i",
__FUNCTION__, video_auto_muted_); __FUNCTION__, video_auto_muted_);
codec_observer_->VideoAutoMuted(video_auto_muted_); codec_observer_->VideoAutoMuted(channel_id_, video_auto_muted_);
} }
} }
} }