(Auto)update libjingle 78738075-> 78738103
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7554 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/app/webrtc/statscollector.cc b/app/webrtc/statscollector.cc
index 5271827..fefb0ad 100644
--- a/app/webrtc/statscollector.cc
+++ b/app/webrtc/statscollector.cc
@@ -89,8 +89,6 @@
const char StatsReport::kStatsValueNameEchoReturnLossEnhancement[] =
"googEchoCancellationReturnLossEnhancement";
-const char StatsReport::kStatsValueNameEncodeRelStdDev[] =
- "googEncodeRelStdDev";
const char StatsReport::kStatsValueNameEncodeUsagePercent[] =
"googEncodeUsagePercent";
const char StatsReport::kStatsValueNameExpandRate[] = "googExpandRate";
@@ -459,8 +457,6 @@
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/app/webrtc/statstypes.h b/app/webrtc/statstypes.h
index 656b83c..8a1530a 100644
--- a/app/webrtc/statstypes.h
+++ b/app/webrtc/statstypes.h
@@ -199,7 +199,6 @@
// 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/media/base/mediachannel.h b/media/base/mediachannel.h
index b1164b5..dda9d1f 100644
--- a/media/base/mediachannel.h
+++ b/media/base/mediachannel.h
@@ -843,7 +843,6 @@
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 @@
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/media/webrtc/webrtcvideoengine.cc b/media/webrtc/webrtcvideoengine.cc
index 12cd907..451b84c 100644
--- a/media/webrtc/webrtcvideoengine.cc
+++ b/media/webrtc/webrtcvideoengine.cc
@@ -2553,7 +2553,6 @@
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;
