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

Side by Side Diff: media/mojo/services/mojo_renderer_service.h

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 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 unified diff | Download patch
« no previous file with comments | « media/mojo/services/mojo_renderer_impl.cc ('k') | media/mojo/services/mojo_renderer_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ 6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/timer/timer.h" 13 #include "base/timer/timer.h"
14 #include "media/base/audio_decoder_config.h" 14 #include "media/base/audio_decoder_config.h"
15 #include "media/base/buffering_state.h" 15 #include "media/base/buffering_state.h"
16 #include "media/base/media_export.h" 16 #include "media/base/media_export.h"
17 #include "media/base/pipeline_status.h" 17 #include "media/base/pipeline_status.h"
18 #include "media/mojo/interfaces/media_renderer.mojom.h" 18 #include "media/mojo/interfaces/media_renderer.mojom.h"
19 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" 19 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
20 20
21 namespace mojo { 21 namespace mojo {
22 class ApplicationConnection; 22 class ApplicationConnection;
23 } 23 }
24 24
25 namespace media { 25 namespace media {
26 26
27 class AudioRendererSink; 27 class AudioRendererSink;
28 class DemuxerStreamProviderShim; 28 class DemuxerStreamProviderShim;
29 class Renderer; 29 class Renderer;
30 class VideoRendererSink;
31 30
32 // A mojo::MediaRenderer implementation that uses media::AudioRenderer to 31 // A mojo::MediaRenderer implementation that uses media::AudioRenderer to
33 // decode and render audio to a sink obtained from the ApplicationConnection. 32 // decode and render audio to a sink obtained from the ApplicationConnection.
34 class MEDIA_EXPORT MojoRendererService 33 class MEDIA_EXPORT MojoRendererService
35 : NON_EXPORTED_BASE(public mojo::InterfaceImpl<mojo::MediaRenderer>) { 34 : NON_EXPORTED_BASE(public mojo::InterfaceImpl<mojo::MediaRenderer>) {
36 public: 35 public:
37 MojoRendererService(); 36 MojoRendererService();
38 ~MojoRendererService() override; 37 ~MojoRendererService() override;
39 38
40 // mojo::MediaRenderer implementation. 39 // mojo::MediaRenderer implementation.
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 82
84 // Callback executed when a runtime error happens. 83 // Callback executed when a runtime error happens.
85 void OnError(PipelineStatus error); 84 void OnError(PipelineStatus error);
86 85
87 // Callback executed once Flush() completes. 86 // Callback executed once Flush() completes.
88 void OnFlushCompleted(const mojo::Closure& callback); 87 void OnFlushCompleted(const mojo::Closure& callback);
89 88
90 State state_; 89 State state_;
91 90
92 scoped_refptr<AudioRendererSink> audio_renderer_sink_; 91 scoped_refptr<AudioRendererSink> audio_renderer_sink_;
93 scoped_ptr<VideoRendererSink> video_renderer_sink_;
94 scoped_ptr<Renderer> renderer_; 92 scoped_ptr<Renderer> renderer_;
95 scoped_ptr<DemuxerStreamProviderShim> stream_provider_; 93 scoped_ptr<DemuxerStreamProviderShim> stream_provider_;
96 94
97 base::RepeatingTimer<MojoRendererService> time_update_timer_; 95 base::RepeatingTimer<MojoRendererService> time_update_timer_;
98 uint64_t last_media_time_usec_; 96 uint64_t last_media_time_usec_;
99 97
100 mojo::MediaRendererClientPtr client_; 98 mojo::MediaRendererClientPtr client_;
101 99
102 base::WeakPtr<MojoRendererService> weak_this_; 100 base::WeakPtr<MojoRendererService> weak_this_;
103 base::WeakPtrFactory<MojoRendererService> weak_factory_; 101 base::WeakPtrFactory<MojoRendererService> weak_factory_;
104 102
105 DISALLOW_COPY_AND_ASSIGN(MojoRendererService); 103 DISALLOW_COPY_AND_ASSIGN(MojoRendererService);
106 }; 104 };
107 105
108 } // namespace media 106 } // namespace media
109 107
110 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ 108 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_renderer_impl.cc ('k') | media/mojo/services/mojo_renderer_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698