From 8a3ab0e7eaa4670d49ff7eb57a16b58d22b8f4d9 Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Fri, 27 Jul 2018 14:52:57 +0000 Subject: [PATCH] Revert "Add framesRendered to StatsReport" This reverts commit dcfa938f9e768d463d3e336f4d014027504267dd. Reason for revert: This CL blocks rolling WebRTC into chromium Original change's description: > Add framesRendered to StatsReport > > Bug: webrtc:9568 > Change-Id: I6976f4c48b67f6a81f57260a91966debbef38eb4 > Reviewed-on: https://webrtc-review.googlesource.com/90840 > Reviewed-by: Steve Anton > Commit-Queue: Steve Anton > Cr-Commit-Position: refs/heads/master@{#24121} TBR=steveanton@webrtc.org,solenberg@webrtc.org,joachimr@fb.com Change-Id: Ia58feefd0ab557bb39ff79840dc8fa5004fee753 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9568 Reviewed-on: https://webrtc-review.googlesource.com/90900 Reviewed-by: Artem Titov Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#24134} --- api/statstypes.cc | 2 -- api/statstypes.h | 1 - pc/statscollector.cc | 2 +- pc/statscollector_unittest.cc | 6 +----- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/api/statstypes.cc b/api/statstypes.cc index ef0eac9d41..ceba28d20f 100644 --- a/api/statstypes.cc +++ b/api/statstypes.cc @@ -400,8 +400,6 @@ const char* StatsReport::Value::display_name() const { return "datachannelid"; case kStatsValueNameFramesDecoded: return "framesDecoded"; - case kStatsValueNameFramesRendered: - return "framesRendered"; case kStatsValueNameFramesEncoded: return "framesEncoded"; case kStatsValueNameJitterBufferDelay: diff --git a/api/statstypes.h b/api/statstypes.h index e249d00293..857b1afaa7 100644 --- a/api/statstypes.h +++ b/api/statstypes.h @@ -107,7 +107,6 @@ class StatsReport { kStatsValueNameConcealmentEvents, kStatsValueNameDataChannelId, kStatsValueNameFramesDecoded, - kStatsValueNameFramesRendered, kStatsValueNameFramesEncoded, kStatsValueNameJitterBufferDelay, kStatsValueNameMediaType, diff --git a/pc/statscollector.cc b/pc/statscollector.cc index cf03ae55d4..e42244a0c0 100644 --- a/pc/statscollector.cc +++ b/pc/statscollector.cc @@ -275,7 +275,7 @@ void ExtractStats(const cricket::VideoReceiverInfo& info, StatsReport* report) { {StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms}, {StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms}, {StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded}, - {StatsReport::kStatsValueNameFramesRendered, info.frames_rendered}}; + }; for (const auto& i : ints) report->AddInt(i.name, i.value); diff --git a/pc/statscollector_unittest.cc b/pc/statscollector_unittest.cc index 91d4859283..2a2a2dc9b6 100644 --- a/pc/statscollector_unittest.cc +++ b/pc/statscollector_unittest.cc @@ -1741,8 +1741,7 @@ TEST_P(StatsCollectorTrackTest, VerifyVideoReceiveSsrcStatsNew) { VideoReceiverInfo video_receiver_info; video_receiver_info.add_ssrc(1234); video_receiver_info.frames_decoded = 10; - video_receiver_info.frames_rendered = 11; - video_receiver_info.qp_sum = 12; + video_receiver_info.qp_sum = 11; VideoMediaInfo video_info; video_info.receivers.push_back(video_receiver_info); @@ -1756,9 +1755,6 @@ TEST_P(StatsCollectorTrackTest, VerifyVideoReceiveSsrcStatsNew) { EXPECT_EQ(rtc::ToString(video_receiver_info.frames_decoded), ExtractSsrcStatsValue(reports, StatsReport::kStatsValueNameFramesDecoded)); - EXPECT_EQ(rtc::ToString(video_receiver_info.frames_rendered), - ExtractSsrcStatsValue(reports, - StatsReport::kStatsValueNameFramesRendered)); EXPECT_EQ(rtc::ToString(*video_receiver_info.qp_sum), ExtractSsrcStatsValue(reports, StatsReport::kStatsValueNameQpSum)); }