diff options
| -rw-r--r-- | media/mojo/services/mojo_renderer_service.cc | 2 | ||||
| -rw-r--r-- | media/mojo/services/mojo_renderer_service.h | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc index 2e25e05..680e7b9 100644 --- a/media/mojo/services/mojo_renderer_service.cc +++ b/media/mojo/services/mojo_renderer_service.cc @@ -21,8 +21,8 @@ MojoRendererService::MojoRendererService( mojo::InterfaceRequest<interfaces::Renderer> request) : binding_(this, std::move(request)), cdm_context_provider_(cdm_context_provider), - renderer_(std::move(renderer)), state_(STATE_UNINITIALIZED), + renderer_(std::move(renderer)), last_media_time_usec_(0), weak_factory_(this) { DVLOG(1) << __FUNCTION__; diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h index 7c43d3f..146290a 100644 --- a/media/mojo/services/mojo_renderer_service.h +++ b/media/mojo/services/mojo_renderer_service.h @@ -94,14 +94,15 @@ class MojoRendererService : interfaces::Renderer { mojo::StrongBinding<interfaces::Renderer> binding_; base::WeakPtr<CdmContextProvider> cdm_context_provider_; - scoped_ptr<media::Renderer> renderer_; State state_; - // Note: stream_provider_ must be destructed after renderer_ to avoid access - // violation. + // Note: |stream_provider_| must be destructed after |renderer_| to avoid + // access violation. scoped_ptr<DemuxerStreamProviderShim> stream_provider_; + scoped_ptr<media::Renderer> renderer_; + base::RepeatingTimer time_update_timer_; uint64_t last_media_time_usec_; |