Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at b831a9e3d5f9f0563d249b726cffa8a070e58aee

This commit was generated by merge_from_chromium.py.

Change-Id: I6d6255972e3c34e7797e9b46fbc3c0fe7e552d43

4 files changed, 6 insertions, 42 deletions

diff --git a/video_engine/vie_base_impl.cc b/video_engine/vie_base_impl.cc
index cf64eada..81c748af 100644
--- a/video_engine/vie_base_impl.cc
+++ b/video_engine/vie_base_impl.cc
@@ -10,7 +10,6 @@
 
 #include "webrtc/video_engine/vie_base_impl.h"
 
-#include <sstream>
 #include <string>
 #include <utility>
 
@@ -329,23 +328,8 @@ int ViEBaseImpl::StopReceive(const int video_channel) {
 }
 
 int ViEBaseImpl::GetVersion(char version[1024]) {
-  assert(kViEVersionMaxMessageSize == 1024);
-  if (!version) {
-    shared_data_.SetLastError(kViEBaseInvalidArgument);
-    return -1;
-  }
-
-  // Add WebRTC Version.
-  std::stringstream version_stream;
-  version_stream << "VideoEngine 39" << std::endl;
-
-  // Add build info.
-  version_stream << "Build: " << BUILDINFO << std::endl;
-
-  int version_length = version_stream.tellp();
-  assert(version_length < 1024);
-  memcpy(version, version_stream.str().c_str(), version_length);
-  version[version_length] = '\0';
+  assert(version != NULL);
+  strcpy(version, "VideoEngine 39");
   return 0;
 }
 
diff --git a/video_engine/vie_base_impl.h b/video_engine/vie_base_impl.h
index 20fd6159..0ae7818d 100644
--- a/video_engine/vie_base_impl.h
+++ b/video_engine/vie_base_impl.h
@@ -64,11 +64,6 @@ class ViEBaseImpl
   ViESharedData* shared_data() { return &shared_data_; }
 
  private:
-  // Version functions.
-  int32_t AddViEVersion(char* str) const;
-  int32_t AddBuildInfo(char* str) const;
-  int32_t AddExternalTransportBuild(char* str) const;
-
   int CreateChannel(int& video_channel, int original_channel,  // NOLINT
                     bool sender);
 
diff --git a/video_engine/vie_channel.h b/video_engine/vie_channel.h
index 03279069..3b8d96a2 100644
--- a/video_engine/vie_channel.h
+++ b/video_engine/vie_channel.h
@@ -415,10 +415,12 @@ class ViEChannel
 
   class RegisterableBitrateStatisticsObserver:
     public RegisterableCallback<BitrateStatisticsObserver> {
-    virtual void Notify(const BitrateStatistics& stats, uint32_t ssrc) {
+    virtual void Notify(const BitrateStatistics& total_stats,
+                        const BitrateStatistics& retransmit_stats,
+                        uint32_t ssrc) {
       CriticalSectionScoped cs(critsect_.get());
       if (callback_)
-        callback_->Notify(stats, ssrc);
+        callback_->Notify(total_stats, retransmit_stats, ssrc);
     }
   }
   send_bitrate_observer_;
diff --git a/video_engine/vie_defines.h b/video_engine/vie_defines.h
index 7bfed465..74b5e1a7 100644
--- a/video_engine/vie_defines.h
+++ b/video_engine/vie_defines.h
@@ -35,8 +35,6 @@ enum { kViEMinKeyRequestIntervalMs = 300 };
 
 // ViEBase
 enum { kViEMaxNumberOfChannels = 64 };
-enum { kViEVersionMaxMessageSize = 1024 };
-enum { kViEMaxModuleVersionSize = 960 };
 
 // ViECapture
 enum { kViEMaxCaptureDevices = 256 };
@@ -101,21 +99,6 @@ inline int ChannelId(const int moduleId) {
   return static_cast<int>(moduleId & 0xffff);
 }
 
-//  Build information macros
-#if defined(_DEBUG) || defined(DEBUG)
-#define BUILDMODE "d"
-#elif defined(NDEBUG)
-#define BUILDMODE "r"
-#else
-#define BUILDMODE "?"
-#endif
-
-#define BUILDTIME __TIME__
-#define BUILDDATE __DATE__
-
-// Example: "Oct 10 2002 12:05:30 r".
-#define BUILDINFO BUILDDATE " " BUILDTIME " " BUILDMODE
-
 // Windows specific.
 #if defined(_WIN32)
   #define RENDER_MODULE_TYPE kRenderWindows