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

Unified Diff: media/remoting/remoting_controller.cc

Issue 2457563002: Media Remoting: Add remoting control logic for encrypted contents. (Closed)
Patch Set: Addressed comments from PS#12. Fixed ASAN. Created 4 years, 1 month 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 | « media/remoting/remoting_controller.h ('k') | media/remoting/remoting_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/remoting/remoting_controller.cc
diff --git a/media/remoting/remoting_controller.cc b/media/remoting/remoting_controller.cc
deleted file mode 100644
index 73c372f68673518e429677979a24dbd83fd66864..0000000000000000000000000000000000000000
--- a/media/remoting/remoting_controller.cc
+++ /dev/null
@@ -1,272 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// 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 "base/bind.h"
-#include "base/bind_helpers.h"
-#include "base/callback_helpers.h"
-#include "base/logging.h"
-#include "base/single_thread_task_runner.h"
-#include "media/remoting/rpc/proto_utils.h"
-#include "media/remoting/rpc/rpc_broker.h"
-
-namespace media {
-
-RemotingController::RemotingController(
- mojom::RemotingSourceRequest source_request,
- mojom::RemoterPtr remoter)
- : binding_(this, std::move(source_request)),
- remoter_(std::move(remoter)),
- task_runner_(base::ThreadTaskRunnerHandle::Get()),
- weak_factory_(this) {
- DCHECK(remoter_);
- rpc_broker_.reset(new remoting::RpcBroker(base::Bind(
- &RemotingController::OnSendMessageToSink, weak_factory_.GetWeakPtr())));
-}
-
-RemotingController::~RemotingController() {}
-
-void RemotingController::StartDataPipe(
- std::unique_ptr<mojo::DataPipe> audio_data_pipe,
- std::unique_ptr<mojo::DataPipe> video_data_pipe,
- const DataPipeStartCallback& done_callback) {
- VLOG(2) << __FUNCTION__;
- DCHECK(task_runner_->BelongsToCurrentThread());
- DCHECK(!done_callback.is_null());
- bool audio = audio_data_pipe != nullptr;
- bool video = video_data_pipe != nullptr;
-
- if (!audio && !video) {
- LOG(ERROR) << "No audio and video to establish data pipe";
- done_callback.Run(mojom::RemotingDataStreamSenderPtrInfo(),
- mojom::RemotingDataStreamSenderPtrInfo(),
- mojo::ScopedDataPipeProducerHandle(),
- mojo::ScopedDataPipeProducerHandle());
- return;
- }
-
- mojom::RemotingDataStreamSenderPtr audio_stream_sender;
- mojom::RemotingDataStreamSenderPtr video_stream_sender;
- remoter_->StartDataStreams(
- audio ? std::move(audio_data_pipe->consumer_handle)
- : mojo::ScopedDataPipeConsumerHandle(),
- video ? std::move(video_data_pipe->consumer_handle)
- : mojo::ScopedDataPipeConsumerHandle(),
- audio ? mojo::GetProxy(&audio_stream_sender)
- : media::mojom::RemotingDataStreamSenderRequest(),
- video ? mojo::GetProxy(&video_stream_sender)
- : media::mojom::RemotingDataStreamSenderRequest());
-
- done_callback.Run(audio_stream_sender.PassInterface(),
- video_stream_sender.PassInterface(),
- audio ? std::move(audio_data_pipe->producer_handle)
- : mojo::ScopedDataPipeProducerHandle(),
- video ? std::move(video_data_pipe->producer_handle)
- : mojo::ScopedDataPipeProducerHandle());
-}
-
-base::WeakPtr<remoting::RpcBroker> RemotingController::GetRpcBroker() const {
- DCHECK(task_runner_->BelongsToCurrentThread());
- return rpc_broker_->GetWeakPtr();
-}
-
-void RemotingController::OnSendMessageToSink(
- std::unique_ptr<std::vector<uint8_t>> message) {
- DCHECK(task_runner_->BelongsToCurrentThread());
- remoter_->SendMessageToSink(*message);
-}
-
-void RemotingController::OnSinkAvailable() {
- DCHECK(task_runner_->BelongsToCurrentThread());
-
- is_sink_available_ = true;
- UpdateAndMaybeSwitch();
-}
-
-void RemotingController::OnSinkGone() {
- DCHECK(task_runner_->BelongsToCurrentThread());
-
- is_sink_available_ = false;
- UpdateAndMaybeSwitch();
-}
-
-void RemotingController::OnStarted() {
- DCHECK(task_runner_->BelongsToCurrentThread());
-
- VLOG(1) << "Remoting started successively.";
- if (is_remoting_)
- switch_renderer_cb_.Run();
- else
- remoter_->Stop(mojom::RemotingStopReason::LOCAL_PLAYBACK);
-}
-
-void RemotingController::OnStartFailed(mojom::RemotingStartFailReason reason) {
- DCHECK(task_runner_->BelongsToCurrentThread());
-
- VLOG(1) << "Failed to start remoting:" << reason;
- is_remoting_ = false;
-}
-
-void RemotingController::OnMessageFromSink(
- const std::vector<uint8_t>& message) {
- DCHECK(task_runner_->BelongsToCurrentThread());
- std::unique_ptr<remoting::pb::RpcMessage> rpc(new remoting::pb::RpcMessage());
- if (!rpc->ParseFromArray(message.data(), message.size())) {
- LOG(ERROR) << "corrupted Rpc message";
- return;
- }
-
- rpc_broker_->ProcessMessageFromRemote(std::move(rpc));
-}
-
-void RemotingController::OnStopped(mojom::RemotingStopReason reason) {
- DCHECK(task_runner_->BelongsToCurrentThread());
-
- VLOG(1) << "Remoting stopped: " << reason;
- is_remoting_ = false;
-}
-
-void RemotingController::OnEnteredFullscreen() {
- DCHECK(task_runner_->BelongsToCurrentThread());
-
- is_fullscreen_ = true;
- UpdateAndMaybeSwitch();
-}
-
-void RemotingController::OnExitedFullscreen() {
- DCHECK(task_runner_->BelongsToCurrentThread());
-
- is_fullscreen_ = false;
- UpdateAndMaybeSwitch();
-}
-
-void RemotingController::OnSetCdm(CdmContext* cdm_context) {
- DCHECK(task_runner_->BelongsToCurrentThread());
-
- // TODO(xjz): Not implemented. Will add in up-coming change.
- NOTIMPLEMENTED();
-}
-
-void RemotingController::SetSwitchRendererCallback(
- const SwitchRendererCallback& cb) {
- DCHECK(task_runner_->BelongsToCurrentThread());
- DCHECK(!cb.is_null());
-
- switch_renderer_cb_ = cb;
-}
-
-void RemotingController::OnMetadataChanged(const PipelineMetadata& metadata) {
- DCHECK(task_runner_->BelongsToCurrentThread());
-
- has_video_ = metadata.has_video;
- has_audio_ = metadata.has_audio;
- if (!has_video_ && !has_audio_)
- return;
-
- // On Android, when using the MediaPlayerRenderer, |has_video_| and
- // |has_audio_| will be true, but the respective configs will be empty.
- // We cannot make any assumptions on the validity of configs.
- if (has_video_) {
- video_decoder_config_ = metadata.video_decoder_config;
- is_encrypted_ |= video_decoder_config_.is_encrypted();
- }
- if (has_audio_) {
- audio_decoder_config_ = metadata.audio_decoder_config;
- is_encrypted_ |= audio_decoder_config_.is_encrypted();
- }
- UpdateAndMaybeSwitch();
-}
-
-bool RemotingController::IsVideoCodecSupported() {
- DCHECK(task_runner_->BelongsToCurrentThread());
- DCHECK(has_video_);
-
- switch (video_decoder_config_.codec()) {
- case VideoCodec::kCodecH264:
- case VideoCodec::kCodecVP8:
- return true;
- default:
- VLOG(2) << "Remoting does not support video codec: "
- << video_decoder_config_.codec();
- return false;
- }
-}
-
-bool RemotingController::IsAudioCodecSupported() {
- DCHECK(task_runner_->BelongsToCurrentThread());
- DCHECK(has_audio_);
-
- switch (audio_decoder_config_.codec()) {
- case AudioCodec::kCodecAAC:
- case AudioCodec::kCodecMP3:
- case AudioCodec::kCodecPCM:
- case AudioCodec::kCodecVorbis:
- case AudioCodec::kCodecFLAC:
- case AudioCodec::kCodecAMR_NB:
- case AudioCodec::kCodecAMR_WB:
- case AudioCodec::kCodecPCM_MULAW:
- case AudioCodec::kCodecGSM_MS:
- case AudioCodec::kCodecPCM_S16BE:
- case AudioCodec::kCodecPCM_S24BE:
- case AudioCodec::kCodecOpus:
- case AudioCodec::kCodecEAC3:
- case AudioCodec::kCodecPCM_ALAW:
- case AudioCodec::kCodecALAC:
- case AudioCodec::kCodecAC3:
- return true;
- default:
- VLOG(2) << "Remoting does not support audio codec: "
- << audio_decoder_config_.codec();
- return false;
- }
-}
-
-bool RemotingController::ShouldBeRemoting() {
- DCHECK(task_runner_->BelongsToCurrentThread());
-
- // TODO(xjz): The control logic for EME will be added in a later CL.
- if (is_encrypted_)
- return false;
-
- if (!is_sink_available_)
- return false;
- if (!is_fullscreen_)
- return false;
- if (has_video_ && !IsVideoCodecSupported())
- return false;
- if (has_audio_ && !IsAudioCodecSupported())
- return false;
- return true;
-}
-
-void RemotingController::UpdateAndMaybeSwitch() {
- DCHECK(task_runner_->BelongsToCurrentThread());
-
- // TODO(xjz): The switching logic for encrypted content will be added in a
- // later CL.
-
- // Demuxer is not initialized yet.
- if (!has_audio_ && !has_video_)
- return;
-
- DCHECK(!switch_renderer_cb_.is_null());
-
- bool should_be_remoting = ShouldBeRemoting();
- if (is_remoting_ == should_be_remoting)
- return;
-
- // Switch between local and remoting.
- is_remoting_ = should_be_remoting;
- if (is_remoting_) {
- // |swithc_renderer_cb_.Run()| will be called after remoting is started
- // successfully.
- remoter_->Start();
- } else {
- switch_renderer_cb_.Run();
- remoter_->Stop(mojom::RemotingStopReason::LOCAL_PLAYBACK);
- }
-}
-
-} // namespace media
« no previous file with comments | « media/remoting/remoting_controller.h ('k') | media/remoting/remoting_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698