BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 81 insertions, 0 deletions

diff --git a/chromium/docs/media/gpu/video_decoder_perf_test_usage.md b/chromium/docs/media/gpu/video_decoder_perf_test_usage.md
index 26bf41c8537..f5d4c6690dd 100644
--- a/chromium/docs/media/gpu/video_decoder_perf_test_usage.md
+++ b/chromium/docs/media/gpu/video_decoder_perf_test_usage.md
@@ -92,6 +92,10 @@ Multiple command line arguments can be given to the command:
                          will be stored in the current working directory.
     --use_vd             use the new VD-based video decoders, instead of
                          the default VDA-based video decoders.
+    --use_vd_vda         use the new VD-based video decoders with a wrapper
+                         that translates to the VDA interface, used to test
+                         interaction with older components expecting the VDA
+                         interface.
     --gtest_help         display the gtest help and exit.
     --help               display this help and exit.
 
diff --git a/chromium/docs/media/gpu/video_decoder_test_usage.md b/chromium/docs/media/gpu/video_decoder_test_usage.md
index 321e48f236e..9d4e1bd9512 100644
--- a/chromium/docs/media/gpu/video_decoder_test_usage.md
+++ b/chromium/docs/media/gpu/video_decoder_test_usage.md
@@ -65,6 +65,10 @@ Multiple command line arguments can be given to the command:
     --disable_validator  disable frame validation.
     --use_vd             use the new VD-based video decoders, instead of
                          the default VDA-based video decoders.
+    --use_vd_vda         use the new VD-based video decoders with a wrapper
+                         that translates to the VDA interface, used to test
+                         interaction with older components expecting the VDA
+                         interface.
 
     --output_frames      write the selected video frames to disk, possible
                          values are "all|corrupt".
diff --git a/chromium/docs/media/gpu/video_encoder_test_usage.md b/chromium/docs/media/gpu/video_encoder_test_usage.md
new file mode 100644
index 00000000000..688d497cb5c
--- /dev/null
+++ b/chromium/docs/media/gpu/video_encoder_test_usage.md
@@ -0,0 +1,73 @@
+# Video Encoder tests
+The video encoder tests are a set of tests that validate various video encoding
+scenarios. They are accompanied by the video encoder performance tests that can
+be used to measure a video encoder's performance.
+
+These tests run directly on top of the video encoder implementation, and
+don't require the full Chrome browser stack. They are built on top of the
+[GoogleTest](https://github.com/google/googletest/blob/master/README.md)
+framework.
+
+__Note:__ Currently these tests are under development and functionality is still
+limited.
+
+[TOC]
+
+## Running from Tast
+Running these tests from Tast is not supported yet.
+
+## Running manually
+To run the video encoder tests manually the _video_encode_accelerator_tests_
+target needs to be built and deployed to the device being tested. Running
+the video encoder tests can be done by executing:
+
+    ./video_encode_accelerator_tests [<video path>] [<video metadata path>]
+
+e.g.: `./video_encode_accelerator_tests bear_320x192_40frames.yuv.webm`
+
+Running the video encoder performance tests can be done in a smilar way by
+building, deploying and executing the _video_encode_accelerator_perf_tests_
+target.
+
+    ./video_encode_accelerator_perf_tests [<video path>] [<video metadata path>]
+
+e.g.: `./video_encode_accelerator_perf_tests bear_320x192_40frames.yuv.webm`
+
+__Test videos:__ Various test videos are present in the
+[_media/test/data_](https://cs.chromium.org/chromium/src/media/test/data/)
+folder in Chromium's source tree (e.g.
+[_bear_320x192_40frames.yuv.webm_](https://cs.chromium.org/chromium/src/media/test/data/bear_320x192_40frames.yuv.webm)).
+These videos are stored in compressed format and extracted at the start of each
+test run, as storing uncompressed videos requires a lot of disk space. Currently
+only VP9 or uncompressed videos are supported as test input. If no video is
+specified _bear_320x192_40frames.yuv.webm_ will be used.
+
+__Video Metadata:__ These videos also have an accompanying metadata _.json_ file
+that needs to be deployed alongside the test video. The video metadata file is a
+simple json file that contains info about the video such as its pixel format,
+dimensions, framerate and number of frames. These can also be found in the
+_media/test/data_ folder (e.g.
+[_bear_320x192_40frames.yuv.webm.json_](https://cs.chromium.org/chromium/src/media/test/data/bear_320x192_40frames.yuv.webm.json)).
+If no metadata file is specified _\<video path\>.json_ will be used.
+
+## Command line options
+Multiple command line arguments can be given to the command:
+
+    --codec              codec profile to encode, "h264 (baseline)",
+                         "h264main, "h264high", "vp8" and "vp9"
+
+     -v                  enable verbose mode, e.g. -v=2.
+    --vmodule            enable verbose mode for the specified module,
+                         e.g. --vmodule=*media/gpu*=2.
+
+    --gtest_help         display the gtest help and exit.
+    --help               display this help and exit.
+
+Non-performance tests only:
+
+    --disable_validator  disable validation of encoded bitstream.
+
+## Source code
+See the video encoder tests [source code](https://cs.chromium.org/chromium/src/media/gpu/video_encode_accelerator_tests.cc).
+See the video encoder performance tests [source code](https://cs.chromium.org/chromium/src/media/gpu/video_encode_accelerator_perf_tests.cc).
+