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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

Issue 2787703004: [Mojo Video Capture] Fix VideoCaptureManager exposing implementation details to clients (Closed)
Patch Set: Rebase to April 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/media/media_devices_manager_unittest.cc ('k') | content/browser/renderer_host/media/media_stream_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
index 44e034bf089649e3be43a36327ab4bcce017e5bc..5d10dc887f812a08a49868bbe98a6f1a0711ff1b 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
@@ -53,17 +53,26 @@ using ::testing::_;
using ::testing::DeleteArg;
using ::testing::DoAll;
using ::testing::InSequence;
+using ::testing::Invoke;
using ::testing::Return;
using ::testing::SaveArg;
-const int kProcessId = 5;
-const int kRenderId = 6;
-const int kPageRequestId = 7;
-
namespace content {
namespace {
+constexpr int kProcessId = 5;
+constexpr int kRenderId = 6;
+constexpr int kPageRequestId = 7;
+constexpr const char* kRegularVideoDeviceId = "stub_device_0";
+constexpr const char* kDepthVideoDeviceId = "stub_device_1 (depth)";
+constexpr media::VideoCaptureApi kStubCaptureApi =
+ media::VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE;
+constexpr double kStubFocalLengthX = 135.0;
+constexpr double kStubFocalLengthY = 135.6;
+constexpr double kStubDepthNear = 0.0;
+constexpr double kStubDepthFar = 65.535;
+
void AudioInputDevicesEnumerated(base::Closure quit_closure,
media::AudioDeviceDescriptions* out,
const MediaDeviceEnumeration& enumeration) {
@@ -73,7 +82,7 @@ void AudioInputDevicesEnumerated(base::Closure quit_closure,
quit_closure.Run();
}
-} // namespace
+} // anonymous namespace
class MockMediaStreamDispatcherHost : public MediaStreamDispatcherHost,
public TestContentBrowserClient {
@@ -228,6 +237,18 @@ class MockMediaStreamUIProxy : public FakeMediaStreamUIProxy {
const MediaStreamUIProxy::WindowIdCallback& window_id_callback));
};
+class MockVideoCaptureSystem : public media::VideoCaptureSystem {
+ public:
+ MOCK_METHOD1(GetDeviceInfosAsync,
+ void(const base::Callback<
+ void(const std::vector<media::VideoCaptureDeviceInfo>&)>&
+ result_callback));
+
+ MOCK_METHOD1(
+ CreateDevice,
+ std::unique_ptr<media::VideoCaptureDevice>(const std::string& device_id));
+};
+
class MediaStreamDispatcherHostTest : public testing::Test {
public:
MediaStreamDispatcherHostTest()
@@ -240,19 +261,12 @@ class MediaStreamDispatcherHostTest : public testing::Test {
// Make sure we use fake devices to avoid long delays.
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kUseFakeDeviceForMediaStream);
+ auto mock_video_capture_system = base::MakeUnique<MockVideoCaptureSystem>();
+ mock_video_capture_system_ = mock_video_capture_system.get();
// Create our own MediaStreamManager.
- media_stream_manager_ =
- base::MakeUnique<MediaStreamManager>(audio_system_.get());
- video_capture_device_factory_ =
- static_cast<media::FakeVideoCaptureDeviceFactory*>(
- media_stream_manager_->video_capture_manager()
- ->video_capture_device_factory());
- DCHECK(video_capture_device_factory_);
-#if defined(OS_WIN)
- // Override the Video Capture Thread that MediaStreamManager constructs.
- media_stream_manager_->video_capture_manager()->set_device_task_runner(
+ media_stream_manager_ = base::MakeUnique<MediaStreamManager>(
+ audio_system_.get(), std::move(mock_video_capture_system),
base::ThreadTaskRunnerHandle::Get());
-#endif
MockResourceContext* mock_resource_context =
static_cast<MockResourceContext*>(
@@ -279,9 +293,32 @@ class MediaStreamDispatcherHostTest : public testing::Test {
}
void SetUp() override {
- video_capture_device_factory_->GetDeviceDescriptors(
- &physical_video_devices_);
- ASSERT_GT(physical_video_devices_.size(), 0u);
+ stub_video_device_ids_.emplace_back(kRegularVideoDeviceId);
+ stub_video_device_ids_.emplace_back(kDepthVideoDeviceId);
+ ON_CALL(*mock_video_capture_system_, GetDeviceInfosAsync(_))
+ .WillByDefault(Invoke(
+ [this](const base::Callback<void(
+ const std::vector<media::VideoCaptureDeviceInfo>&)>&
+ result_callback) {
+ std::vector<media::VideoCaptureDeviceInfo> result;
+ for (const auto& device_id : stub_video_device_ids_) {
+ media::VideoCaptureDeviceInfo info;
+ info.descriptor.device_id = device_id;
+ info.descriptor.capture_api = kStubCaptureApi;
+ if (device_id == kDepthVideoDeviceId) {
+ info.descriptor.camera_calibration.emplace();
+ info.descriptor.camera_calibration->focal_length_x =
+ kStubFocalLengthX;
+ info.descriptor.camera_calibration->focal_length_y =
+ kStubFocalLengthY;
+ info.descriptor.camera_calibration->depth_near =
+ kStubDepthNear;
+ info.descriptor.camera_calibration->depth_far = kStubDepthFar;
+ }
+ result.push_back(info);
+ }
+ result_callback.Run(result);
+ }));
base::RunLoop run_loop;
MediaDevicesManager::BoolDeviceTypes devices_to_enumerate;
@@ -289,10 +326,10 @@ class MediaStreamDispatcherHostTest : public testing::Test {
media_stream_manager_->media_devices_manager()->EnumerateDevices(
devices_to_enumerate,
base::Bind(&AudioInputDevicesEnumerated, run_loop.QuitClosure(),
- &physical_audio_devices_));
+ &audio_device_descriptions_));
run_loop.Run();
- ASSERT_GT(physical_audio_devices_.size(), 0u);
+ ASSERT_GT(audio_device_descriptions_.size(), 0u);
}
void TearDown() override { host_->OnChannelClosing(); }
@@ -312,9 +349,10 @@ class MediaStreamDispatcherHostTest : public testing::Test {
const StreamControls& controls) {
base::RunLoop run_loop;
int expected_audio_array_size =
- (controls.audio.requested && !physical_audio_devices_.empty()) ? 1 : 0;
+ (controls.audio.requested && !audio_device_descriptions_.empty()) ? 1
+ : 0;
int expected_video_array_size =
- (controls.video.requested && !physical_video_devices_.empty()) ? 1 : 0;
+ (controls.video.requested && !stub_video_device_ids_.empty()) ? 1 : 0;
EXPECT_CALL(*host_.get(), OnStreamGenerated(render_frame_id,
page_request_id,
expected_audio_array_size,
@@ -361,13 +399,13 @@ class MediaStreamDispatcherHostTest : public testing::Test {
media::AudioDeviceDescription::kDefaultDeviceId &&
devices[i].device.id !=
media::AudioDeviceDescription::kCommunicationsDeviceId) {
- for (const auto& audio_device : physical_audio_devices_) {
+ for (const auto& audio_device : audio_device_descriptions_) {
if (audio_device.unique_id == devices[i].device.id)
return true;
}
}
- for (const auto& video_device : physical_video_devices_) {
- if (video_device.device_id == devices[i].device.id)
+ for (const std::string& device_id : stub_video_device_ids_) {
+ if (device_id == devices[i].device.id)
return true;
}
}
@@ -379,8 +417,8 @@ class MediaStreamDispatcherHostTest : public testing::Test {
for (size_t i = 0; i < devices.size(); ++i) {
bool found_match = false;
media::AudioDeviceDescriptions::const_iterator audio_it =
- physical_audio_devices_.begin();
- for (; audio_it != physical_audio_devices_.end(); ++audio_it) {
+ audio_device_descriptions_.begin();
+ for (; audio_it != audio_device_descriptions_.end(); ++audio_it) {
if (content::DoesMediaDeviceIDMatchHMAC(
browser_context_.GetResourceContext()->GetMediaDeviceIDSalt(),
origin,
@@ -390,12 +428,10 @@ class MediaStreamDispatcherHostTest : public testing::Test {
found_match = true;
}
}
- media::VideoCaptureDeviceDescriptors::const_iterator video_it =
- physical_video_devices_.begin();
- for (; video_it != physical_video_devices_.end(); ++video_it) {
+ for (const std::string& device_id : stub_video_device_ids_) {
if (content::DoesMediaDeviceIDMatchHMAC(
browser_context_.GetResourceContext()->GetMediaDeviceIDSalt(),
- origin, devices[i].device.id, video_it->device_id)) {
+ origin, devices[i].device.id, device_id)) {
EXPECT_FALSE(found_match);
found_match = true;
}
@@ -434,10 +470,10 @@ class MediaStreamDispatcherHostTest : public testing::Test {
ContentBrowserClient* old_browser_client_;
std::unique_ptr<ContentClient> content_client_;
content::TestBrowserContext browser_context_;
- media::AudioDeviceDescriptions physical_audio_devices_;
- media::VideoCaptureDeviceDescriptors physical_video_devices_;
+ media::AudioDeviceDescriptions audio_device_descriptions_;
+ std::vector<std::string> stub_video_device_ids_;
url::Origin origin_;
- media::FakeVideoCaptureDeviceFactory* video_capture_device_factory_;
+ MockVideoCaptureSystem* mock_video_capture_system_;
};
TEST_F(MediaStreamDispatcherHostTest, GenerateStreamWithVideoOnly) {
@@ -481,26 +517,21 @@ TEST_F(MediaStreamDispatcherHostTest, GenerateStreamWithAudioAndVideo) {
}
TEST_F(MediaStreamDispatcherHostTest, GenerateStreamWithDepthVideo) {
- // Video device on index 1 is depth video capture device. The number of fake
- // devices is 2.
- physical_video_devices_.clear();
- video_capture_device_factory_->SetToDefaultDevicesConfig(2);
- video_capture_device_factory_->GetDeviceDescriptors(&physical_video_devices_);
// We specify to generate both audio and video stream.
StreamControls controls(true, true);
std::string source_id = content::GetHMACForMediaDeviceID(
browser_context_.GetResourceContext()->GetMediaDeviceIDSalt(), origin_,
- physical_video_devices_[1].device_id);
- // |source_id| is related to depth device (the device on index 1). As we can
- // generate only one video stream using GenerateStreamAndWaitForResult, we
- // use controls.video.source_id to specify that the stream is depth video.
+ kDepthVideoDeviceId);
+ // |source_id| corresponds to the depth device. As we can generate only one
+ // video stream using GenerateStreamAndWaitForResult, we use
+ // controls.video.source_id to specify that the stream is depth video.
// See also MediaStreamManager::GenerateStream and other tests here.
controls.video.device_id = source_id;
SetupFakeUI(true);
GenerateStreamAndWaitForResult(kRenderId, kPageRequestId, controls);
- // There are two fake devices. We specified the generation and expect to get
+ // We specified the generation and expect to get
// one audio and one depth video stream.
EXPECT_EQ(host_->audio_devices_.size(), 1u);
EXPECT_EQ(host_->video_devices_.size(), 1u);
@@ -509,10 +540,10 @@ TEST_F(MediaStreamDispatcherHostTest, GenerateStreamWithDepthVideo) {
const base::Optional<CameraCalibration> calibration =
host_->video_devices_[0].device.camera_calibration;
EXPECT_TRUE(calibration);
- EXPECT_EQ(calibration->focal_length_x, 135.0);
- EXPECT_EQ(calibration->focal_length_y, 135.6);
- EXPECT_EQ(calibration->depth_near, 0.0);
- EXPECT_EQ(calibration->depth_far, 65.535);
+ EXPECT_EQ(calibration->focal_length_x, kStubFocalLengthX);
+ EXPECT_EQ(calibration->focal_length_y, kStubFocalLengthY);
+ EXPECT_EQ(calibration->depth_near, kStubDepthNear);
+ EXPECT_EQ(calibration->depth_far, kStubDepthFar);
}
// This test generates two streams with video only using the same render frame
@@ -636,12 +667,12 @@ TEST_F(MediaStreamDispatcherHostTest, GenerateStreamsWithoutWaiting) {
// Test that we can generate streams where a sourceId is specified in
// the request.
TEST_F(MediaStreamDispatcherHostTest, GenerateStreamsWithSourceId) {
- ASSERT_GE(physical_audio_devices_.size(), 1u);
- ASSERT_GE(physical_video_devices_.size(), 1u);
+ ASSERT_GE(audio_device_descriptions_.size(), 1u);
+ ASSERT_GE(stub_video_device_ids_.size(), 1u);
media::AudioDeviceDescriptions::const_iterator audio_it =
- physical_audio_devices_.begin();
- for (; audio_it != physical_audio_devices_.end(); ++audio_it) {
+ audio_device_descriptions_.begin();
+ for (; audio_it != audio_device_descriptions_.end(); ++audio_it) {
std::string source_id = content::GetHMACForMediaDeviceID(
browser_context_.GetResourceContext()->GetMediaDeviceIDSalt(),
origin_,
@@ -655,12 +686,10 @@ TEST_F(MediaStreamDispatcherHostTest, GenerateStreamsWithSourceId) {
EXPECT_EQ(host_->audio_devices_[0].device.id, source_id);
}
- media::VideoCaptureDeviceDescriptors::const_iterator video_it =
- physical_video_devices_.begin();
- for (; video_it != physical_video_devices_.end(); ++video_it) {
+ for (const std::string& device_id : stub_video_device_ids_) {
std::string source_id = content::GetHMACForMediaDeviceID(
browser_context_.GetResourceContext()->GetMediaDeviceIDSalt(), origin_,
- video_it->device_id);
+ device_id);
ASSERT_FALSE(source_id.empty());
StreamControls controls(true, true);
controls.video.device_id = source_id;
@@ -690,9 +719,7 @@ TEST_F(MediaStreamDispatcherHostTest, GenerateStreamsWithInvalidAudioSourceId) {
}
TEST_F(MediaStreamDispatcherHostTest, GenerateStreamsNoAvailableVideoDevice) {
- physical_video_devices_.clear();
- video_capture_device_factory_->SetToDefaultDevicesConfig(0);
- video_capture_device_factory_->GetDeviceDescriptors(&physical_video_devices_);
+ stub_video_device_ids_.clear();
StreamControls controls(true, true);
SetupFakeUI(false);
@@ -848,7 +875,7 @@ TEST_F(MediaStreamDispatcherHostTest, VideoDeviceUnplugged) {
EXPECT_EQ(host_->audio_devices_.size(), 1u);
EXPECT_EQ(host_->video_devices_.size(), 1u);
- video_capture_device_factory_->SetToDefaultDevicesConfig(0);
+ stub_video_device_ids_.clear();
base::RunLoop run_loop;
EXPECT_CALL(*host_.get(), OnDeviceStopped(kRenderId))
« no previous file with comments | « content/browser/renderer_host/media/media_devices_manager_unittest.cc ('k') | content/browser/renderer_host/media/media_stream_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698