From 1abc146aa5e474471f866a8a4db7dcfa8fb7c8a6 Mon Sep 17 00:00:00 2001
From: "buildbot@webrtc.org" <buildbot@webrtc.org>
Date: Wed, 29 Oct 2014 08:14:14 +0000
Subject: [PATCH] (Auto)update libjingle 78738075-> 78738103

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7554 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 talk/app/webrtc/statscollector.cc      | 4 ----
 talk/app/webrtc/statstypes.h           | 1 -
 talk/media/base/mediachannel.h         | 2 --
 talk/media/webrtc/webrtcvideoengine.cc | 1 -
 4 files changed, 8 deletions(-)

diff --git a/talk/app/webrtc/statscollector.cc b/talk/app/webrtc/statscollector.cc
index 5271827fb..fefb0adfe 100644
--- a/talk/app/webrtc/statscollector.cc
+++ b/talk/app/webrtc/statscollector.cc
@@ -89,8 +89,6 @@ const char StatsReport::kStatsValueNameEchoReturnLoss[] =
 const char StatsReport::kStatsValueNameEchoReturnLossEnhancement[] =
     "googEchoCancellationReturnLossEnhancement";
 
-const char StatsReport::kStatsValueNameEncodeRelStdDev[] =
-    "googEncodeRelStdDev";
 const char StatsReport::kStatsValueNameEncodeUsagePercent[] =
     "googEncodeUsagePercent";
 const char StatsReport::kStatsValueNameExpandRate[] = "googExpandRate";
@@ -459,8 +457,6 @@ void ExtractStats(const cricket::VideoSenderInfo& info, StatsReport* report) {
                    info.capture_queue_delay_ms_per_s);
   report->AddValue(StatsReport::kStatsValueNameEncodeUsagePercent,
                    info.encode_usage_percent);
-  report->AddValue(StatsReport::kStatsValueNameEncodeRelStdDev,
-                   info.encode_rsd);
 }
 
 void ExtractStats(const cricket::BandwidthEstimationInfo& info,
diff --git a/talk/app/webrtc/statstypes.h b/talk/app/webrtc/statstypes.h
index 656b83c3e..8a1530a04 100644
--- a/talk/app/webrtc/statstypes.h
+++ b/talk/app/webrtc/statstypes.h
@@ -199,7 +199,6 @@ class StatsReport {
 
   // Internal StatsValue names
   static const char kStatsValueNameAvgEncodeMs[];
-  static const char kStatsValueNameEncodeRelStdDev[];
   static const char kStatsValueNameEncodeUsagePercent[];
   static const char kStatsValueNameCaptureJitterMs[];
   static const char kStatsValueNameCaptureQueueDelayMsPerS[];
diff --git a/talk/media/base/mediachannel.h b/talk/media/base/mediachannel.h
index b1164b511..dda9d1f4b 100644
--- a/talk/media/base/mediachannel.h
+++ b/talk/media/base/mediachannel.h
@@ -843,7 +843,6 @@ struct VideoSenderInfo : public MediaSenderInfo {
         capture_jitter_ms(0),
         avg_encode_ms(0),
         encode_usage_percent(0),
-        encode_rsd(0),
         capture_queue_delay_ms_per_s(0) {
   }
 
@@ -865,7 +864,6 @@ struct VideoSenderInfo : public MediaSenderInfo {
   int capture_jitter_ms;
   int avg_encode_ms;
   int encode_usage_percent;
-  int encode_rsd;
   int capture_queue_delay_ms_per_s;
   VariableInfo<int> adapt_frame_drops;
   VariableInfo<int> effects_frame_drops;
diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc
index 12cd90730..451b84c61 100644
--- a/talk/media/webrtc/webrtcvideoengine.cc
+++ b/talk/media/webrtc/webrtcvideoengine.cc
@@ -2553,7 +2553,6 @@ bool WebRtcVideoMediaChannel::GetStats(const StatsOptions& options,
       sinfo.capture_jitter_ms = metrics.capture_jitter_ms;
       sinfo.avg_encode_ms = metrics.avg_encode_time_ms;
       sinfo.encode_usage_percent = metrics.encode_usage_percent;
-      sinfo.encode_rsd = metrics.encode_rsd;
       sinfo.capture_queue_delay_ms_per_s = metrics.capture_queue_delay_ms_per_s;
 #else
       sinfo.capture_jitter_ms = -1;