| Index: media/mojo/services/mojo_renderer_service.cc
|
| diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc
|
| index 120328a3c3701422cab7674171e9f4a648936e9d..ad0f91dcacbaa3f86df46502ab41c135396cd041 100644
|
| --- a/media/mojo/services/mojo_renderer_service.cc
|
| +++ b/media/mojo/services/mojo_renderer_service.cc
|
| @@ -66,7 +66,7 @@ MojoRendererService::MojoRendererService(
|
| renderer_(std::move(renderer)),
|
| initiate_surface_request_cb_(initiate_surface_request_cb),
|
| weak_factory_(this) {
|
| - DVLOG(1) << __FUNCTION__;
|
| + DVLOG(1) << __func__;
|
| DCHECK(renderer_);
|
|
|
| weak_this_ = weak_factory_.GetWeakPtr();
|
| @@ -81,7 +81,7 @@ void MojoRendererService::Initialize(
|
| const base::Optional<GURL>& media_url,
|
| const base::Optional<GURL>& first_party_for_cookies,
|
| const InitializeCallback& callback) {
|
| - DVLOG(1) << __FUNCTION__;
|
| + DVLOG(1) << __func__;
|
| DCHECK_EQ(state_, STATE_UNINITIALIZED);
|
|
|
| client_.Bind(std::move(client));
|
| @@ -107,7 +107,7 @@ void MojoRendererService::Initialize(
|
| }
|
|
|
| void MojoRendererService::Flush(const FlushCallback& callback) {
|
| - DVLOG(2) << __FUNCTION__;
|
| + DVLOG(2) << __func__;
|
| DCHECK_EQ(state_, STATE_PLAYING);
|
|
|
| state_ = STATE_FLUSHING;
|
| @@ -117,13 +117,13 @@ void MojoRendererService::Flush(const FlushCallback& callback) {
|
| }
|
|
|
| void MojoRendererService::StartPlayingFrom(base::TimeDelta time_delta) {
|
| - DVLOG(2) << __FUNCTION__ << ": " << time_delta;
|
| + DVLOG(2) << __func__ << ": " << time_delta;
|
| renderer_->StartPlayingFrom(time_delta);
|
| SchedulePeriodicMediaTimeUpdates();
|
| }
|
|
|
| void MojoRendererService::SetPlaybackRate(double playback_rate) {
|
| - DVLOG(2) << __FUNCTION__ << ": " << playback_rate;
|
| + DVLOG(2) << __func__ << ": " << playback_rate;
|
| DCHECK(state_ == STATE_PLAYING || state_ == STATE_ERROR);
|
| playback_rate_ = playback_rate;
|
| renderer_->SetPlaybackRate(playback_rate);
|
| @@ -160,34 +160,34 @@ void MojoRendererService::SetCdm(int32_t cdm_id,
|
| }
|
|
|
| void MojoRendererService::OnError(PipelineStatus error) {
|
| - DVLOG(1) << __FUNCTION__ << "(" << error << ")";
|
| + DVLOG(1) << __func__ << "(" << error << ")";
|
| state_ = STATE_ERROR;
|
| client_->OnError();
|
| }
|
|
|
| void MojoRendererService::OnEnded() {
|
| - DVLOG(1) << __FUNCTION__;
|
| + DVLOG(1) << __func__;
|
| CancelPeriodicMediaTimeUpdates();
|
| client_->OnEnded();
|
| }
|
|
|
| void MojoRendererService::OnStatisticsUpdate(const PipelineStatistics& stats) {
|
| - DVLOG(3) << __FUNCTION__;
|
| + DVLOG(3) << __func__;
|
| client_->OnStatisticsUpdate(stats);
|
| }
|
|
|
| void MojoRendererService::OnBufferingStateChange(BufferingState state) {
|
| - DVLOG(2) << __FUNCTION__ << "(" << state << ")";
|
| + DVLOG(2) << __func__ << "(" << state << ")";
|
| client_->OnBufferingStateChange(state);
|
| }
|
|
|
| void MojoRendererService::OnWaitingForDecryptionKey() {
|
| - DVLOG(1) << __FUNCTION__;
|
| + DVLOG(1) << __func__;
|
| client_->OnWaitingForDecryptionKey();
|
| }
|
|
|
| void MojoRendererService::OnVideoNaturalSizeChange(const gfx::Size& size) {
|
| - DVLOG(2) << __FUNCTION__ << "(" << size.ToString() << ")";
|
| + DVLOG(2) << __func__ << "(" << size.ToString() << ")";
|
| client_->OnVideoNaturalSizeChange(size);
|
| }
|
|
|
| @@ -196,7 +196,7 @@ void MojoRendererService::OnDurationChange(base::TimeDelta duration) {
|
| }
|
|
|
| void MojoRendererService::OnVideoOpacityChange(bool opaque) {
|
| - DVLOG(2) << __FUNCTION__ << "(" << opaque << ")";
|
| + DVLOG(2) << __func__ << "(" << opaque << ")";
|
| client_->OnVideoOpacityChange(opaque);
|
| }
|
|
|
| @@ -213,7 +213,7 @@ void MojoRendererService::OnStreamReady(
|
| void MojoRendererService::OnRendererInitializeDone(
|
| const base::Callback<void(bool)>& callback,
|
| PipelineStatus status) {
|
| - DVLOG(1) << __FUNCTION__;
|
| + DVLOG(1) << __func__;
|
| DCHECK_EQ(state_, STATE_INITIALIZING);
|
|
|
| if (status != PIPELINE_OK) {
|
| @@ -241,14 +241,14 @@ void MojoRendererService::UpdateMediaTime(bool force) {
|
| }
|
|
|
| void MojoRendererService::CancelPeriodicMediaTimeUpdates() {
|
| - DVLOG(2) << __FUNCTION__;
|
| + DVLOG(2) << __func__;
|
|
|
| time_update_timer_.Stop();
|
| UpdateMediaTime(false);
|
| }
|
|
|
| void MojoRendererService::SchedulePeriodicMediaTimeUpdates() {
|
| - DVLOG(2) << __FUNCTION__;
|
| + DVLOG(2) << __func__;
|
|
|
| UpdateMediaTime(true);
|
| time_update_timer_.Start(
|
| @@ -257,7 +257,7 @@ void MojoRendererService::SchedulePeriodicMediaTimeUpdates() {
|
| }
|
|
|
| void MojoRendererService::OnFlushCompleted(const FlushCallback& callback) {
|
| - DVLOG(1) << __FUNCTION__;
|
| + DVLOG(1) << __func__;
|
| DCHECK_EQ(state_, STATE_FLUSHING);
|
| state_ = STATE_PLAYING;
|
| callback.Run();
|
| @@ -267,7 +267,7 @@ void MojoRendererService::OnCdmAttached(
|
| scoped_refptr<MediaKeys> cdm,
|
| const base::Callback<void(bool)>& callback,
|
| bool success) {
|
| - DVLOG(1) << __FUNCTION__ << "(" << success << ")";
|
| + DVLOG(1) << __func__ << "(" << success << ")";
|
|
|
| if (success)
|
| cdm_ = cdm;
|
|
|