Skip to content

GitLab

T
tangled
Commit fd628860 authored by vikassoni's avatar vikassoni Committed by Commit Bot
Browse files
Options

Reland "Update pixel video tests to use higher tolerance." 

This is a reland of 6a42b67c with a
test Pixel_Video_Context_Loss_VP9 being marked as failing on webview.

Original change's description:
> Update pixel video tests to use higher tolerance.
>
> 1. Update pixel video tests to use higher tolerance value for all
> formats on all devices. A tolerance of around 10% is required for
> all the pixel tests to match gold/color expectations on all the
> devices.
>
> 2. Add viewport metadata to the html page to scale correctly on mobile
> devices.
>
> 3. This CL fixes 5 pixel tests on android - Pixel_Video_MP4,
> Pixel_Video_MP4_FourColors_Aspect_4x3, Pixel_Video_MP4_FourColors_Rot_180,
> Pixel_Video_VP9 and Pixel_Video_Context_Loss_VP9. Remove the test
> expectations from pixel_expectations.txt.
>
> Bug: 925744
> Change-Id: I6d9dbd270dcc45e38f45826f98cf9035563b5f46
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1699401
> Commit-Queue: vikas soni <vikassoni@chromium.org>
> Reviewed-by: Kenneth Russell <kbr@chromium.org>
> Reviewed-by: Zhenyao Mo <zmo@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#677548}

Bug: 925744
Change-Id: Ib0fb98627ac654c09b217e67bafef0412a9a9887
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1704392Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Reviewed-by: default avatarZhenyao Mo <zmo@chromium.org>
Commit-Queue: vikas soni <vikassoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#678378}
parent 5690e740
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
content/test/data/gpu/pixel_video_context_loss.html
View file @ fd628860
...@@ -8,6 +8,7 @@ that the baseline images are regenerated on the next run. ...@@ -8,6 +8,7 @@ that the baseline images are regenerated on the next run.
<html> <html>
<head> <head>
<meta name="viewport" content="initial-scale=1">
<title>Video Context Loss Test</title> <title>Video Context Loss Test</title>
<style type="text/css"> <style type="text/css">
.nomargin { .nomargin {
......
content/test/data/gpu/pixel_video_mp4.html
View file @ fd628860
...@@ -8,6 +8,7 @@ that the baseline images are regenerated on the next run. ...@@ -8,6 +8,7 @@ that the baseline images are regenerated on the next run.
<html> <html>
<head> <head>
<meta name="viewport" content="initial-scale=1">
<title>MP4 Video test</title> <title>MP4 Video test</title>
<style type="text/css"> <style type="text/css">
.nomargin { .nomargin {
......
content/test/data/gpu/pixel_video_mp4_four_colors_aspect_4x3.html
View file @ fd628860
...@@ -8,6 +8,7 @@ that the baseline images are regenerated on the next run. ...@@ -8,6 +8,7 @@ that the baseline images are regenerated on the next run.
<html> <html>
<head> <head>
<meta name="viewport" content="initial-scale=1">
<title>MP4 Video with Aspect 4x3 Test</title> <title>MP4 Video with Aspect 4x3 Test</title>
<style type="text/css"> <style type="text/css">
.nomargin { .nomargin {
......
content/test/data/gpu/pixel_video_mp4_four_colors_rot_180.html
View file @ fd628860
...@@ -8,6 +8,7 @@ that the baseline images are regenerated on the next run. ...@@ -8,6 +8,7 @@ that the baseline images are regenerated on the next run.
<html> <html>
<head> <head>
<meta name="viewport" content="initial-scale=1">
<title>MP4 Video with 180 Degree Rotation Test</title> <title>MP4 Video with 180 Degree Rotation Test</title>
<style type="text/css"> <style type="text/css">
.nomargin { .nomargin {
......
content/test/data/gpu/pixel_video_vp9.html
View file @ fd628860
...@@ -8,6 +8,7 @@ that the baseline images are regenerated on the next run. ...@@ -8,6 +8,7 @@ that the baseline images are regenerated on the next run.
<html> <html>
<head> <head>
<meta name="viewport" content="initial-scale=1">
<title>VP9 Video test</title> <title>VP9 Video test</title>
<style type="text/css"> <style type="text/css">
.nomargin { .nomargin {
......
content/test/gpu/gpu_tests/pixel_test_pages.py
View file @ fd628860
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import sys
_FOUR_COLOR_VIDEO_240x135_EXPECTED_COLORS = [ _FOUR_COLOR_VIDEO_240x135_EXPECTED_COLORS = [
{ {
'comment': 'top left video, yellow', 'comment': 'top left video, yellow',
...@@ -132,13 +130,13 @@ class PixelTestPages(object): ...@@ -132,13 +130,13 @@ class PixelTestPages(object):
def DefaultPages(base_name): def DefaultPages(base_name):
sw_compositing_args = ['--disable-gpu-compositing'] sw_compositing_args = ['--disable-gpu-compositing']
tolerance = 3 # Tolerance of 10% is required for all the formats to match gold/pixel
tolerance_vp9 = 5 # VP9 video requires larger tolerance # expectations on all the platforms for pixel video tests. Hence setting it
if sys.platform == 'darwin': # to 20.
# On MacOSX, pixels are slightly off. # Bug filed on MacOSX to investigate the tolerance -
# https://crbug.com/911895 # https://crbug.com/911895.
tolerance = 10 tolerance = 20
tolerance_vp9 = 20 tolerance_vp9 = 20
return [ return [
PixelTestPage( PixelTestPage(
......
content/test/gpu/gpu_tests/test_expectations/pixel_expectations.txt
View file @ fd628860
...@@ -66,10 +66,6 @@ crbug.com/805739 [ android-webview-instrumentation ] Pixel_CanvasLowLatencyWebGL ...@@ -66,10 +66,6 @@ crbug.com/805739 [ android-webview-instrumentation ] Pixel_CanvasLowLatencyWebGL
# expectation below is removed. # expectation below is removed.
# crbug.com/575305 [ android-webview-instrumentation ] Pixel_WebGLSadCanvas [ Skip ] # crbug.com/575305 [ android-webview-instrumentation ] Pixel_WebGLSadCanvas [ Skip ]
# Uncomment this when crbug.com/925744 is fixed and conflicting
# expectation below is removed.
# crbug.com/925744 [ android-webview-instrumentation ] Pixel_Video_Context_Loss_VP9 [ Skip ]
crbug.com/521588 [ android ] Pixel_ScissorTestWithPreserveDrawingBuffer [ Failure ] crbug.com/521588 [ android ] Pixel_ScissorTestWithPreserveDrawingBuffer [ Failure ]
# TODO(vmiura) check / generate reference images for Android devices # TODO(vmiura) check / generate reference images for Android devices
...@@ -151,13 +147,8 @@ crbug.com/911413 [ mac amd-0x679e ] Pixel_Video_MP4_FourColors_Rot_270 [ Skip ] ...@@ -151,13 +147,8 @@ crbug.com/911413 [ mac amd-0x679e ] Pixel_Video_MP4_FourColors_Rot_270 [ Skip ]
crbug.com/927107 [ android no-skia-renderer ] Pixel_CSS3DBlueBox [ Failure ] crbug.com/927107 [ android no-skia-renderer ] Pixel_CSS3DBlueBox [ Failure ]
# Fail on Nexus 5, 5X, 6, 6P, 9 and Shield TV. # Fail on Nexus 5, 5X, 6, 6P, 9 and Shield TV.
crbug.com/925744 [ android ] Pixel_Video_MP4 [ Skip ]
crbug.com/925744 [ android ] Pixel_Video_MP4_FourColors_Aspect_4x3 [ Skip ]
crbug.com/925744 [ android ] Pixel_Video_MP4_FourColors_Rot_180 [ Skip ]
crbug.com/925744 [ android ] Pixel_Video_MP4_FourColors_Rot_270 [ Skip ] crbug.com/925744 [ android ] Pixel_Video_MP4_FourColors_Rot_270 [ Skip ]
crbug.com/925744 [ android ] Pixel_Video_MP4_FourColors_Rot_90 [ Skip ] crbug.com/925744 [ android ] Pixel_Video_MP4_FourColors_Rot_90 [ Skip ]
crbug.com/925744 [ android ] Pixel_Video_VP9 [ Skip ]
crbug.com/925744 [ android ] Pixel_Video_Context_Loss_VP9 [ Skip ]
# Skip on platforms where DXVA vs D3D11 decoder doesn't matter. # Skip on platforms where DXVA vs D3D11 decoder doesn't matter.
crbug.com/927901 [ linux ] Pixel_Video_MP4_DXVA [ Skip ] crbug.com/927901 [ linux ] Pixel_Video_MP4_DXVA [ Skip ]
...@@ -175,6 +166,12 @@ crbug.com/929425 [ win nvidia ] Pixel_DirectComposition_ComplexOverlays [ RetryO ...@@ -175,6 +166,12 @@ crbug.com/929425 [ win nvidia ] Pixel_DirectComposition_ComplexOverlays [ RetryO
# Mark all webview tests as RetryOnFailure due to Nexus 5x driver bug. # Mark all webview tests as RetryOnFailure due to Nexus 5x driver bug.
crbug.com/950932 [ android-webview-instrumentation qualcomm-adreno-(tm)-418 ] * [ RetryOnFailure ] crbug.com/950932 [ android-webview-instrumentation qualcomm-adreno-(tm)-418 ] * [ RetryOnFailure ]
# Mark 1 webview test as Failure. This test is failing instead of flaking. It
# might have the same Nexus 5x driver bug as crbug.com/950932 but that
# should have made this test flaky instead of always failing. Need to
# investigate later. Filed a bug to track the debug.
crbug.com/984734 [ android-webview-instrumentation qualcomm-adreno-(tm)-418 ] Pixel_Video_Context_Loss_VP9 [ Failure ]
# Producing black images on Nexus 5Xs in Android Webview. # Producing black images on Nexus 5Xs in Android Webview.
crbug.com/984352 [ android android-webview-instrumentation qualcomm-adreno-(tm)-418 ] Pixel_CanvasLowLatency2D [ Failure ] crbug.com/984352 [ android android-webview-instrumentation qualcomm-adreno-(tm)-418 ] Pixel_CanvasLowLatency2D [ Failure ]
......
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