| Index: media/remoting/remoting_renderer_controller_unittest.cc
|
| diff --git a/media/remoting/remoting_controller_unittest.cc b/media/remoting/remoting_renderer_controller_unittest.cc
|
| similarity index 27%
|
| rename from media/remoting/remoting_controller_unittest.cc
|
| rename to media/remoting/remoting_renderer_controller_unittest.cc
|
| index b97d243da791b3d8b90a897ea2586feda0eeee33..0fb0a301dab2512fa57df4edf1523a462507268b 100644
|
| --- a/media/remoting/remoting_controller_unittest.cc
|
| +++ b/media/remoting/remoting_renderer_controller_unittest.cc
|
| @@ -2,15 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "media/remoting/remoting_controller.h"
|
| +#include "media/remoting/remoting_renderer_controller.h"
|
|
|
| #include "base/callback.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| #include "media/base/audio_decoder_config.h"
|
| +#include "media/base/cdm_config.h"
|
| #include "media/base/limits.h"
|
| #include "media/base/media_util.h"
|
| #include "media/base/video_decoder_config.h"
|
| +#include "media/remoting/remoting_cdm.h"
|
| #include "mojo/public/cpp/bindings/strong_binding.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -21,7 +23,7 @@ constexpr gfx::Size kCodedSize(320, 240);
|
| constexpr gfx::Rect kVisibleRect(320, 240);
|
| constexpr gfx::Size kNaturalSize(320, 240);
|
|
|
| -PipelineMetadata defaultMetadata() {
|
| +PipelineMetadata DefaultMetadata() {
|
| PipelineMetadata data;
|
| data.has_audio = true;
|
| data.has_video = true;
|
| @@ -36,11 +38,28 @@ PipelineMetadata defaultMetadata() {
|
| return data;
|
| }
|
|
|
| +PipelineMetadata EncryptedMetadata() {
|
| + PipelineMetadata data;
|
| + data.has_audio = true;
|
| + data.has_video = true;
|
| + data.video_decoder_config = VideoDecoderConfig(
|
| + kCodecVP8, VP8PROFILE_ANY, VideoPixelFormat::PIXEL_FORMAT_I420,
|
| + ColorSpace::COLOR_SPACE_SD_REC601, kCodedSize, kVisibleRect, kNaturalSize,
|
| + EmptyExtraData(), AesCtrEncryptionScheme());
|
| + data.audio_decoder_config = AudioDecoderConfig(
|
| + kCodecOpus, SampleFormat::kSampleFormatU8,
|
| + ChannelLayout::CHANNEL_LAYOUT_MONO, limits::kMinSampleRate,
|
| + EmptyExtraData(), Unencrypted());
|
| + return data;
|
| +}
|
| +
|
| class FakeRemoter final : public mojom::Remoter {
|
| public:
|
| // |start_will_fail| indicates whether starting remoting will fail.
|
| FakeRemoter(mojom::RemotingSourcePtr source, bool start_will_fail)
|
| - : source_(std::move(source)), start_will_fail_(start_will_fail) {}
|
| + : source_(std::move(source)),
|
| + start_will_fail_(start_will_fail),
|
| + weak_factory_(this) {}
|
| ~FakeRemoter() override {}
|
|
|
| // mojom::Remoter implementations.
|
| @@ -48,10 +67,11 @@ class FakeRemoter final : public mojom::Remoter {
|
| if (start_will_fail_) {
|
| base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&FakeRemoter::StartFailed, base::Unretained(this)));
|
| + base::Bind(&FakeRemoter::StartFailed, weak_factory_.GetWeakPtr()));
|
| } else {
|
| base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| - FROM_HERE, base::Bind(&FakeRemoter::Started, base::Unretained(this)));
|
| + FROM_HERE,
|
| + base::Bind(&FakeRemoter::Started, weak_factory_.GetWeakPtr()));
|
| }
|
| }
|
|
|
| @@ -64,7 +84,7 @@ class FakeRemoter final : public mojom::Remoter {
|
| void Stop(mojom::RemotingStopReason reason) override {
|
| base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&FakeRemoter::Stopped, base::Unretained(this), reason));
|
| + base::Bind(&FakeRemoter::Stopped, weak_factory_.GetWeakPtr(), reason));
|
| }
|
|
|
| void SendMessageToSink(const std::vector<uint8_t>& message) override {}
|
| @@ -76,9 +96,11 @@ class FakeRemoter final : public mojom::Remoter {
|
| }
|
| void Stopped(mojom::RemotingStopReason reason) { source_->OnStopped(reason); }
|
|
|
| - mojom::RemotingSourcePtr source_;
|
| + const mojom::RemotingSourcePtr source_;
|
| bool start_will_fail_;
|
|
|
| + base::WeakPtrFactory<FakeRemoter> weak_factory_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(FakeRemoter);
|
| };
|
|
|
| @@ -102,71 +124,229 @@ class FakeRemoterFactory final : public mojom::RemoterFactory {
|
| DISALLOW_COPY_AND_ASSIGN(FakeRemoterFactory);
|
| };
|
|
|
| -std::unique_ptr<RemotingController> CreateRemotingController(
|
| - mojom::RemoterFactory* remoter_factory) {
|
| +scoped_refptr<RemotingSourceImpl> CreateRemotingSourceImpl(
|
| + bool start_will_fail) {
|
| mojom::RemotingSourcePtr remoting_source;
|
| mojom::RemotingSourceRequest remoting_source_request =
|
| mojo::GetProxy(&remoting_source);
|
| mojom::RemoterPtr remoter;
|
| + std::unique_ptr<mojom::RemoterFactory> remoter_factory =
|
| + base::MakeUnique<FakeRemoterFactory>(start_will_fail);
|
| remoter_factory->Create(std::move(remoting_source), mojo::GetProxy(&remoter));
|
| - std::unique_ptr<RemotingController> remoting_controller =
|
| - base::MakeUnique<RemotingController>(std::move(remoting_source_request),
|
| - std::move(remoter));
|
| - return remoting_controller;
|
| + return new RemotingSourceImpl(std::move(remoting_source_request),
|
| + std::move(remoter));
|
| }
|
|
|
| } // namespace
|
|
|
| -class RemotingControllerTest : public ::testing::Test {
|
| +class RemotingRendererControllerTest : public ::testing::Test {
|
| public:
|
| - RemotingControllerTest()
|
| - : remoting_controller_(
|
| - CreateRemotingController(new FakeRemoterFactory(false))),
|
| - is_remoting_(false) {
|
| - remoting_controller_->SetSwitchRendererCallback(base::Bind(
|
| - &RemotingControllerTest::ToggleRenderer, base::Unretained(this)));
|
| - }
|
| - ~RemotingControllerTest() override {}
|
| + RemotingRendererControllerTest() {}
|
| + ~RemotingRendererControllerTest() override {}
|
|
|
| void TearDown() final { RunUntilIdle(); }
|
|
|
| static void RunUntilIdle() { base::RunLoop().RunUntilIdle(); }
|
|
|
| - void ToggleRenderer() { is_remoting_ = remoting_controller_->is_remoting(); }
|
| + void ToggleRenderer() {
|
| + is_rendering_remotely =
|
| + remoting_renderer_controller_->IsRenderingRemotely();
|
| + is_terminated_ = remoting_renderer_controller_->IsTerminated();
|
| + }
|
| +
|
| + void CreateCdm(bool is_remoting) { is_remoting_cdm_ = is_remoting; }
|
|
|
| base::MessageLoop message_loop_;
|
|
|
| protected:
|
| - std::unique_ptr<RemotingController> remoting_controller_;
|
| - bool is_remoting_;
|
| + std::unique_ptr<RemotingRendererController> remoting_renderer_controller_;
|
| + bool is_rendering_remotely = false;
|
| + bool is_remoting_cdm_ = false;
|
| + bool is_terminated_ = false;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(RemotingControllerTest);
|
| + DISALLOW_COPY_AND_ASSIGN(RemotingRendererControllerTest);
|
| };
|
|
|
| -TEST_F(RemotingControllerTest, ToggleRenderer) {
|
| - EXPECT_FALSE(is_remoting_);
|
| - remoting_controller_->OnSinkAvailable();
|
| - remoting_controller_->OnEnteredFullscreen();
|
| - EXPECT_FALSE(is_remoting_);
|
| - remoting_controller_->OnMetadataChanged(defaultMetadata());
|
| +TEST_F(RemotingRendererControllerTest, ToggleRenderer) {
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + scoped_refptr<RemotingSourceImpl> remoting_source_impl =
|
| + CreateRemotingSourceImpl(false);
|
| + remoting_renderer_controller_ =
|
| + base::MakeUnique<RemotingRendererController>(remoting_source_impl);
|
| + remoting_renderer_controller_->SetSwitchRendererCallback(base::Bind(
|
| + &RemotingRendererControllerTest::ToggleRenderer, base::Unretained(this)));
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + remoting_source_impl->OnSinkAvailable();
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + remoting_renderer_controller_->OnEnteredFullscreen();
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + remoting_renderer_controller_->OnMetadataChanged(DefaultMetadata());
|
| + RunUntilIdle();
|
| + EXPECT_TRUE(is_rendering_remotely);
|
| + remoting_renderer_controller_->OnExitedFullscreen();
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| +}
|
| +
|
| +TEST_F(RemotingRendererControllerTest, StartFailed) {
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + scoped_refptr<RemotingSourceImpl> remoting_source_impl =
|
| + CreateRemotingSourceImpl(true);
|
| + remoting_renderer_controller_ =
|
| + base::MakeUnique<RemotingRendererController>(remoting_source_impl);
|
| + remoting_renderer_controller_->SetSwitchRendererCallback(base::Bind(
|
| + &RemotingRendererControllerTest::ToggleRenderer, base::Unretained(this)));
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + remoting_source_impl->OnSinkAvailable();
|
| RunUntilIdle();
|
| - EXPECT_TRUE(is_remoting_);
|
| - remoting_controller_->OnExitedFullscreen();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + remoting_renderer_controller_->OnEnteredFullscreen();
|
| RunUntilIdle();
|
| - EXPECT_FALSE(is_remoting_);
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + remoting_renderer_controller_->OnMetadataChanged(DefaultMetadata());
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| }
|
|
|
| -TEST_F(RemotingControllerTest, StartFailed) {
|
| - EXPECT_FALSE(is_remoting_);
|
| - remoting_controller_ = CreateRemotingController(new FakeRemoterFactory(true));
|
| - remoting_controller_->SetSwitchRendererCallback(base::Bind(
|
| - &RemotingControllerTest::ToggleRenderer, base::Unretained(this)));
|
| - remoting_controller_->OnSinkAvailable();
|
| - remoting_controller_->OnEnteredFullscreen();
|
| - remoting_controller_->OnMetadataChanged(defaultMetadata());
|
| +TEST_F(RemotingRendererControllerTest, EncryptedWithRemotingCdm) {
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + remoting_renderer_controller_ = base::MakeUnique<RemotingRendererController>(
|
| + CreateRemotingSourceImpl(false));
|
| + remoting_renderer_controller_->SetSwitchRendererCallback(base::Bind(
|
| + &RemotingRendererControllerTest::ToggleRenderer, base::Unretained(this)));
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + remoting_renderer_controller_->OnMetadataChanged(EncryptedMetadata());
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + scoped_refptr<RemotingSourceImpl> cdm_remoting_source_impl =
|
| + CreateRemotingSourceImpl(false);
|
| + std::unique_ptr<RemotingCdmController> remoting_cdm_controller =
|
| + base::MakeUnique<RemotingCdmController>(cdm_remoting_source_impl);
|
| + cdm_remoting_source_impl->OnSinkAvailable();
|
| + remoting_cdm_controller->ShouldCreateRemotingCdm(base::Bind(
|
| + &RemotingRendererControllerTest::CreateCdm, base::Unretained(this)));
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + EXPECT_TRUE(is_remoting_cdm_);
|
| +
|
| + CdmConfig cdm_config;
|
| + GURL gurl;
|
| + std::string empty_string;
|
| + scoped_refptr<RemotingCdm> remoting_cdm = new RemotingCdm(
|
| + empty_string, gurl, cdm_config, SessionMessageCB(), SessionClosedCB(),
|
| + SessionKeysChangeCB(), SessionExpirationUpdateCB(), CdmCreatedCB(),
|
| + std::move(remoting_cdm_controller));
|
| + remoting_renderer_controller_->OnSetCdm(remoting_cdm.get());
|
| + RunUntilIdle();
|
| + EXPECT_TRUE(is_rendering_remotely);
|
| +
|
| + // For encrypted contents, entering/exiting full screen has no effect.
|
| + remoting_renderer_controller_->OnEnteredFullscreen();
|
| + RunUntilIdle();
|
| + EXPECT_TRUE(is_rendering_remotely);
|
| + remoting_renderer_controller_->OnExitedFullscreen();
|
| + RunUntilIdle();
|
| + EXPECT_TRUE(is_rendering_remotely);
|
| +
|
| + EXPECT_FALSE(is_terminated_);
|
| + cdm_remoting_source_impl->OnSinkGone();
|
| + RunUntilIdle();
|
| + EXPECT_TRUE(is_terminated_);
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| +}
|
| +
|
| +TEST_F(RemotingRendererControllerTest, EncryptedWithLocalCdm) {
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + scoped_refptr<RemotingSourceImpl> renderer_remoting_source_impl =
|
| + CreateRemotingSourceImpl(false);
|
| + remoting_renderer_controller_ = base::MakeUnique<RemotingRendererController>(
|
| + renderer_remoting_source_impl);
|
| + remoting_renderer_controller_->SetSwitchRendererCallback(base::Bind(
|
| + &RemotingRendererControllerTest::ToggleRenderer, base::Unretained(this)));
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + renderer_remoting_source_impl->OnSinkAvailable();
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + remoting_renderer_controller_->OnEnteredFullscreen();
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + remoting_renderer_controller_->OnMetadataChanged(EncryptedMetadata());
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| +
|
| + scoped_refptr<RemotingSourceImpl> cdm_remoting_source_impl =
|
| + CreateRemotingSourceImpl(true);
|
| + std::unique_ptr<RemotingCdmController> remoting_cdm_controller =
|
| + base::MakeUnique<RemotingCdmController>(cdm_remoting_source_impl);
|
| + cdm_remoting_source_impl->OnSinkAvailable();
|
| + remoting_cdm_controller->ShouldCreateRemotingCdm(base::Bind(
|
| + &RemotingRendererControllerTest::CreateCdm, base::Unretained(this)));
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + EXPECT_FALSE(is_remoting_cdm_);
|
| +
|
| + CdmConfig cdm_config;
|
| + GURL gurl;
|
| + std::string empty_string;
|
| + scoped_refptr<RemotingCdm> remoting_cdm = new RemotingCdm(
|
| + empty_string, gurl, cdm_config, SessionMessageCB(), SessionClosedCB(),
|
| + SessionKeysChangeCB(), SessionExpirationUpdateCB(), CdmCreatedCB(),
|
| + std::move(remoting_cdm_controller));
|
| + remoting_renderer_controller_->OnSetCdm(remoting_cdm.get());
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + EXPECT_FALSE(is_terminated_);
|
| +}
|
| +
|
| +TEST_F(RemotingRendererControllerTest, EncryptedWithFailedRemotingCdm) {
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + remoting_renderer_controller_ = base::MakeUnique<RemotingRendererController>(
|
| + CreateRemotingSourceImpl(false));
|
| + remoting_renderer_controller_->SetSwitchRendererCallback(base::Bind(
|
| + &RemotingRendererControllerTest::ToggleRenderer, base::Unretained(this)));
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + remoting_renderer_controller_->OnEnteredFullscreen();
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + remoting_renderer_controller_->OnMetadataChanged(EncryptedMetadata());
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| +
|
| + scoped_refptr<RemotingSourceImpl> cdm_remoting_source_impl =
|
| + CreateRemotingSourceImpl(false);
|
| + std::unique_ptr<RemotingCdmController> remoting_cdm_controller =
|
| + base::MakeUnique<RemotingCdmController>(cdm_remoting_source_impl);
|
| + cdm_remoting_source_impl->OnSinkAvailable();
|
| + remoting_cdm_controller->ShouldCreateRemotingCdm(base::Bind(
|
| + &RemotingRendererControllerTest::CreateCdm, base::Unretained(this)));
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + EXPECT_TRUE(is_remoting_cdm_);
|
| +
|
| + cdm_remoting_source_impl->OnSinkGone();
|
| + RunUntilIdle();
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + EXPECT_FALSE(is_terminated_);
|
| +
|
| + CdmConfig cdm_config;
|
| + GURL gurl;
|
| + std::string empty_string;
|
| + scoped_refptr<RemotingCdm> remoting_cdm = new RemotingCdm(
|
| + empty_string, gurl, cdm_config, SessionMessageCB(), SessionClosedCB(),
|
| + SessionKeysChangeCB(), SessionExpirationUpdateCB(), CdmCreatedCB(),
|
| + std::move(remoting_cdm_controller));
|
| + remoting_renderer_controller_->OnSetCdm(remoting_cdm.get());
|
| RunUntilIdle();
|
| - EXPECT_FALSE(is_remoting_);
|
| + EXPECT_FALSE(is_rendering_remotely);
|
| + EXPECT_TRUE(is_terminated_);
|
| }
|
|
|
| } // namespace media
|
|
|