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

Side by Side Diff: media/filters/fake_video_decoder.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
« no previous file with comments | « media/filters/fake_demuxer_stream.h ('k') | media/filters/ffmpeg_audio_decoder.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_FAKE_VIDEO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_FAKE_VIDEO_DECODER_H_
6 #define MEDIA_FILTERS_FAKE_VIDEO_DECODER_H_ 6 #define MEDIA_FILTERS_FAKE_VIDEO_DECODER_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 18 matching lines...) Expand all
29 namespace media { 29 namespace media {
30 30
31 class FakeVideoDecoder : public VideoDecoder { 31 class FakeVideoDecoder : public VideoDecoder {
32 public: 32 public:
33 // Constructs an object with a decoding delay of |decoding_delay| frames. 33 // Constructs an object with a decoding delay of |decoding_delay| frames.
34 FakeVideoDecoder(int decoding_delay, 34 FakeVideoDecoder(int decoding_delay,
35 int max_parallel_decoding_requests); 35 int max_parallel_decoding_requests);
36 virtual ~FakeVideoDecoder(); 36 virtual ~FakeVideoDecoder();
37 37
38 // VideoDecoder implementation. 38 // VideoDecoder implementation.
39 virtual std::string GetDisplayName() const OVERRIDE; 39 virtual std::string GetDisplayName() const override;
40 virtual void Initialize(const VideoDecoderConfig& config, 40 virtual void Initialize(const VideoDecoderConfig& config,
41 bool low_delay, 41 bool low_delay,
42 const PipelineStatusCB& status_cb, 42 const PipelineStatusCB& status_cb,
43 const OutputCB& output_cb) OVERRIDE; 43 const OutputCB& output_cb) override;
44 virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, 44 virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer,
45 const DecodeCB& decode_cb) OVERRIDE; 45 const DecodeCB& decode_cb) override;
46 virtual void Reset(const base::Closure& closure) OVERRIDE; 46 virtual void Reset(const base::Closure& closure) override;
47 virtual int GetMaxDecodeRequests() const OVERRIDE; 47 virtual int GetMaxDecodeRequests() const override;
48 48
49 // Holds the next init/decode/reset callback from firing. 49 // Holds the next init/decode/reset callback from firing.
50 void HoldNextInit(); 50 void HoldNextInit();
51 void HoldDecode(); 51 void HoldDecode();
52 void HoldNextReset(); 52 void HoldNextReset();
53 53
54 // Satisfies the pending init/decode/reset callback, which must be ready to 54 // Satisfies the pending init/decode/reset callback, which must be ready to
55 // fire when these methods are called. 55 // fire when these methods are called.
56 void SatisfyInit(); 56 void SatisfyInit();
57 void SatisfyDecode(); 57 void SatisfyDecode();
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 109
110 // NOTE: Weak pointers must be invalidated before all other member variables. 110 // NOTE: Weak pointers must be invalidated before all other member variables.
111 base::WeakPtrFactory<FakeVideoDecoder> weak_factory_; 111 base::WeakPtrFactory<FakeVideoDecoder> weak_factory_;
112 112
113 DISALLOW_COPY_AND_ASSIGN(FakeVideoDecoder); 113 DISALLOW_COPY_AND_ASSIGN(FakeVideoDecoder);
114 }; 114 };
115 115
116 } // namespace media 116 } // namespace media
117 117
118 #endif // MEDIA_FILTERS_FAKE_VIDEO_DECODER_H_ 118 #endif // MEDIA_FILTERS_FAKE_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/fake_demuxer_stream.h ('k') | media/filters/ffmpeg_audio_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698