| OLD | NEW |
| 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 <string> | 14 #include <string> |
| 14 #include <vector> | 15 #include <vector> |
| 15 | 16 |
| 16 #include "webrtc/base/gunit.h" | 17 #include "webrtc/base/gunit.h" |
| 17 #include "webrtc/base/logging.h" | 18 #include "webrtc/base/logging.h" |
| 18 #include "webrtc/media/base/fakevideocapturer.h" | 19 #include "webrtc/media/base/fakevideocapturer.h" |
| 19 #include "webrtc/media/base/mediachannel.h" | 20 #include "webrtc/media/base/mediachannel.h" |
| 20 #include "webrtc/media/base/testutils.h" | 21 #include "webrtc/media/base/testutils.h" |
| 21 #include "webrtc/media/base/videoadapter.h" | 22 #include "webrtc/media/base/videoadapter.h" |
| 22 | 23 |
| (...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 EXPECT_EQ(480, out_format.width); | 539 EXPECT_EQ(480, out_format.width); |
| 539 EXPECT_EQ(270, out_format.height); | 540 EXPECT_EQ(270, out_format.height); |
| 540 | 541 |
| 541 adapter_.OnResolutionRequest(rtc::Optional<int>(), rtc::Optional<int>()); | 542 adapter_.OnResolutionRequest(rtc::Optional<int>(), rtc::Optional<int>()); |
| 542 out_format = adapter_.AdaptFrameResolution(1280, 720); | 543 out_format = adapter_.AdaptFrameResolution(1280, 720); |
| 543 EXPECT_EQ(1280, out_format.width); | 544 EXPECT_EQ(1280, out_format.width); |
| 544 EXPECT_EQ(720, out_format.height); | 545 EXPECT_EQ(720, out_format.height); |
| 545 } | 546 } |
| 546 | 547 |
| 547 } // namespace cricket | 548 } // namespace cricket |
| OLD | NEW |