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 <steveanton@webrtc.org> > Commit-Queue: Steve Anton <steveanton@webrtc.org> > 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 <titovartem@webrtc.org> Commit-Queue: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24134}
This commit is contained in:
@ -400,8 +400,6 @@ const char* StatsReport::Value::display_name() const {
|
|||||||
return "datachannelid";
|
return "datachannelid";
|
||||||
case kStatsValueNameFramesDecoded:
|
case kStatsValueNameFramesDecoded:
|
||||||
return "framesDecoded";
|
return "framesDecoded";
|
||||||
case kStatsValueNameFramesRendered:
|
|
||||||
return "framesRendered";
|
|
||||||
case kStatsValueNameFramesEncoded:
|
case kStatsValueNameFramesEncoded:
|
||||||
return "framesEncoded";
|
return "framesEncoded";
|
||||||
case kStatsValueNameJitterBufferDelay:
|
case kStatsValueNameJitterBufferDelay:
|
||||||
|
@ -107,7 +107,6 @@ class StatsReport {
|
|||||||
kStatsValueNameConcealmentEvents,
|
kStatsValueNameConcealmentEvents,
|
||||||
kStatsValueNameDataChannelId,
|
kStatsValueNameDataChannelId,
|
||||||
kStatsValueNameFramesDecoded,
|
kStatsValueNameFramesDecoded,
|
||||||
kStatsValueNameFramesRendered,
|
|
||||||
kStatsValueNameFramesEncoded,
|
kStatsValueNameFramesEncoded,
|
||||||
kStatsValueNameJitterBufferDelay,
|
kStatsValueNameJitterBufferDelay,
|
||||||
kStatsValueNameMediaType,
|
kStatsValueNameMediaType,
|
||||||
|
@ -275,7 +275,7 @@ void ExtractStats(const cricket::VideoReceiverInfo& info, StatsReport* report) {
|
|||||||
{StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms},
|
{StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms},
|
||||||
{StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms},
|
{StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms},
|
||||||
{StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded},
|
{StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded},
|
||||||
{StatsReport::kStatsValueNameFramesRendered, info.frames_rendered}};
|
};
|
||||||
|
|
||||||
for (const auto& i : ints)
|
for (const auto& i : ints)
|
||||||
report->AddInt(i.name, i.value);
|
report->AddInt(i.name, i.value);
|
||||||
|
@ -1741,8 +1741,7 @@ TEST_P(StatsCollectorTrackTest, VerifyVideoReceiveSsrcStatsNew) {
|
|||||||
VideoReceiverInfo video_receiver_info;
|
VideoReceiverInfo video_receiver_info;
|
||||||
video_receiver_info.add_ssrc(1234);
|
video_receiver_info.add_ssrc(1234);
|
||||||
video_receiver_info.frames_decoded = 10;
|
video_receiver_info.frames_decoded = 10;
|
||||||
video_receiver_info.frames_rendered = 11;
|
video_receiver_info.qp_sum = 11;
|
||||||
video_receiver_info.qp_sum = 12;
|
|
||||||
VideoMediaInfo video_info;
|
VideoMediaInfo video_info;
|
||||||
video_info.receivers.push_back(video_receiver_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),
|
EXPECT_EQ(rtc::ToString(video_receiver_info.frames_decoded),
|
||||||
ExtractSsrcStatsValue(reports,
|
ExtractSsrcStatsValue(reports,
|
||||||
StatsReport::kStatsValueNameFramesDecoded));
|
StatsReport::kStatsValueNameFramesDecoded));
|
||||||
EXPECT_EQ(rtc::ToString(video_receiver_info.frames_rendered),
|
|
||||||
ExtractSsrcStatsValue(reports,
|
|
||||||
StatsReport::kStatsValueNameFramesRendered));
|
|
||||||
EXPECT_EQ(rtc::ToString(*video_receiver_info.qp_sum),
|
EXPECT_EQ(rtc::ToString(*video_receiver_info.qp_sum),
|
||||||
ExtractSsrcStatsValue(reports, StatsReport::kStatsValueNameQpSum));
|
ExtractSsrcStatsValue(reports, StatsReport::kStatsValueNameQpSum));
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user