(Auto)update libjingle 69131548-> 69132244

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6426 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-06-13 07:56:17 +00:00
parent 1c8223c590
commit c800c1cc40
4 changed files with 8 additions and 0 deletions

View File

@ -88,6 +88,8 @@ const char StatsReport::kStatsValueNameEchoReturnLoss[] =
const char StatsReport::kStatsValueNameEchoReturnLossEnhancement[] = const char StatsReport::kStatsValueNameEchoReturnLossEnhancement[] =
"googEchoCancellationReturnLossEnhancement"; "googEchoCancellationReturnLossEnhancement";
const char StatsReport::kStatsValueNameEncodeRelStdDev[] =
"googEncodeRelStdDev";
const char StatsReport::kStatsValueNameEncodeUsagePercent[] = const char StatsReport::kStatsValueNameEncodeUsagePercent[] =
"googEncodeUsagePercent"; "googEncodeUsagePercent";
const char StatsReport::kStatsValueNameExpandRate[] = "googExpandRate"; const char StatsReport::kStatsValueNameExpandRate[] = "googExpandRate";
@ -427,6 +429,8 @@ void ExtractStats(const cricket::VideoSenderInfo& info, StatsReport* report) {
info.capture_queue_delay_ms_per_s); info.capture_queue_delay_ms_per_s);
report->AddValue(StatsReport::kStatsValueNameEncodeUsagePercent, report->AddValue(StatsReport::kStatsValueNameEncodeUsagePercent,
info.encode_usage_percent); info.encode_usage_percent);
report->AddValue(StatsReport::kStatsValueNameEncodeRelStdDev,
info.encode_rsd);
} }
void ExtractStats(const cricket::BandwidthEstimationInfo& info, void ExtractStats(const cricket::BandwidthEstimationInfo& info,

View File

@ -133,6 +133,7 @@ class StatsReport {
// Internal StatsValue names // Internal StatsValue names
static const char kStatsValueNameAvgEncodeMs[]; static const char kStatsValueNameAvgEncodeMs[];
static const char kStatsValueNameEncodeRelStdDev[];
static const char kStatsValueNameEncodeUsagePercent[]; static const char kStatsValueNameEncodeUsagePercent[];
static const char kStatsValueNameCaptureJitterMs[]; static const char kStatsValueNameCaptureJitterMs[];
static const char kStatsValueNameCaptureQueueDelayMsPerS[]; static const char kStatsValueNameCaptureQueueDelayMsPerS[];

View File

@ -870,6 +870,7 @@ struct VideoSenderInfo : public MediaSenderInfo {
capture_jitter_ms(0), capture_jitter_ms(0),
avg_encode_ms(0), avg_encode_ms(0),
encode_usage_percent(0), encode_usage_percent(0),
encode_rsd(0),
capture_queue_delay_ms_per_s(0) { capture_queue_delay_ms_per_s(0) {
} }
@ -890,6 +891,7 @@ struct VideoSenderInfo : public MediaSenderInfo {
int capture_jitter_ms; int capture_jitter_ms;
int avg_encode_ms; int avg_encode_ms;
int encode_usage_percent; int encode_usage_percent;
int encode_rsd;
int capture_queue_delay_ms_per_s; int capture_queue_delay_ms_per_s;
VariableInfo<int> adapt_frame_drops; VariableInfo<int> adapt_frame_drops;
VariableInfo<int> effects_frame_drops; VariableInfo<int> effects_frame_drops;

View File

@ -2494,6 +2494,7 @@ bool WebRtcVideoMediaChannel::GetStats(const StatsOptions& options,
sinfo.capture_jitter_ms = metrics.capture_jitter_ms; sinfo.capture_jitter_ms = metrics.capture_jitter_ms;
sinfo.avg_encode_ms = metrics.avg_encode_time_ms; sinfo.avg_encode_ms = metrics.avg_encode_time_ms;
sinfo.encode_usage_percent = metrics.encode_usage_percent; 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; sinfo.capture_queue_delay_ms_per_s = metrics.capture_queue_delay_ms_per_s;
#else #else
sinfo.capture_jitter_ms = -1; sinfo.capture_jitter_ms = -1;