summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorshadi@chromium.org <shadi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 00:26:41 +0000
committershadi@chromium.org <shadi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 00:26:41 +0000
commit0114ec0aecaf3fa18297708bd7bf2b39de61b57f (patch)
treec8efd635e29c76b8c947f983b69aa0836dc533b0 /tools
parentf72f54673e1dfff61630762b1824031217084272 (diff)
downloadchromium_src-0114ec0aecaf3fa18297708bd7bf2b39de61b57f.zip
chromium_src-0114ec0aecaf3fa18297708bd7bf2b39de61b57f.tar.gz
chromium_src-0114ec0aecaf3fa18297708bd7bf2b39de61b57f.tar.bz2
Add seek tests to media constrained network benchmark.
BUG=311713 Review URL: https://codereview.chromium.org/217033007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260715 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/page_sets/media_cns_cases.json63
-rw-r--r--tools/perf/page_sets/tough_video_cases/video.html3
2 files changed, 65 insertions, 1 deletions
diff --git a/tools/perf/page_sets/media_cns_cases.json b/tools/perf/page_sets/media_cns_cases.json
index 7a54d2c..1cf20a7 100644
--- a/tools/perf/page_sets/media_cns_cases.json
+++ b/tools/perf/page_sets/media_cns_cases.json
@@ -8,6 +8,27 @@
"wait_for_ended": true
}
],
+ "seek_before_and_after_playhead": [
+ { "action": "play",
+ "wait_for_playing": true,
+ "wait_for_ended": false
+ },
+ { "_comment": "Wait for 1 second so that we know the play-head is at ~1s.",
+ "action": "wait", "seconds": 1
+ },
+ { "_comment": "Seek to before the play-head location.",
+ "action": "seek",
+ "wait_for_seeked": true,
+ "seek_time": "0.5",
+ "seek_label": "seek_warm"
+ },
+ { "_comment": "Seek to after the play-head location.",
+ "action": "seek",
+ "wait_for_seeked": true,
+ "seek_time": 15,
+ "seek_label": "seek_cold"
+ }
+ ],
"pages": [
{
"url": "file://tough_video_cases/video.html?id=no_constraints_webm&src=tulip2.webm&net=none"
@@ -71,6 +92,48 @@
},
{
"url": "file://tough_video_cases/video.html?id=wifi_m4a&src=tulip2.m4a&type=audio&net=wifi"
+ },
+ {
+ "url": "file://tough_video_cases/video.html?id=wifi_mp3&src=tulip2.mp3&type=audio&net=wifi",
+ "skip_basic_metrics": true,
+ "add_browser_metrics": false,
+ "media_metrics": {"action": "seek_before_and_after_playhead"}
+ },
+ {
+ "url": "file://tough_video_cases/video.html?id=wifi_m4a&src=tulip2.m4a&type=audio&net=wifi",
+ "skip_basic_metrics": true,
+ "add_browser_metrics": false,
+ "media_metrics": {"action": "seek_before_and_after_playhead"}
+ },
+ {
+ "url": "file://tough_video_cases/video.html?id=wifi_ogg&src=tulip2.ogg&type=audio&net=wifi",
+ "skip_basic_metrics": true,
+ "add_browser_metrics": false,
+ "media_metrics": {"action": "seek_before_and_after_playhead"}
+ },
+ {
+ "url": "file://tough_video_cases/video.html?id=wifi_wav&src=tulip2.wav&type=audio&net=wifi",
+ "skip_basic_metrics": true,
+ "add_browser_metrics": false,
+ "media_metrics": {"action": "seek_before_and_after_playhead"}
+ },
+ {
+ "url": "file://tough_video_cases/video.html?id=wifi_mp4&src=tulip2.mp4&type=audio&net=wifi",
+ "skip_basic_metrics": true,
+ "add_browser_metrics": false,
+ "media_metrics": {"action": "seek_before_and_after_playhead"}
+ },
+ {
+ "url": "file://tough_video_cases/video.html?id=wifi_ogv&src=tulip2.ogv&type=audio&net=wifi",
+ "skip_basic_metrics": true,
+ "add_browser_metrics": false,
+ "media_metrics": {"action": "seek_before_and_after_playhead"}
+ },
+ {
+ "url": "file://tough_video_cases/video.html?id=wifi_webm&src=tulip2.webm&type=audio&net=wifi",
+ "skip_basic_metrics": true,
+ "add_browser_metrics": false,
+ "media_metrics": {"action": "seek_before_and_after_playhead"}
}
]
}
diff --git a/tools/perf/page_sets/tough_video_cases/video.html b/tools/perf/page_sets/tough_video_cases/video.html
index 641d822..5e7bd30 100644
--- a/tools/perf/page_sets/tough_video_cases/video.html
+++ b/tools/perf/page_sets/tough_video_cases/video.html
@@ -40,7 +40,8 @@
function getMediaSRC() {
var mediaSRC = qsParams['src']
if (qsParams['net'])
- return getNetsimURL(qsParams['net']) + '&f=' + mediaSRC;
+ return getNetsimURL(qsParams['net']) + '&new_port=True' + '&f=' +
+ mediaSRC;
return mediaSRC;
}