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

Unified Diff: webrtc/modules/video_capture/test/video_capture_unittest.cc

Issue 1807673008: Revert of Change VideoCapture_apply_rotation default to false (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « webrtc/media/base/videosourceinterface.h ('k') | webrtc/modules/video_capture/video_capture_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/video_capture/test/video_capture_unittest.cc
diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/webrtc/modules/video_capture/test/video_capture_unittest.cc
index 04f0a5ce099141a432d165afe025351426d755c8..600b618f5cffe0f2f8c556325b906b69f8416acc 100644
--- a/webrtc/modules/video_capture/test/video_capture_unittest.cc
+++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc
@@ -112,9 +112,14 @@
EXPECT_TRUE(height == capability_.height || height == capability_.width);
EXPECT_TRUE(width == capability_.width || width == capability_.height);
#else
- EXPECT_EQ(height, capability_.height);
- EXPECT_EQ(width, capability_.width);
- EXPECT_EQ(rotate_frame_, videoFrame.rotation());
+ if (rotate_frame_ == webrtc::kVideoRotation_90 ||
+ rotate_frame_ == webrtc::kVideoRotation_270) {
+ EXPECT_EQ(width, capability_.height);
+ EXPECT_EQ(height, capability_.width);
+ } else {
+ EXPECT_EQ(height, capability_.height);
+ EXPECT_EQ(width, capability_.width);
+ }
#endif
// RenderTimstamp should be the time now.
EXPECT_TRUE(
« no previous file with comments | « webrtc/media/base/videosourceinterface.h ('k') | webrtc/modules/video_capture/video_capture_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698