From 8c579956a575d458dd4fb6231f8f341be136c5c7 Mon Sep 17 00:00:00 2001 From: dcastagna Date: Mon, 11 May 2015 19:56:23 -0700 Subject: [PATCH] Add a 4k 60 fps vp9 smpte bars video to telemetry tests. This video is 10 seconds of SMPTE color bars. The load on the vp9 decoder is relatively low, in this way we can better measure the load on the compositor. The video has been generated using libavfilter. BUG= Review URL: https://codereview.chromium.org/1083073003 Cr-Commit-Position: refs/heads/master@{#329332} --- tools/perf/metrics/system_memory.py | 2 +- tools/perf/page_sets/tough_video_cases.py | 14 ++++++++++++++ .../tough_video_cases/smpte_3840x2160_60fps_vp9.webm.sha1 | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 tools/perf/page_sets/tough_video_cases/smpte_3840x2160_60fps_vp9.webm.sha1 diff --git a/tools/perf/metrics/system_memory.py b/tools/perf/metrics/system_memory.py index ec3ce2e9ed54..ea02fbddbf6e 100644 --- a/tools/perf/metrics/system_memory.py +++ b/tools/perf/metrics/system_memory.py @@ -117,7 +117,7 @@ def _SubtractMemoryStats(end_memory_stats, start_memory_stats): else: for metric in end_process_memory: end_value = end_process_memory[metric] - start_value = start_memory_stats[process_type][metric] or 0 + start_value = start_memory_stats[process_type].get(metric, 0) if 'Peak' in metric: memory_stats[process_type][metric] = end_value else: diff --git a/tools/perf/page_sets/tough_video_cases.py b/tools/perf/page_sets/tough_video_cases.py index 158683ad318b..7c42d98a50b2 100644 --- a/tools/perf/page_sets/tough_video_cases.py +++ b/tools/perf/page_sets/tough_video_cases.py @@ -485,6 +485,19 @@ class Page35(ToughVideoCasesPage): def RunPageInteractions(self, action_runner): self.SeekBeforeAndAfterPlayhead(action_runner) +class Page36(ToughVideoCasesPage): + + def __init__(self, page_set): + super(Page36, self).__init__( + url=('file://tough_video_cases/video.html?src=' + 'smpte_3840x2160_60fps_vp9.webm'), + page_set=page_set) + + self.add_browser_metrics = True + + def RunPageInteractions(self, action_runner): + self.SeekBeforeAndAfterPlayhead(action_runner) + class ToughVideoCasesPageSet(page_set_module.PageSet): """ @@ -529,3 +542,4 @@ class ToughVideoCasesPageSet(page_set_module.PageSet): self.AddUserStory(Page33(self)) self.AddUserStory(Page34(self)) self.AddUserStory(Page35(self)) + self.AddUserStory(Page36(self)) diff --git a/tools/perf/page_sets/tough_video_cases/smpte_3840x2160_60fps_vp9.webm.sha1 b/tools/perf/page_sets/tough_video_cases/smpte_3840x2160_60fps_vp9.webm.sha1 new file mode 100644 index 000000000000..0885344eb6ea --- /dev/null +++ b/tools/perf/page_sets/tough_video_cases/smpte_3840x2160_60fps_vp9.webm.sha1 @@ -0,0 +1 @@ +ce653f28b96767a28c10be10a793bbc3742be888 \ No newline at end of file -- 2.11.4.GIT