diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/media/gpu/chromeos/fourcc_unittests.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media/gpu/chromeos/fourcc_unittests.cc')
| -rw-r--r-- | chromium/media/gpu/chromeos/fourcc_unittests.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chromium/media/gpu/chromeos/fourcc_unittests.cc b/chromium/media/gpu/chromeos/fourcc_unittests.cc index ade4a4b663c..d59b317ee0b 100644 --- a/chromium/media/gpu/chromeos/fourcc_unittests.cc +++ b/chromium/media/gpu/chromeos/fourcc_unittests.cc @@ -32,11 +32,11 @@ TEST(FourccTest, V4L2PixFmtToV4L2PixFmt) { CheckFromV4L2PixFmtAndBack(V4L2_PIX_FMT_ABGR32); #ifdef V4L2_PIX_FMT_RGBA32 - V4L2PixFmtIsEqual(V4L2_PIX_FMT_RGBA32); + CheckFromV4L2PixFmtAndBack(V4L2_PIX_FMT_RGBA32); #endif CheckFromV4L2PixFmtAndBack(V4L2_PIX_FMT_XBGR32); #ifdef V4L2_PIX_FMT_RGBX32 - V4L2PixFmtIsEqual(V4L2_PIX_FMT_RGBX32); + CheckFromV4L2PixFmtAndBack(V4L2_PIX_FMT_RGBX32); #endif CheckFromV4L2PixFmtAndBack(V4L2_PIX_FMT_RGB32); CheckFromV4L2PixFmtAndBack(V4L2_PIX_FMT_YUV420); @@ -133,6 +133,7 @@ TEST(FourccTest, FromVaFourCCAndBack) { CheckFromVAFourCCAndBack(VA_FOURCC_BGRA); CheckFromVAFourCCAndBack(VA_FOURCC_BGRX); CheckFromVAFourCCAndBack(VA_FOURCC_ARGB); + CheckFromVAFourCCAndBack(VA_FOURCC_P010); } TEST(FourccTest, VAFourCCToVideoPixelFormat) { @@ -154,6 +155,8 @@ TEST(FourccTest, VAFourCCToVideoPixelFormat) { Fourcc::FromVAFourCC(VA_FOURCC_BGRA)->ToVideoPixelFormat()); EXPECT_EQ(PIXEL_FORMAT_XRGB, Fourcc::FromVAFourCC(VA_FOURCC_BGRX)->ToVideoPixelFormat()); + EXPECT_EQ(PIXEL_FORMAT_P016LE, + Fourcc::FromVAFourCC(VA_FOURCC_P010)->ToVideoPixelFormat()); } TEST(FourccTest, VideoPixelFormatToVAFourCC) { @@ -175,6 +178,8 @@ TEST(FourccTest, VideoPixelFormatToVAFourCC) { *Fourcc::FromVideoPixelFormat(PIXEL_FORMAT_ARGB)->ToVAFourCC()); EXPECT_EQ(static_cast<uint32_t>(VA_FOURCC_BGRX), *Fourcc::FromVideoPixelFormat(PIXEL_FORMAT_XRGB)->ToVAFourCC()); + EXPECT_EQ(static_cast<uint32_t>(VA_FOURCC_P010), + *Fourcc::FromVideoPixelFormat(PIXEL_FORMAT_P016LE)->ToVAFourCC()); } #endif // BUILDFLAG(USE_VAAPI) @@ -189,6 +194,7 @@ TEST(FourccTest, FourccToSinglePlanar) { EXPECT_EQ(Fourcc(Fourcc::YUYV).ToSinglePlanar(), Fourcc(Fourcc::YUYV)); EXPECT_EQ(Fourcc(Fourcc::NV12).ToSinglePlanar(), Fourcc(Fourcc::NV12)); EXPECT_EQ(Fourcc(Fourcc::NV21).ToSinglePlanar(), Fourcc(Fourcc::NV21)); + EXPECT_EQ(Fourcc(Fourcc::P010).ToSinglePlanar(), Fourcc(Fourcc::P010)); EXPECT_EQ(Fourcc(Fourcc::YM12).ToSinglePlanar(), Fourcc(Fourcc::YU12).ToSinglePlanar()); EXPECT_EQ(Fourcc(Fourcc::YM21).ToSinglePlanar(), |