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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/media/media_stream_video_capturer_source_unittest.cc

Issue 2964003002: Remove support for old getUserMedia video constraints algorithm. (Closed)
Patch Set: rebase and address hbos@ comments 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/media_stream_video_capturer_source.cc ('k') | content/renderer/media/media_stream_video_source.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_video_capturer_source_unittest.cc
diff --git a/content/renderer/media/media_stream_video_capturer_source_unittest.cc b/content/renderer/media/media_stream_video_capturer_source_unittest.cc
index e4cffd6526b7f10ab1731c04d82881fa245aced8..11efe040786b6f93a6ae558864c597ee25faa445 100644
--- a/content/renderer/media/media_stream_video_capturer_source_unittest.cc
+++ b/content/renderer/media/media_stream_video_capturer_source_unittest.cc
@@ -12,13 +12,10 @@
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/test/scoped_feature_list.h"
#include "base/test/scoped_task_environment.h"
#include "content/child/child_process.h"
-#include "content/public/common/content_features.h"
#include "content/public/renderer/media_stream_video_sink.h"
#include "content/renderer/media/media_stream_video_track.h"
-#include "content/renderer/media/mock_constraint_factory.h"
#include "content/renderer/media/video_track_adapter.h"
#include "media/base/bind_to_current_loop.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -110,10 +107,7 @@ class MediaStreamVideoCapturerSourceTest : public testing::Test {
child_process_(new ChildProcess()),
source_(nullptr),
delegate_(nullptr),
- source_stopped_(false) {
- scoped_feature_list_.InitAndDisableFeature(
- features::kMediaStreamOldVideoConstraints);
- }
+ source_stopped_(false) {}
void TearDown() override {
webkit_source_.Reset();
@@ -138,18 +132,6 @@ class MediaStreamVideoCapturerSourceTest : public testing::Test {
webkit_source_id_ = webkit_source_.Id();
}
- MockConstraintFactory* constraint_factory() { return &constraint_factory_; }
-
- blink::WebMediaStreamTrack StartSource() {
- bool enabled = true;
- // CreateVideoTrack will trigger OnConstraintsApplied.
- return MediaStreamVideoTrack::CreateVideoTrack(
- source_, constraint_factory_.CreateWebMediaConstraints(),
- base::Bind(&MediaStreamVideoCapturerSourceTest::OnConstraintsApplied,
- base::Unretained(this)),
- enabled);
- }
-
blink::WebMediaStreamTrack StartSource(
const VideoTrackAdapterSettings& adapter_settings,
const base::Optional<bool>& noise_reduction,
@@ -167,10 +149,6 @@ class MediaStreamVideoCapturerSourceTest : public testing::Test {
MockVideoCapturerSource& mock_delegate() { return *delegate_; }
- const char* GetPowerLineFrequencyForTesting() const {
- return source_->GetPowerLineFrequencyForTesting();
- }
-
void OnSourceStopped(const blink::WebMediaStreamSource& source) {
source_stopped_ = true;
EXPECT_EQ(source.Id(), webkit_source_id_);
@@ -192,8 +170,6 @@ class MediaStreamVideoCapturerSourceTest : public testing::Test {
MockVideoCapturerSource* delegate_; // owned by |source|.
blink::WebString webkit_source_id_;
bool source_stopped_;
- MockConstraintFactory constraint_factory_;
- base::test::ScopedFeatureList scoped_feature_list_;
};
TEST_F(MediaStreamVideoCapturerSourceTest, StartAndStop) {
@@ -287,339 +263,4 @@ TEST_F(MediaStreamVideoCapturerSourceTest, CaptureTimeAndMetadataPlumbing) {
EXPECT_EQ(30.0, metadata_value);
}
-class MediaStreamVideoCapturerSourceOldConstraintsTest : public testing::Test {
- public:
- MediaStreamVideoCapturerSourceOldConstraintsTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
- child_process_(new ChildProcess()),
- source_(nullptr),
- delegate_(nullptr),
- source_stopped_(false) {
- scoped_feature_list_.InitAndEnableFeature(
- features::kMediaStreamOldVideoConstraints);
- }
-
- void TearDown() override {
- webkit_source_.Reset();
- blink::WebHeap::CollectAllGarbageForTesting();
- }
-
- void InitWithDeviceInfo(const StreamDeviceInfo& device_info) {
- std::unique_ptr<MockVideoCapturerSource> delegate(
- new MockVideoCapturerSource());
- delegate_ = delegate.get();
- source_ = new MediaStreamVideoCapturerSource(
- base::Bind(
- &MediaStreamVideoCapturerSourceOldConstraintsTest::OnSourceStopped,
- base::Unretained(this)),
- std::move(delegate));
- source_->SetDeviceInfo(device_info);
-
- webkit_source_.Initialize(blink::WebString::FromASCII("dummy_source_id"),
- blink::WebMediaStreamSource::kTypeVideo,
- blink::WebString::FromASCII("dummy_source_name"),
- false /* remote */);
- webkit_source_.SetExtraData(source_);
- webkit_source_id_ = webkit_source_.Id();
- }
-
- MockConstraintFactory* constraint_factory() { return &constraint_factory_; }
-
- blink::WebMediaStreamTrack StartSource() {
- bool enabled = true;
- // CreateVideoTrack will trigger OnConstraintsApplied.
- return MediaStreamVideoTrack::CreateVideoTrack(
- source_, constraint_factory_.CreateWebMediaConstraints(),
- base::Bind(&MediaStreamVideoCapturerSourceOldConstraintsTest::
- OnConstraintsApplied,
- base::Unretained(this)),
- enabled);
- }
-
- blink::WebMediaStreamTrack StartSource(
- const VideoTrackAdapterSettings& adapter_settings,
- const base::Optional<bool>& noise_reduction,
- bool is_screencast,
- double min_frame_rate) {
- bool enabled = true;
- // CreateVideoTrack will trigger OnConstraintsApplied.
- return MediaStreamVideoTrack::CreateVideoTrack(
- source_, adapter_settings, noise_reduction, is_screencast,
- min_frame_rate,
- base::Bind(&MediaStreamVideoCapturerSourceOldConstraintsTest::
- OnConstraintsApplied,
- base::Unretained(this)),
- enabled);
- }
-
- MockVideoCapturerSource& mock_delegate() { return *delegate_; }
-
- const char* GetPowerLineFrequencyForTesting() const {
- return source_->GetPowerLineFrequencyForTesting();
- }
-
- void OnSourceStopped(const blink::WebMediaStreamSource& source) {
- source_stopped_ = true;
- EXPECT_EQ(source.Id(), webkit_source_id_);
- }
- void OnStarted(bool result) { source_->OnRunStateChanged(result); }
-
- protected:
- void OnConstraintsApplied(MediaStreamSource* source,
- MediaStreamRequestResult result,
- const blink::WebString& result_name) {}
-
- // A ChildProcess and a MessageLoopForUI are both needed to fool the Tracks
- // and Sources below into believing they are on the right threads.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
- std::unique_ptr<ChildProcess> child_process_;
-
- blink::WebMediaStreamSource webkit_source_;
- MediaStreamVideoCapturerSource* source_; // owned by |webkit_source_|.
- MockVideoCapturerSource* delegate_; // owned by |source|.
- blink::WebString webkit_source_id_;
- bool source_stopped_;
- MockConstraintFactory constraint_factory_;
- base::test::ScopedFeatureList scoped_feature_list_;
-};
-
-TEST_F(MediaStreamVideoCapturerSourceOldConstraintsTest,
- TabCaptureFixedResolutionByDefault) {
- StreamDeviceInfo device_info;
- device_info.device.type = MEDIA_TAB_VIDEO_CAPTURE;
- InitWithDeviceInfo(device_info);
-
- // No constraints are being provided to the implementation, so expect only
- // default values.
- media::VideoCaptureParams expected_params;
- expected_params.requested_format.frame_size.SetSize(
- MediaStreamVideoSource::kDefaultWidth,
- MediaStreamVideoSource::kDefaultHeight);
- expected_params.requested_format.frame_rate =
- MediaStreamVideoSource::kDefaultFrameRate;
- expected_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
- expected_params.resolution_change_policy =
- media::RESOLUTION_POLICY_FIXED_RESOLUTION;
-
- InSequence s;
- EXPECT_CALL(mock_delegate(), GetCurrentSupportedFormats(_, _, _, _));
- EXPECT_CALL(mock_delegate(), StartCapture(expected_params, _, _));
- blink::WebMediaStreamTrack track = StartSource();
- // When the track goes out of scope, the source will be stopped.
- EXPECT_CALL(mock_delegate(), StopCapture());
-}
-
-TEST_F(MediaStreamVideoCapturerSourceOldConstraintsTest,
- DesktopCaptureAllowAnyResolutionChangeByDefault) {
- StreamDeviceInfo device_info;
- device_info.device.type = MEDIA_DESKTOP_VIDEO_CAPTURE;
- InitWithDeviceInfo(device_info);
-
- // No constraints are being provided to the implementation, so expect only
- // default values.
- media::VideoCaptureParams expected_params;
- expected_params.requested_format.frame_size.SetSize(
- MediaStreamVideoSource::kDefaultWidth,
- MediaStreamVideoSource::kDefaultHeight);
- expected_params.requested_format.frame_rate =
- MediaStreamVideoSource::kDefaultFrameRate;
- expected_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
- expected_params.resolution_change_policy =
- media::RESOLUTION_POLICY_ANY_WITHIN_LIMIT;
-
- InSequence s;
- EXPECT_CALL(mock_delegate(), GetCurrentSupportedFormats(_, _, _, _));
- EXPECT_CALL(mock_delegate(), StartCapture(expected_params, _, _));
- blink::WebMediaStreamTrack track = StartSource();
- // When the track goes out of scope, the source will be stopped.
- EXPECT_CALL(mock_delegate(), StopCapture());
-}
-
-TEST_F(MediaStreamVideoCapturerSourceOldConstraintsTest,
- TabCaptureConstraintsImplyFixedAspectRatio) {
- StreamDeviceInfo device_info;
- device_info.device.type = MEDIA_TAB_VIDEO_CAPTURE;
- InitWithDeviceInfo(device_info);
-
- // Specify max and min size constraints that have the same ~16:9 aspect ratio.
- constraint_factory()->basic().width.SetMax(1920);
- constraint_factory()->basic().height.SetMax(1080);
- constraint_factory()->basic().width.SetMin(854);
- constraint_factory()->basic().height.SetMin(480);
- constraint_factory()->basic().frame_rate.SetMax(60.0);
-
- media::VideoCaptureParams expected_params;
- expected_params.requested_format.frame_size.SetSize(1920, 1080);
- expected_params.requested_format.frame_rate = 60.0;
- expected_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
- expected_params.resolution_change_policy =
- media::RESOLUTION_POLICY_FIXED_ASPECT_RATIO;
-
- InSequence s;
- EXPECT_CALL(mock_delegate(), GetCurrentSupportedFormats(_, _, _, _));
- EXPECT_CALL(
- mock_delegate(),
- StartCapture(
- testing::Field(&media::VideoCaptureParams::resolution_change_policy,
- media::RESOLUTION_POLICY_FIXED_ASPECT_RATIO),
- _, _));
- blink::WebMediaStreamTrack track = StartSource();
- // When the track goes out of scope, the source will be stopped.
- EXPECT_CALL(mock_delegate(), StopCapture());
-}
-
-TEST_F(MediaStreamVideoCapturerSourceOldConstraintsTest,
- TabCaptureConstraintsImplyAllowingAnyResolutionChange) {
- StreamDeviceInfo device_info;
- device_info.device.type = MEDIA_TAB_VIDEO_CAPTURE;
- InitWithDeviceInfo(device_info);
-
- // Specify max and min size constraints with different aspect ratios.
- constraint_factory()->basic().width.SetMax(1920);
- constraint_factory()->basic().height.SetMax(1080);
- constraint_factory()->basic().width.SetMin(0);
- constraint_factory()->basic().height.SetMin(0);
- constraint_factory()->basic().frame_rate.SetMax(60.0);
-
- media::VideoCaptureParams expected_params;
- expected_params.requested_format.frame_size.SetSize(1920, 1080);
- expected_params.requested_format.frame_rate = 60.0;
- expected_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
- expected_params.resolution_change_policy =
- media::RESOLUTION_POLICY_ANY_WITHIN_LIMIT;
-
- InSequence s;
- EXPECT_CALL(mock_delegate(), GetCurrentSupportedFormats(_, _, _, _));
- EXPECT_CALL(
- mock_delegate(),
- StartCapture(
- testing::Field(&media::VideoCaptureParams::resolution_change_policy,
- media::RESOLUTION_POLICY_ANY_WITHIN_LIMIT),
- _, _));
- blink::WebMediaStreamTrack track = StartSource();
- // When the track goes out of scope, the source will be stopped.
- EXPECT_CALL(mock_delegate(), StopCapture());
-}
-
-TEST_F(MediaStreamVideoCapturerSourceOldConstraintsTest,
- DeviceCaptureConstraintsSupportPowerLineFrequency) {
- for (int frequency = -100; frequency < 100; ++frequency) {
- StreamDeviceInfo device_info;
- device_info.device.type = MEDIA_DEVICE_VIDEO_CAPTURE;
- InitWithDeviceInfo(device_info);
- constraint_factory_.Reset();
-
- constraint_factory()->AddAdvanced().goog_power_line_frequency.SetExact(
- frequency);
-
- media::VideoCaptureParams expected_params;
- expected_params.requested_format.frame_size.SetSize(
- MediaStreamVideoSource::kDefaultWidth,
- MediaStreamVideoSource::kDefaultHeight);
- expected_params.requested_format.frame_rate =
- MediaStreamVideoSource::kDefaultFrameRate;
- expected_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
- expected_params.resolution_change_policy =
- media::RESOLUTION_POLICY_FIXED_RESOLUTION;
- if (frequency == 50) {
- expected_params.power_line_frequency =
- media::PowerLineFrequency::FREQUENCY_50HZ;
- } else if (frequency == 60) {
- expected_params.power_line_frequency =
- media::PowerLineFrequency::FREQUENCY_60HZ;
- } else {
- expected_params.power_line_frequency =
- media::PowerLineFrequency::FREQUENCY_DEFAULT;
- }
-
- InSequence s;
- EXPECT_CALL(mock_delegate(), GetCurrentSupportedFormats(_, _, _, _));
- EXPECT_CALL(mock_delegate(), StartCapture(expected_params, _, _));
- blink::WebMediaStreamTrack track = StartSource();
- // When the track goes out of scope, the source will be stopped.
- EXPECT_CALL(mock_delegate(), StopCapture());
- }
-}
-
-TEST_F(MediaStreamVideoCapturerSourceOldConstraintsTest, Ended) {
- std::unique_ptr<MockVideoCapturerSource> delegate(
- new MockVideoCapturerSource());
- delegate_ = delegate.get();
- source_ = new MediaStreamVideoCapturerSource(
- base::Bind(
- &MediaStreamVideoCapturerSourceOldConstraintsTest::OnSourceStopped,
- base::Unretained(this)),
- std::move(delegate));
- webkit_source_.Initialize(blink::WebString::FromASCII("dummy_source_id"),
- blink::WebMediaStreamSource::kTypeVideo,
- blink::WebString::FromASCII("dummy_source_name"),
- false /* remote */);
- webkit_source_.SetExtraData(source_);
- webkit_source_id_ = webkit_source_.Id();
-
- InSequence s;
- EXPECT_CALL(mock_delegate(), GetCurrentSupportedFormats(_, _, _, _));
- EXPECT_CALL(mock_delegate(), StartCapture(_, _, _));
- blink::WebMediaStreamTrack track = StartSource();
- base::RunLoop().RunUntilIdle();
-
- OnStarted(true);
- base::RunLoop().RunUntilIdle();
- EXPECT_EQ(blink::WebMediaStreamSource::kReadyStateLive,
- webkit_source_.GetReadyState());
-
- EXPECT_FALSE(source_stopped_);
-
- EXPECT_CALL(mock_delegate(), StopCapture());
- OnStarted(false);
- base::RunLoop().RunUntilIdle();
- EXPECT_EQ(blink::WebMediaStreamSource::kReadyStateEnded,
- webkit_source_.GetReadyState());
- // Verify that MediaStreamSource::SourceStoppedCallback has been triggered.
- EXPECT_TRUE(source_stopped_);
-}
-
-TEST_F(MediaStreamVideoCapturerSourceOldConstraintsTest,
- CaptureTimeAndMetadataPlumbing) {
- StreamDeviceInfo device_info;
- device_info.device.type = MEDIA_DESKTOP_VIDEO_CAPTURE;
- InitWithDeviceInfo(device_info);
-
- VideoCaptureDeliverFrameCB deliver_frame_cb;
- media::VideoCapturerSource::RunningCallback running_cb;
-
- InSequence s;
- EXPECT_CALL(mock_delegate(), GetCurrentSupportedFormats(_, _, _, _));
- EXPECT_CALL(mock_delegate(), StartCapture(_, _, _))
- .WillOnce(testing::DoAll(testing::SaveArg<1>(&deliver_frame_cb),
- testing::SaveArg<2>(&running_cb)));
- EXPECT_CALL(mock_delegate(), RequestRefreshFrame());
- EXPECT_CALL(mock_delegate(), StopCapture());
- blink::WebMediaStreamTrack track = StartSource();
- running_cb.Run(true);
-
- base::RunLoop run_loop;
- base::TimeTicks reference_capture_time =
- base::TimeTicks::FromInternalValue(60013);
- base::TimeTicks capture_time;
- media::VideoFrameMetadata metadata;
- FakeMediaStreamVideoSink fake_sink(
- &capture_time, &metadata,
- media::BindToCurrentLoop(run_loop.QuitClosure()));
- fake_sink.ConnectToTrack(track);
- const scoped_refptr<media::VideoFrame> frame =
- media::VideoFrame::CreateBlackFrame(gfx::Size(2, 2));
- frame->metadata()->SetDouble(media::VideoFrameMetadata::FRAME_RATE, 30.0);
- child_process_->io_task_runner()->PostTask(
- FROM_HERE, base::Bind(deliver_frame_cb, frame, reference_capture_time));
- run_loop.Run();
- fake_sink.DisconnectFromTrack();
- EXPECT_EQ(reference_capture_time, capture_time);
- double metadata_value;
- EXPECT_TRUE(metadata.GetDouble(media::VideoFrameMetadata::FRAME_RATE,
- &metadata_value));
- EXPECT_EQ(30.0, metadata_value);
-}
-
} // namespace content
« no previous file with comments | « content/renderer/media/media_stream_video_capturer_source.cc ('k') | content/renderer/media/media_stream_video_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698