AutoMute: Adding channel_id parameter to callback.
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
diff --git a/webrtc/video_engine/include/vie_codec.h b/webrtc/video_engine/include/vie_codec.h
index 976aee7..33ada28 100644
--- a/webrtc/video_engine/include/vie_codec.h
+++ b/webrtc/video_engine/include/vie_codec.h
@@ -39,7 +39,7 @@
// This method is called whenever the state of the AutoMuter changes, i.e.,
// when |is_muted| toggles.
// TODO(hlundin): Remove the default implementation when possible.
- virtual void VideoAutoMuted(bool is_muted) {}
+ virtual void VideoAutoMuted(int video_channel, bool is_muted) {}
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 d242831..84ae14c 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
@@ -88,7 +88,7 @@
last_outgoing_bitrate_ += bitrate;
}
- virtual void VideoAutoMuted(bool is_muted) {
+ virtual void VideoAutoMuted(int video_channel, bool is_muted) {
video_auto_muted_called_++;
}
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 5d2ecfc..103e422 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,7 +73,7 @@
<< " 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;
}
};
diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc
index eb75d62..a3023f9 100644
--- a/webrtc/video_engine/vie_encoder.cc
+++ b/webrtc/video_engine/vie_encoder.cc
@@ -1113,7 +1113,7 @@
ViEId(engine_id_, channel_id_),
"%s: video_auto_muted_ changed to %i",
__FUNCTION__, video_auto_muted_);
- codec_observer_->VideoAutoMuted(video_auto_muted_);
+ codec_observer_->VideoAutoMuted(channel_id_, video_auto_muted_);
}
}
}
