Add VP9 videos to VDA and ChromeHWDecodeUsed tests.
BUG=chromium:462467
TEST=Run the test.
Change-Id: I9625940158f3df8636078d1f11e3903e81992b6a
Reviewed-on: https://chromium-review.googlesource.com/262827
Reviewed-by: Pawel Osciak <posciak@chromium.org>
Tested-by: Wu-cheng Li <wuchengli@chromium.org>
Commit-Queue: Wu-cheng Li <wuchengli@chromium.org>
diff --git a/client/site_tests/video_ChromeHWDecodeUsed/control.vp9 b/client/site_tests/video_ChromeHWDecodeUsed/control.vp9
new file mode 100644
index 0000000..d218c9a
--- /dev/null
+++ b/client/site_tests/video_ChromeHWDecodeUsed/control.vp9
@@ -0,0 +1,27 @@
+# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTHOR = "Chrome OS Project, chromeos-video@google.com"
+NAME = "video_ChromeHWDecodeUsed.vp9"
+PURPOSE = "Verify that VP9 video decode acceleration works in Chrome"
+CRITERIA = """
+This test will fail if VDA doesn't work with Chrome navigating to a VP9 webm
+file.
+"""
+TIME = "SHORT"
+TEST_CATEGORY = "General"
+TEST_CLASS = "video"
+TEST_TYPE = "client"
+DEPENDENCIES = "hw_video_acc_vp9"
+JOB_RETRIES = 2
+BUG_TEMPLATE = {
+ 'labels': ['OS-Chrome', 'Cr-OS-Kernel-Video'],
+}
+
+DOC = """
+This test verifies VP9 video decode acceleration works.
+"""
+
+video = 'http://commondatastorage.googleapis.com/chromiumos-test-assets-public/video_VideoSeek/video.vp9.webm'
+job.run_test('video_ChromeHWDecodeUsed', video_file=video)
diff --git a/client/site_tests/video_VideoDecodeAccelerator/control.vp9 b/client/site_tests/video_VideoDecodeAccelerator/control.vp9
new file mode 100644
index 0000000..67ec163
--- /dev/null
+++ b/client/site_tests/video_VideoDecodeAccelerator/control.vp9
@@ -0,0 +1,34 @@
+# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTHOR = "Chrome OS Team, chromeos-video@google.com"
+NAME = "video_VideoDecodeAccelerator.vp9"
+PURPOSE = "Verify Chromium Video Decode Acceleration for VP9 works."
+CRITERIA = """
+This test will fail if any of the tests in video_decode_accelerator_unittest
+fails. Running video_decode_accelerator_unittest is skipped on machines that are
+known not to support video decode.
+"""
+SUITE = "bvt-perbuild"
+TIME = "SHORT"
+TEST_CATEGORY = "Functional"
+TEST_CLASS = "video"
+TEST_TYPE = "client"
+JOB_RETRIES = 2
+# Reboot in the lab after the test ends.
+DEPENDENCIES = "cleanup-reboot, hw_video_acc_vp9"
+RETRIES = 1
+BUG_TEMPLATE = {
+ 'labels': ['OS-Chrome', 'Cr-OS-Kernel-Video'],
+}
+
+DOC = """
+This is a wrapper test for Chrome video_decode_accelerator_unittest.
+"""
+
+# The FPS expectations here are lower than observed in most runs to keep
+# the bots green.
+videos = ['test-25fps.vp9:320:240:250:250:35:150:12']
+
+job.run_test('video_VideoDecodeAccelerator', videos=videos)
