Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / app / webrtc / statstypes.h

diff --git a/src/third_party/libjingle/source/talk/app/webrtc/statstypes.h b/src/third_party/libjingle/source/talk/app/webrtc/statstypes.h
index 22e281c..2b1317a 100644 (file)
--- a/src/third_party/libjingle/source/talk/app/webrtc/statstypes.h
+++ b/src/third_party/libjingle/source/talk/app/webrtc/statstypes.h
@@ -34,8 +34,8 @@
 #include <string>
 #include <vector>
 
-#include "talk/base/basictypes.h"
-#include "talk/base/stringencode.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/stringencode.h"
 
 namespace webrtc {
 
@@ -43,26 +43,55 @@ class StatsReport {
  public:
   StatsReport() : timestamp(0) { }
 
+  // TODO(tommi): Change this to be an enum type that holds all the
+  // kStatsValueName constants.
+  typedef const char* StatsValueName;
+
   std::string id;  // See below for contents.
   std::string type;  // See below for contents.
 
   struct Value {
-    std::string name;
+    Value() : name(NULL) {}
+    // The copy ctor can't be declared as explicit due to problems with STL.
+    Value(const Value& other) : name(other.name), value(other.value) {}
+    explicit Value(StatsValueName name) : name(name) {}
+    Value(StatsValueName name, const std::string& value)
+        : name(name), value(value) {
+    }
+
+    // TODO(tommi): Remove this operator once we don't need it.
+    // The operator is provided for compatibility with STL containers.
+    // The public |name| member variable is otherwise meant to be read-only.
+    Value& operator=(const Value& other) {
+      const_cast<StatsValueName&>(name) = other.name;
+      value = other.value;
+      return *this;
+    }
+
+    // TODO(tommi): Change implementation to do a simple enum value-to-static-
+    // string conversion when client code has been updated to use this method
+    // instead of the |name| member variable.
+    const char* display_name() const { return name; }
+
+    const StatsValueName name;
+
     std::string value;
   };
 
-  void AddValue(const std::string& name, const std::string& value);
-  void AddValue(const std::string& name, int64 value);
+  void AddValue(StatsValueName name, const std::string& value);
+  void AddValue(StatsValueName name, int64 value);
   template <typename T>
-  void AddValue(const std::string& name, const std::vector<T>& value);
-  void AddBoolean(const std::string& name, bool value);
+  void AddValue(StatsValueName name, const std::vector<T>& value);
+  void AddBoolean(StatsValueName name, bool value);
 
-  void ReplaceValue(const std::string& name, const std::string& value);
+  void ReplaceValue(StatsValueName name, const std::string& value);
 
   double timestamp;  // Time since 1970-01-01T00:00:00Z in milliseconds.
   typedef std::vector<Value> Values;
   Values values;
 
+  // TODO(tommi): These should all be enum values.
+
   // StatsReport types.
   // A StatsReport of |type| = "googSession" contains overall information
   // about the thing libjingle calls a session (which may contain one
@@ -141,6 +170,7 @@ class StatsReport {
   static const char kStatsValueNameBandwidthLimitedResolution[];
   static const char kStatsValueNameCpuLimitedResolution[];
   static const char kStatsValueNameViewLimitedResolution[];
+  static const char kStatsValueNameAdaptationChanges[];
   static const char kStatsValueNameEchoCancellationQualityMin[];
   static const char kStatsValueNameEchoDelayMedian[];
   static const char kStatsValueNameEchoDelayStdDev[];