Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / video_engine / vie_channel_group.cc

diff --git a/src/third_party/webrtc/video_engine/vie_channel_group.cc b/src/third_party/webrtc/video_engine/vie_channel_group.cc
index 516833b..c6b3f74 100644 (file)
--- a/src/third_party/webrtc/video_engine/vie_channel_group.cc
+++ b/src/third_party/webrtc/video_engine/vie_channel_group.cc
@@ -10,6 +10,7 @@
 
 #include "webrtc/video_engine/vie_channel_group.h"
 
+#include "webrtc/base/thread_annotations.h"
 #include "webrtc/common.h"
 #include "webrtc/experiments.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
@@ -18,7 +19,6 @@
 #include "webrtc/modules/utility/interface/process_thread.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/interface/logging.h"
-#include "webrtc/system_wrappers/interface/thread_annotations.h"
 #include "webrtc/video_engine/call_stats.h"
 #include "webrtc/video_engine/encoder_state_feedback.h"
 #include "webrtc/video_engine/vie_channel.h"
@@ -54,39 +54,39 @@ class WrappingBitrateEstimator : public RemoteBitrateEstimator {
 
   virtual void IncomingPacket(int64_t arrival_time_ms,
                               int payload_size,
-                              const RTPHeader& header) {
+                              const RTPHeader& header) OVERRIDE {
     CriticalSectionScoped cs(crit_sect_.get());
     PickEstimatorFromHeader(header);
     rbe_->IncomingPacket(arrival_time_ms, payload_size, header);
   }
 
-  virtual int32_t Process() {
+  virtual int32_t Process() OVERRIDE {
     CriticalSectionScoped cs(crit_sect_.get());
     return rbe_->Process();
   }
 
-  virtual int32_t TimeUntilNextProcess() {
+  virtual int32_t TimeUntilNextProcess() OVERRIDE {
     CriticalSectionScoped cs(crit_sect_.get());
     return rbe_->TimeUntilNextProcess();
   }
 
-  virtual void OnRttUpdate(uint32_t rtt) {
+  virtual void OnRttUpdate(uint32_t rtt) OVERRIDE {
     CriticalSectionScoped cs(crit_sect_.get());
     rbe_->OnRttUpdate(rtt);
   }
 
-  virtual void RemoveStream(unsigned int ssrc) {
+  virtual void RemoveStream(unsigned int ssrc) OVERRIDE {
     CriticalSectionScoped cs(crit_sect_.get());
     rbe_->RemoveStream(ssrc);
   }
 
   virtual bool LatestEstimate(std::vector<unsigned int>* ssrcs,
-                              unsigned int* bitrate_bps) const {
+                              unsigned int* bitrate_bps) const OVERRIDE {
     CriticalSectionScoped cs(crit_sect_.get());
     return rbe_->LatestEstimate(ssrcs, bitrate_bps);
   }
 
-  virtual bool GetStats(ReceiveBandwidthEstimatorStats* output) const {
+  virtual bool GetStats(ReceiveBandwidthEstimatorStats* output) const OVERRIDE {
     CriticalSectionScoped cs(crit_sect_.get());
     return rbe_->GetStats(output);
   }