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

Side by Side Diff: media/filters/renderer_impl.h

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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_FILTERS_RENDERER_IMPL_H_ 5 #ifndef MEDIA_FILTERS_RENDERER_IMPL_H_
6 #define MEDIA_FILTERS_RENDERER_IMPL_H_ 6 #define MEDIA_FILTERS_RENDERER_IMPL_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 29 matching lines...) Expand all
40 scoped_ptr<VideoRenderer> video_renderer); 40 scoped_ptr<VideoRenderer> video_renderer);
41 41
42 virtual ~RendererImpl(); 42 virtual ~RendererImpl();
43 43
44 // Renderer implementation. 44 // Renderer implementation.
45 virtual void Initialize(DemuxerStreamProvider* demuxer_stream_provider, 45 virtual void Initialize(DemuxerStreamProvider* demuxer_stream_provider,
46 const base::Closure& init_cb, 46 const base::Closure& init_cb,
47 const StatisticsCB& statistics_cb, 47 const StatisticsCB& statistics_cb,
48 const base::Closure& ended_cb, 48 const base::Closure& ended_cb,
49 const PipelineStatusCB& error_cb, 49 const PipelineStatusCB& error_cb,
50 const BufferingStateCB& buffering_state_cb) OVERRIDE; 50 const BufferingStateCB& buffering_state_cb) override;
51 virtual void Flush(const base::Closure& flush_cb) OVERRIDE; 51 virtual void Flush(const base::Closure& flush_cb) override;
52 virtual void StartPlayingFrom(base::TimeDelta time) OVERRIDE; 52 virtual void StartPlayingFrom(base::TimeDelta time) override;
53 virtual void SetPlaybackRate(float playback_rate) OVERRIDE; 53 virtual void SetPlaybackRate(float playback_rate) override;
54 virtual void SetVolume(float volume) OVERRIDE; 54 virtual void SetVolume(float volume) override;
55 virtual base::TimeDelta GetMediaTime() OVERRIDE; 55 virtual base::TimeDelta GetMediaTime() override;
56 virtual bool HasAudio() OVERRIDE; 56 virtual bool HasAudio() override;
57 virtual bool HasVideo() OVERRIDE; 57 virtual bool HasVideo() override;
58 virtual void SetCdm(MediaKeys* cdm) OVERRIDE; 58 virtual void SetCdm(MediaKeys* cdm) override;
59 59
60 // Helper functions for testing purposes. Must be called before Initialize(). 60 // Helper functions for testing purposes. Must be called before Initialize().
61 void DisableUnderflowForTesting(); 61 void DisableUnderflowForTesting();
62 void EnableClocklessVideoPlaybackForTesting(); 62 void EnableClocklessVideoPlaybackForTesting();
63 63
64 private: 64 private:
65 enum State { 65 enum State {
66 STATE_UNINITIALIZED, 66 STATE_UNINITIALIZED,
67 STATE_INITIALIZING, 67 STATE_INITIALIZING,
68 STATE_FLUSHING, 68 STATE_FLUSHING,
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 // NOTE: Weak pointers must be invalidated before all other member variables. 154 // NOTE: Weak pointers must be invalidated before all other member variables.
155 base::WeakPtrFactory<RendererImpl> weak_factory_; 155 base::WeakPtrFactory<RendererImpl> weak_factory_;
156 base::WeakPtr<RendererImpl> weak_this_; 156 base::WeakPtr<RendererImpl> weak_this_;
157 157
158 DISALLOW_COPY_AND_ASSIGN(RendererImpl); 158 DISALLOW_COPY_AND_ASSIGN(RendererImpl);
159 }; 159 };
160 160
161 } // namespace media 161 } // namespace media
162 162
163 #endif // MEDIA_FILTERS_RENDERER_IMPL_H_ 163 #endif // MEDIA_FILTERS_RENDERER_IMPL_H_
OLDNEW
« no previous file with comments | « media/filters/pipeline_integration_test_base.h ('k') | media/filters/skcanvas_video_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698