Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(657)

Unified Diff: media/test/pipeline_integration_test.cc

Issue 1188753002: media: Fix mojo pipeline integration tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 1e8911920da0be035fa3ffbdbda7756251487487..30543e1bb3f9d596cc1597624e36d8cb40d24a89 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -35,6 +35,7 @@
// real audio plays out for each test.
#define EXPECT_HASH_EQ(a, b)
#define EXPECT_VIDEO_FORMAT_EQ(a, b)
+#define EXPECT_COLOR_SPACE_EQ(a, b)
// TODO(xhwang): EME support is not complete for the mojo renderer, so all
// encrypted tests are currently disabled.
@@ -46,6 +47,7 @@
#else
#define EXPECT_HASH_EQ(a, b) EXPECT_EQ(a, b)
#define EXPECT_VIDEO_FORMAT_EQ(a, b) EXPECT_EQ(a, b)
+#define EXPECT_COLOR_SPACE_EQ(a, b) EXPECT_EQ(a, b)
#endif
using testing::_;
@@ -1662,7 +1664,8 @@ TEST_F(PipelineIntegrationTest, BT709_VP9_WebM) {
Play();
ASSERT_TRUE(WaitUntilOnEnded());
EXPECT_VIDEO_FORMAT_EQ(last_video_frame_format_, VideoFrame::YV12);
- EXPECT_EQ(last_video_frame_color_space_, VideoFrame::COLOR_SPACE_HD_REC709);
+ EXPECT_COLOR_SPACE_EQ(last_video_frame_color_space_,
+ VideoFrame::COLOR_SPACE_HD_REC709);
}
// Verify that videos with an odd frame size playback successfully.

Powered by Google App Engine
This is Rietveld 408576698