Chromium Code Reviews| Index: tools/perf/page_sets/tough_video_cases.py |
| diff --git a/tools/perf/page_sets/tough_video_cases.py b/tools/perf/page_sets/tough_video_cases.py |
| index b55dd50181c3387ee82558136d399cfa999ffd7a..50b4a764297fafb9be80d7ae34197bb933ad32bc 100644 |
| --- a/tools/perf/page_sets/tough_video_cases.py |
| +++ b/tools/perf/page_sets/tough_video_cases.py |
| @@ -30,12 +30,12 @@ _PAGE_TAGS_LIST = [ |
| class ToughVideoCasesPage(page_module.Page): |
| - def __init__(self, url, page_set, tags): |
| + def __init__(self, url, page_set, tags, name): |
| if tags: |
| for t in tags: |
| assert t in _PAGE_TAGS_LIST |
| super(ToughVideoCasesPage, self).__init__( |
| - url=url, page_set=page_set, tags=tags) |
| + url=url, page_set=page_set, tags=tags, name=name) |
| def PlayAction(self, action_runner): |
| # Play the media until it has finished or it times out. |
| @@ -70,7 +70,8 @@ class Page2(ToughVideoCasesPage): |
| super(Page2, self).__init__( |
| url='file://tough_video_cases/video.html?src=crowd.ogg&type=audio', |
| page_set=page_set, |
| - tags=['vorbis', 'audio_only']) |
| + tags=['vorbis', 'audio_only'], |
| + name='video.html?src=crowd.ogg&type=audio') |
|
johnchen
2017/06/05 14:11:52
Any reason we can't use url.split('/')[-1], as in
ashleymarie1
2017/06/05 14:16:15
I wasn't sure if you were going to want to change
|
| self.add_browser_metrics = True |
| @@ -84,7 +85,8 @@ class Page4(ToughVideoCasesPage): |
| super(Page4, self).__init__( |
| url='file://tough_video_cases/video.html?src=crowd1080.webm', |
| page_set=page_set, |
| - tags=['is_50fps', 'vp8', 'vorbis', 'audio_video', 'normal_play']) |
| + tags=['is_50fps', 'vp8', 'vorbis', 'audio_video', 'normal_play'], |
| + name='video.html?src=crowd1080.webm') |
| self.add_browser_metrics = True |
| @@ -98,7 +100,8 @@ class Page7(ToughVideoCasesPage): |
| super(Page7, self).__init__( |
| url='file://tough_video_cases/video.html?src=tulip2.ogg&type=audio', |
| page_set=page_set, |
| - tags=['vorbis', 'audio_only', 'normal_play']) |
| + tags=['vorbis', 'audio_only', 'normal_play'], |
| + name='video.html?src=tulip2.ogg&type=audio') |
| self.add_browser_metrics = True |
| @@ -112,7 +115,8 @@ class Page8(ToughVideoCasesPage): |
| super(Page8, self).__init__( |
| url='file://tough_video_cases/video.html?src=tulip2.wav&type=audio', |
| page_set=page_set, |
| - tags=['pcm', 'audio_only', 'normal_play']) |
| + tags=['pcm', 'audio_only', 'normal_play'], |
| + name='video.html?src=tulip2.wav&type=audio') |
| self.add_browser_metrics = True |
| @@ -126,7 +130,8 @@ class Page11(ToughVideoCasesPage): |
| super(Page11, self).__init__( |
| url='file://tough_video_cases/video.html?src=crowd1080.mp4', |
| page_set=page_set, |
| - tags=['is_50fps', 'h264', 'aac', 'audio_video', 'normal_play']) |
| + tags=['is_50fps', 'h264', 'aac', 'audio_video', 'normal_play'], |
| + name='video.html?src=crowd1080.mp4') |
| self.add_browser_metrics = True |
| @@ -140,7 +145,8 @@ class Page12(ToughVideoCasesPage): |
| super(Page12, self).__init__( |
| url='file://tough_video_cases/video.html?src=crowd2160.mp4', |
| page_set=page_set, |
| - tags=['is_4k', 'is_50fps', 'h264', 'aac', 'audio_video', 'normal_play']) |
| + tags=['is_4k', 'is_50fps', 'h264', 'aac', 'audio_video', 'normal_play'], |
| + name='video.html?src=crowd2160.mp4') |
| self.add_browser_metrics = True |
| @@ -154,7 +160,8 @@ class Page13(ToughVideoCasesPage): |
| super(Page13, self).__init__( |
| url='file://tough_video_cases/video.html?src=tulip2.mp3&type=audio', |
| page_set=page_set, |
| - tags=['mp3', 'audio_only', 'normal_play']) |
| + tags=['mp3', 'audio_only', 'normal_play'], |
| + name='video.html?src=tulip2.mp3&type=audio') |
| self.add_browser_metrics = True |
| @@ -168,7 +175,8 @@ class Page14(ToughVideoCasesPage): |
| super(Page14, self).__init__( |
| url='file://tough_video_cases/video.html?src=tulip2.mp4', |
| page_set=page_set, |
| - tags=['h264', 'aac', 'audio_video', 'normal_play']) |
| + tags=['h264', 'aac', 'audio_video', 'normal_play'], |
| + name='video.html?src=tulip2.mp4') |
| self.add_browser_metrics = True |
| @@ -182,7 +190,8 @@ class Page15(ToughVideoCasesPage): |
| super(Page15, self).__init__( |
| url='file://tough_video_cases/video.html?src=tulip2.m4a&type=audio', |
| page_set=page_set, |
| - tags=['aac', 'audio_only', 'normal_play']) |
| + tags=['aac', 'audio_only', 'normal_play'], |
| + name='video.html?src=tulip2.m4a&type=audio') |
| self.add_browser_metrics = True |
| @@ -196,7 +205,8 @@ class Page16(ToughVideoCasesPage): |
| super(Page16, self).__init__( |
| url='file://tough_video_cases/video.html?src=garden2_10s.webm', |
| page_set=page_set, |
| - tags=['is_4k', 'vp8', 'vorbis', 'audio_video', 'normal_play']) |
| + tags=['is_4k', 'vp8', 'vorbis', 'audio_video', 'normal_play'], |
| + name='video.html?src=garden2_10s.webm') |
| self.add_browser_metrics = True |
| @@ -210,7 +220,8 @@ class Page17(ToughVideoCasesPage): |
| super(Page17, self).__init__( |
| url='file://tough_video_cases/video.html?src=garden2_10s.mp4', |
| page_set=page_set, |
| - tags=['is_4k', 'h264', 'aac', 'audio_video', 'normal_play']) |
| + tags=['is_4k', 'h264', 'aac', 'audio_video', 'normal_play'], |
| + name='video.html?src=garden2_10s.mp4') |
| self.add_browser_metrics = True |
| @@ -224,7 +235,8 @@ class Page19(ToughVideoCasesPage): |
| super(Page19, self).__init__( |
| url='file://tough_video_cases/video.html?src=tulip2.ogg&type=audio&seek', |
| page_set=page_set, |
| - tags=['vorbis', 'audio_only', 'seek']) |
| + tags=['vorbis', 'audio_only', 'seek'], |
| + name='video.html?src=tulip2.ogg&type=audio&seek') |
| self.skip_basic_metrics = True |
| @@ -238,7 +250,8 @@ class Page20(ToughVideoCasesPage): |
| super(Page20, self).__init__( |
| url='file://tough_video_cases/video.html?src=tulip2.wav&type=audio&seek', |
| page_set=page_set, |
| - tags=['pcm', 'audio_only', 'seek']) |
| + tags=['pcm', 'audio_only', 'seek'], |
| + name='video.html?src=tulip2.wav&type=audio&seek') |
| self.skip_basic_metrics = True |
| @@ -252,7 +265,8 @@ class Page23(ToughVideoCasesPage): |
| super(Page23, self).__init__( |
| url='file://tough_video_cases/video.html?src=tulip2.mp3&type=audio&seek', |
| page_set=page_set, |
| - tags=['mp3', 'audio_only', 'seek']) |
| + tags=['mp3', 'audio_only', 'seek'], |
| + name='video.html?src=tulip2.mp3&type=audio&seek') |
| self.skip_basic_metrics = True |
| @@ -266,7 +280,8 @@ class Page24(ToughVideoCasesPage): |
| super(Page24, self).__init__( |
| url='file://tough_video_cases/video.html?src=tulip2.mp4&seek', |
| page_set=page_set, |
| - tags=['h264', 'aac', 'audio_video', 'seek']) |
| + tags=['h264', 'aac', 'audio_video', 'seek'], |
| + name='video.html?src=tulip2.mp4&seek') |
| self.skip_basic_metrics = True |
| @@ -280,7 +295,8 @@ class Page25(ToughVideoCasesPage): |
| super(Page25, self).__init__( |
| url='file://tough_video_cases/video.html?src=garden2_10s.webm&seek', |
| page_set=page_set, |
| - tags=['is_4k', 'vp8', 'vorbis', 'audio_video', 'seek']) |
| + tags=['is_4k', 'vp8', 'vorbis', 'audio_video', 'seek'], |
| + name='video.html?src=garden2_10s.webm&seek') |
| self.skip_basic_metrics = True |
| @@ -294,7 +310,8 @@ class Page26(ToughVideoCasesPage): |
| super(Page26, self).__init__( |
| url='file://tough_video_cases/video.html?src=garden2_10s.mp4&seek', |
| page_set=page_set, |
| - tags=['is_4k', 'h264', 'aac', 'audio_video', 'seek']) |
| + tags=['is_4k', 'h264', 'aac', 'audio_video', 'seek'], |
| + name='video.html?src=garden2_10s.mp4&seek') |
| self.skip_basic_metrics = True |
| @@ -308,7 +325,8 @@ class Page30(ToughVideoCasesPage): |
| super(Page30, self).__init__( |
| url='file://tough_video_cases/video.html?src=tulip2.vp9.webm', |
| page_set=page_set, |
| - tags=['vp9', 'opus', 'audio_video', 'normal_play']) |
| + tags=['vp9', 'opus', 'audio_video', 'normal_play'], |
| + name='video.html?src=tulip2.vp9.webm') |
| self.add_browser_metrics = True |
| @@ -322,7 +340,8 @@ class Page31(ToughVideoCasesPage): |
| super(Page31, self).__init__( |
| url='file://tough_video_cases/video.html?src=tulip2.vp9.webm&seek', |
| page_set=page_set, |
| - tags=['vp9', 'opus', 'audio_video', 'seek']) |
| + tags=['vp9', 'opus', 'audio_video', 'seek'], |
| + name='video.html?src=tulip2.vp9.webm&seek') |
| self.skip_basic_metrics = True |
| @@ -336,7 +355,8 @@ class Page32(ToughVideoCasesPage): |
| super(Page32, self).__init__( |
| url='file://tough_video_cases/video.html?src=crowd1080_vp9.webm', |
| page_set=page_set, |
| - tags=['vp9', 'video_only', 'normal_play']) |
| + tags=['vp9', 'video_only', 'normal_play'], |
| + name='video.html?src=crowd1080_vp9.webm') |
| self.add_browser_metrics = True |
| @@ -350,7 +370,8 @@ class Page33(ToughVideoCasesPage): |
| super(Page33, self).__init__( |
| url='file://tough_video_cases/video.html?src=crowd1080_vp9.webm&seek', |
| page_set=page_set, |
| - tags=['vp9', 'video_only', 'seek']) |
| + tags=['vp9', 'video_only', 'seek'], |
| + name='video.html?src=crowd1080_vp9.webm&seek') |
| self.skip_basic_metrics = True |
| @@ -364,7 +385,8 @@ class Page34(ToughVideoCasesPage): |
| super(Page34, self).__init__( |
| url='file://tough_video_cases/video.html?src=crowd720_vp9.webm', |
| page_set=page_set, |
| - tags=['vp9', 'video_only', 'normal_play']) |
| + tags=['vp9', 'video_only', 'normal_play'], |
| + name='video.html?src=crowd720_vp9.webm') |
| self.add_browser_metrics = True |
| @@ -378,7 +400,8 @@ class Page35(ToughVideoCasesPage): |
| super(Page35, self).__init__( |
| url='file://tough_video_cases/video.html?src=crowd720_vp9.webm&seek', |
| page_set=page_set, |
| - tags=['vp9', 'video_only', 'seek']) |
| + tags=['vp9', 'video_only', 'seek'], |
| + name='video.html?src=crowd720_vp9.webm&seek') |
| self.skip_basic_metrics = True |
| @@ -393,7 +416,9 @@ class Page36(ToughVideoCasesPage): |
| url=('file://tough_video_cases/video.html?src=' |
| 'smpte_3840x2160_60fps_vp9.webm&seek'), |
| page_set=page_set, |
| - tags=['is_4k', 'vp9', 'video_only', 'seek']) |
| + tags=['is_4k', 'vp9', 'video_only', 'seek'], |
| + name=('video.html?src=' |
| + 'smpte_3840x2160_60fps_vp9.webm&seek')) |
| self.add_browser_metrics = True |
| @@ -409,7 +434,8 @@ class ToughVideoCasesPageSet(story.StorySet): |
| """ |
| def __init__(self, measure_memory=False): |
| super(ToughVideoCasesPageSet, self).__init__( |
| - cloud_storage_bucket=story.PARTNER_BUCKET) |
| + cloud_storage_bucket=story.PARTNER_BUCKET, |
| + verify_names=True) |
| self.measure_memory = measure_memory |