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

Side by Side Diff: content/renderer/media/media_stream_video_track_unittest.cc

Issue 2817673004: Make MediaStreamVideoTrack::GetSettings return the track's frame rate. (Closed)
Patch Set: Remove unnecessary comments Created 3 years, 8 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 | « content/renderer/media/media_stream_video_track.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "base/test/scoped_feature_list.h" 13 #include "base/test/scoped_feature_list.h"
14 #include "base/threading/thread_checker_impl.h" 14 #include "base/threading/thread_checker_impl.h"
15 #include "content/child/child_process.h" 15 #include "content/child/child_process.h"
16 #include "content/public/common/content_features.h" 16 #include "content/public/common/content_features.h"
17 #include "content/renderer/media/media_stream_video_track.h" 17 #include "content/renderer/media/media_stream_video_track.h"
18 #include "content/renderer/media/mock_media_stream_video_sink.h" 18 #include "content/renderer/media/mock_media_stream_video_sink.h"
19 #include "content/renderer/media/mock_media_stream_video_source.h" 19 #include "content/renderer/media/mock_media_stream_video_source.h"
20 #include "content/renderer/media/video_track_adapter.h"
20 #include "media/base/video_frame.h" 21 #include "media/base/video_frame.h"
21 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
22 #include "third_party/WebKit/public/web/WebHeap.h" 23 #include "third_party/WebKit/public/web/WebHeap.h"
23 24
24 namespace content { 25 namespace content {
25 26
26 const uint8_t kBlackValue = 0x00; 27 const uint8_t kBlackValue = 0x00;
27 const uint8_t kColorValue = 0xAB; 28 const uint8_t kColorValue = 0xAB;
28 const int kMockSourceWidth = 640; 29 const int kMockSourceWidth = 640;
29 const int kMockSourceHeight = 480; 30 const int kMockSourceHeight = 480;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 const bool enabled = true; 89 const bool enabled = true;
89 blink::WebMediaStreamTrack track = MediaStreamVideoTrack::CreateVideoTrack( 90 blink::WebMediaStreamTrack track = MediaStreamVideoTrack::CreateVideoTrack(
90 mock_source_, MediaStreamSource::ConstraintsCallback(), enabled); 91 mock_source_, MediaStreamSource::ConstraintsCallback(), enabled);
91 if (!source_started_) { 92 if (!source_started_) {
92 mock_source_->StartMockedSource(); 93 mock_source_->StartMockedSource();
93 source_started_ = true; 94 source_started_ = true;
94 } 95 }
95 return track; 96 return track;
96 } 97 }
97 98
99 // Create a track that's associated with |mock_source_| and has the given
100 // |adapter_settings|.
101 blink::WebMediaStreamTrack CreateTrackWithSettings(
102 const VideoTrackAdapterSettings& adapter_settings) {
103 const bool enabled = true;
104 blink::WebMediaStreamTrack track = MediaStreamVideoTrack::CreateVideoTrack(
105 mock_source_, adapter_settings, base::Optional<bool>(), false, 0.0,
106 MediaStreamSource::ConstraintsCallback(), enabled);
107 if (!source_started_) {
108 mock_source_->StartMockedSource();
109 source_started_ = true;
110 }
111 return track;
112 }
113
98 void UpdateVideoSourceToRespondToRequestRefreshFrame() { 114 void UpdateVideoSourceToRespondToRequestRefreshFrame() {
99 blink_source_.Reset(); 115 blink_source_.Reset();
100 mock_source_ = IsOldVideoConstraints() 116 mock_source_ = IsOldVideoConstraints()
101 ? new MockMediaStreamVideoSource(false, true) 117 ? new MockMediaStreamVideoSource(false, true)
102 : new MockMediaStreamVideoSource( 118 : new MockMediaStreamVideoSource(
103 media::VideoCaptureFormat( 119 media::VideoCaptureFormat(
104 gfx::Size(kMockSourceWidth, kMockSourceHeight), 120 gfx::Size(kMockSourceWidth, kMockSourceHeight),
105 30.0, media::PIXEL_FORMAT_I420), 121 30.0, media::PIXEL_FORMAT_I420),
106 true); 122 true);
107 blink_source_.Initialize(blink::WebString::FromASCII("dummy_source_id"), 123 blink_source_.Initialize(blink::WebString::FromASCII("dummy_source_id"),
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 blink::WebMediaStreamTrack::Settings settings; 305 blink::WebMediaStreamTrack::Settings settings;
290 native_track->GetSettings(settings); 306 native_track->GetSettings(settings);
291 // These values come straight from the mock video track implementation. 307 // These values come straight from the mock video track implementation.
292 EXPECT_EQ(640, settings.width); 308 EXPECT_EQ(640, settings.width);
293 EXPECT_EQ(480, settings.height); 309 EXPECT_EQ(480, settings.height);
294 EXPECT_EQ(30.0, settings.frame_rate); 310 EXPECT_EQ(30.0, settings.frame_rate);
295 EXPECT_EQ(blink::WebMediaStreamTrack::FacingMode::kNone, 311 EXPECT_EQ(blink::WebMediaStreamTrack::FacingMode::kNone,
296 settings.facing_mode); 312 settings.facing_mode);
297 } 313 }
298 314
315 TEST_F(MediaStreamVideoTrackTest, GetSettingsWithAdjustment) {
316 InitializeSource();
317 const int kAdjustedWidth = 600;
318 const int kAdjustedHeight = 400;
319 const double kAdjustedFrameRate = 20.0;
320 VideoTrackAdapterSettings adapter_settings(kAdjustedWidth, kAdjustedHeight,
321 0.0, 10000.0, kAdjustedFrameRate);
322 blink::WebMediaStreamTrack track = CreateTrackWithSettings(adapter_settings);
323 MediaStreamVideoTrack* const native_track =
324 MediaStreamVideoTrack::GetVideoTrack(track);
325 blink::WebMediaStreamTrack::Settings settings;
326 native_track->GetSettings(settings);
327 EXPECT_EQ(kAdjustedWidth, settings.width);
328 EXPECT_EQ(kAdjustedHeight, settings.height);
329 EXPECT_EQ(kAdjustedFrameRate, settings.frame_rate);
330 EXPECT_EQ(blink::WebMediaStreamTrack::FacingMode::kNone,
331 settings.facing_mode);
332 }
333
334 TEST_F(MediaStreamVideoTrackTest, GetSettingsStopped) {
335 InitializeSource();
336 blink::WebMediaStreamTrack track = CreateTrack();
337 MediaStreamVideoTrack* const native_track =
338 MediaStreamVideoTrack::GetVideoTrack(track);
339 native_track->Stop();
340 blink::WebMediaStreamTrack::Settings settings;
341 native_track->GetSettings(settings);
342 EXPECT_EQ(-1, settings.width);
343 EXPECT_EQ(-1, settings.height);
344 EXPECT_EQ(-1, settings.frame_rate);
345 EXPECT_EQ(blink::WebMediaStreamTrack::FacingMode::kNone,
346 settings.facing_mode);
347 EXPECT_TRUE(settings.device_id.IsNull());
348 }
349
299 // TODO(guidou): Remove this test. http://crbug.com/706408 350 // TODO(guidou): Remove this test. http://crbug.com/706408
300 class MediaStreamVideoTrackOldConstraintsTest : public ::testing::Test { 351 class MediaStreamVideoTrackOldConstraintsTest : public ::testing::Test {
301 public: 352 public:
302 MediaStreamVideoTrackOldConstraintsTest() 353 MediaStreamVideoTrackOldConstraintsTest()
303 : child_process_(new ChildProcess()), 354 : child_process_(new ChildProcess()),
304 mock_source_(nullptr), 355 mock_source_(nullptr),
305 source_started_(false) { 356 source_started_(false) {
306 scoped_feature_list_.InitAndEnableFeature( 357 scoped_feature_list_.InitAndEnableFeature(
307 features::kMediaStreamOldVideoConstraints); 358 features::kMediaStreamOldVideoConstraints);
308 } 359 }
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 native_track->GetSettings(settings); 579 native_track->GetSettings(settings);
529 // These values come straight from the mock video track implementation. 580 // These values come straight from the mock video track implementation.
530 EXPECT_EQ(640, settings.width); 581 EXPECT_EQ(640, settings.width);
531 EXPECT_EQ(480, settings.height); 582 EXPECT_EQ(480, settings.height);
532 EXPECT_EQ(30.0, settings.frame_rate); 583 EXPECT_EQ(30.0, settings.frame_rate);
533 EXPECT_EQ(blink::WebMediaStreamTrack::FacingMode::kNone, 584 EXPECT_EQ(blink::WebMediaStreamTrack::FacingMode::kNone,
534 settings.facing_mode); 585 settings.facing_mode);
535 } 586 }
536 587
537 } // namespace content 588 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_video_track.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698