| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stdint.h> | 5 #include <stdint.h> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 EXPECT_EQ(blink::WebMediaStreamTrack::FacingMode::kNone, | 311 EXPECT_EQ(blink::WebMediaStreamTrack::FacingMode::kNone, |
| 312 settings.facing_mode); | 312 settings.facing_mode); |
| 313 } | 313 } |
| 314 | 314 |
| 315 TEST_F(MediaStreamVideoTrackTest, GetSettingsWithAdjustment) { | 315 TEST_F(MediaStreamVideoTrackTest, GetSettingsWithAdjustment) { |
| 316 InitializeSource(); | 316 InitializeSource(); |
| 317 const int kAdjustedWidth = 600; | 317 const int kAdjustedWidth = 600; |
| 318 const int kAdjustedHeight = 400; | 318 const int kAdjustedHeight = 400; |
| 319 const double kAdjustedFrameRate = 20.0; | 319 const double kAdjustedFrameRate = 20.0; |
| 320 VideoTrackAdapterSettings adapter_settings(kAdjustedWidth, kAdjustedHeight, | 320 VideoTrackAdapterSettings adapter_settings(kAdjustedWidth, kAdjustedHeight, |
| 321 0.0, 10000.0, kAdjustedFrameRate); | 321 0.0, 10000.0, kAdjustedFrameRate, |
| 322 base::Optional<gfx::Size>()); |
| 322 blink::WebMediaStreamTrack track = CreateTrackWithSettings(adapter_settings); | 323 blink::WebMediaStreamTrack track = CreateTrackWithSettings(adapter_settings); |
| 323 MediaStreamVideoTrack* const native_track = | 324 MediaStreamVideoTrack* const native_track = |
| 324 MediaStreamVideoTrack::GetVideoTrack(track); | 325 MediaStreamVideoTrack::GetVideoTrack(track); |
| 325 blink::WebMediaStreamTrack::Settings settings; | 326 blink::WebMediaStreamTrack::Settings settings; |
| 326 native_track->GetSettings(settings); | 327 native_track->GetSettings(settings); |
| 327 EXPECT_EQ(kAdjustedWidth, settings.width); | 328 EXPECT_EQ(kAdjustedWidth, settings.width); |
| 328 EXPECT_EQ(kAdjustedHeight, settings.height); | 329 EXPECT_EQ(kAdjustedHeight, settings.height); |
| 329 EXPECT_EQ(kAdjustedFrameRate, settings.frame_rate); | 330 EXPECT_EQ(kAdjustedFrameRate, settings.frame_rate); |
| 330 EXPECT_EQ(blink::WebMediaStreamTrack::FacingMode::kNone, | 331 EXPECT_EQ(blink::WebMediaStreamTrack::FacingMode::kNone, |
| 331 settings.facing_mode); | 332 settings.facing_mode); |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 579 native_track->GetSettings(settings); | 580 native_track->GetSettings(settings); |
| 580 // These values come straight from the mock video track implementation. | 581 // These values come straight from the mock video track implementation. |
| 581 EXPECT_EQ(640, settings.width); | 582 EXPECT_EQ(640, settings.width); |
| 582 EXPECT_EQ(480, settings.height); | 583 EXPECT_EQ(480, settings.height); |
| 583 EXPECT_EQ(30.0, settings.frame_rate); | 584 EXPECT_EQ(30.0, settings.frame_rate); |
| 584 EXPECT_EQ(blink::WebMediaStreamTrack::FacingMode::kNone, | 585 EXPECT_EQ(blink::WebMediaStreamTrack::FacingMode::kNone, |
| 585 settings.facing_mode); | 586 settings.facing_mode); |
| 586 } | 587 } |
| 587 | 588 |
| 588 } // namespace content | 589 } // namespace content |
| OLD | NEW |