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

Side by Side Diff: webrtc/media/base/videoadapter_unittest.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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 unified diff | Download patch
« no previous file with comments | « webrtc/media/base/videoadapter.cc ('k') | webrtc/media/base/videobroadcaster.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include <limits.h> // For INT_MAX 11 #include <limits.h> // For INT_MAX
12 12
13 #include <memory> 13 #include <memory>
14 #include <string> 14 #include <string>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/base/gunit.h"
18 #include "webrtc/base/logging.h"
19 #include "webrtc/media/base/fakevideocapturer.h" 17 #include "webrtc/media/base/fakevideocapturer.h"
20 #include "webrtc/media/base/mediachannel.h" 18 #include "webrtc/media/base/mediachannel.h"
21 #include "webrtc/media/base/testutils.h" 19 #include "webrtc/media/base/testutils.h"
22 #include "webrtc/media/base/videoadapter.h" 20 #include "webrtc/media/base/videoadapter.h"
21 #include "webrtc/rtc_base/gunit.h"
22 #include "webrtc/rtc_base/logging.h"
23 23
24 namespace cricket { 24 namespace cricket {
25 namespace { 25 namespace {
26 const int kDefaultFps = 30; 26 const int kDefaultFps = 30;
27 } // namespace 27 } // namespace
28 28
29 class VideoAdapterTest : public testing::Test { 29 class VideoAdapterTest : public testing::Test {
30 public: 30 public:
31 virtual void SetUp() { 31 virtual void SetUp() {
32 capturer_.reset(new FakeVideoCapturer); 32 capturer_.reset(new FakeVideoCapturer);
(...skipping 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after
1090 rtc::Optional<int>(640 * 360 - 1) /* target */, 1090 rtc::Optional<int>(640 * 360 - 1) /* target */,
1091 std::numeric_limits<int>::max(), std::numeric_limits<int>::max()); 1091 std::numeric_limits<int>::max(), std::numeric_limits<int>::max());
1092 1092
1093 EXPECT_TRUE(adapter_.AdaptFrameResolution(640, 360, 0, &cropped_width_, 1093 EXPECT_TRUE(adapter_.AdaptFrameResolution(640, 360, 0, &cropped_width_,
1094 &cropped_height_, &out_width_, 1094 &cropped_height_, &out_width_,
1095 &out_height_)); 1095 &out_height_));
1096 EXPECT_EQ(640, out_width_); 1096 EXPECT_EQ(640, out_width_);
1097 EXPECT_EQ(360, out_height_); 1097 EXPECT_EQ(360, out_height_);
1098 } 1098 }
1099 } // namespace cricket 1099 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/base/videoadapter.cc ('k') | webrtc/media/base/videobroadcaster.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698