Commit 7c00a2ea authored by Brian Sheedy's avatar Brian Sheedy Committed by Commit Bot

Fix missing GPU ignored borders

Adds the 1 pixel ignored border argument to the GPU video pixel tests
that use Sobel filters and didn't have it already. This should hopefully
allow some flakes I've been seeing on the ARM-based Mac DTKs to be
auto-triaged.

Bug: 1105656
Change-Id: I8b317335492e6eb025b151ba4a575c27c342ae07
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2482086
Auto-Submit: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818191}
parent 0d713b04
...@@ -130,7 +130,8 @@ class PixelTestPages(object): ...@@ -130,7 +130,8 @@ class PixelTestPages(object):
# combine into a single set of parameters. # combine into a single set of parameters.
general_mp4_algo = algo.SobelMatchingAlgorithm(max_different_pixels=56300, general_mp4_algo = algo.SobelMatchingAlgorithm(max_different_pixels=56300,
pixel_delta_threshold=35, pixel_delta_threshold=35,
edge_threshold=80) edge_threshold=80,
ignored_border_thickness=1)
return [ return [
PixelTestPage('pixel_background_image.html', PixelTestPage('pixel_background_image.html',
...@@ -200,7 +201,8 @@ class PixelTestPages(object): ...@@ -200,7 +201,8 @@ class PixelTestPages(object):
matching_algorithm=algo.SobelMatchingAlgorithm( matching_algorithm=algo.SobelMatchingAlgorithm(
max_different_pixels=41700, max_different_pixels=41700,
pixel_delta_threshold=15, pixel_delta_threshold=15,
edge_threshold=40)), edge_threshold=40,
ignored_border_thickness=1)),
PixelTestPage('pixel_video_mp4_four_colors_rot_90.html', PixelTestPage('pixel_video_mp4_four_colors_rot_90.html',
base_name + '_Video_MP4_FourColors_Rot_90', base_name + '_Video_MP4_FourColors_Rot_90',
test_rect=[0, 0, 270, 240], test_rect=[0, 0, 270, 240],
...@@ -219,14 +221,16 @@ class PixelTestPages(object): ...@@ -219,14 +221,16 @@ class PixelTestPages(object):
matching_algorithm=algo.SobelMatchingAlgorithm( matching_algorithm=algo.SobelMatchingAlgorithm(
max_different_pixels=30500, max_different_pixels=30500,
pixel_delta_threshold=15, pixel_delta_threshold=15,
edge_threshold=70)), edge_threshold=70,
ignored_border_thickness=1)),
PixelTestPage('pixel_video_vp9.html', PixelTestPage('pixel_video_vp9.html',
base_name + '_Video_VP9', base_name + '_Video_VP9',
test_rect=[0, 0, 240, 135], test_rect=[0, 0, 240, 135],
matching_algorithm=algo.SobelMatchingAlgorithm( matching_algorithm=algo.SobelMatchingAlgorithm(
max_different_pixels=114000, max_different_pixels=114000,
pixel_delta_threshold=30, pixel_delta_threshold=30,
edge_threshold=20)), edge_threshold=20,
ignored_border_thickness=1)),
PixelTestPage('pixel_video_vp9.html', PixelTestPage('pixel_video_vp9.html',
base_name + '_Video_VP9_DXVA', base_name + '_Video_VP9_DXVA',
browser_args=[cba.DISABLE_FEATURES_D3D11_VIDEO_DECODER], browser_args=[cba.DISABLE_FEATURES_D3D11_VIDEO_DECODER],
...@@ -234,7 +238,8 @@ class PixelTestPages(object): ...@@ -234,7 +238,8 @@ class PixelTestPages(object):
matching_algorithm=algo.SobelMatchingAlgorithm( matching_algorithm=algo.SobelMatchingAlgorithm(
max_different_pixels=31100, max_different_pixels=31100,
pixel_delta_threshold=30, pixel_delta_threshold=30,
edge_threshold=250)), edge_threshold=250,
ignored_border_thickness=1)),
PixelTestPage( PixelTestPage(
'pixel_video_media_stream_incompatible_stride.html', 'pixel_video_media_stream_incompatible_stride.html',
base_name + '_Video_Media_Stream_Incompatible_Stride', base_name + '_Video_Media_Stream_Incompatible_Stride',
...@@ -266,7 +271,8 @@ class PixelTestPages(object): ...@@ -266,7 +271,8 @@ class PixelTestPages(object):
matching_algorithm=algo.SobelMatchingAlgorithm( matching_algorithm=algo.SobelMatchingAlgorithm(
max_different_pixels=54400, max_different_pixels=54400,
pixel_delta_threshold=30, pixel_delta_threshold=30,
edge_threshold=250), edge_threshold=250,
ignored_border_thickness=1),
expected_per_process_crashes={ expected_per_process_crashes={
CRASH_TYPE_GPU: 1, CRASH_TYPE_GPU: 1,
}), }),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment