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

Side by Side Diff: media/filters/vpx_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/video_renderer_impl.h ('k') | media/formats/common/offset_byte_queue_unittest.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_VPX_VIDEO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_VPX_VIDEO_DECODER_H_
6 #define MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ 6 #define MEDIA_FILTERS_VPX_VIDEO_DECODER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "media/base/demuxer_stream.h" 9 #include "media/base/demuxer_stream.h"
10 #include "media/base/video_decoder.h" 10 #include "media/base/video_decoder.h"
(...skipping 14 matching lines...) Expand all
25 // Note: VpxVideoDecoder accepts only YV12A VP8 content or VP9 content. This is 25 // Note: VpxVideoDecoder accepts only YV12A VP8 content or VP9 content. This is
26 // done to avoid usurping FFmpeg for all vp8 decoding, because the FFmpeg VP8 26 // done to avoid usurping FFmpeg for all vp8 decoding, because the FFmpeg VP8
27 // decoder is faster than the libvpx VP8 decoder. 27 // decoder is faster than the libvpx VP8 decoder.
28 class MEDIA_EXPORT VpxVideoDecoder : public VideoDecoder { 28 class MEDIA_EXPORT VpxVideoDecoder : public VideoDecoder {
29 public: 29 public:
30 explicit VpxVideoDecoder( 30 explicit VpxVideoDecoder(
31 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); 31 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
32 virtual ~VpxVideoDecoder(); 32 virtual ~VpxVideoDecoder();
33 33
34 // VideoDecoder implementation. 34 // VideoDecoder implementation.
35 virtual std::string GetDisplayName() const OVERRIDE; 35 virtual std::string GetDisplayName() const override;
36 virtual void Initialize(const VideoDecoderConfig& config, 36 virtual void Initialize(const VideoDecoderConfig& config,
37 bool low_delay, 37 bool low_delay,
38 const PipelineStatusCB& status_cb, 38 const PipelineStatusCB& status_cb,
39 const OutputCB& output_cb) OVERRIDE; 39 const OutputCB& output_cb) override;
40 virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, 40 virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer,
41 const DecodeCB& decode_cb) OVERRIDE; 41 const DecodeCB& decode_cb) override;
42 virtual void Reset(const base::Closure& closure) OVERRIDE; 42 virtual void Reset(const base::Closure& closure) override;
43 43
44 private: 44 private:
45 enum DecoderState { 45 enum DecoderState {
46 kUninitialized, 46 kUninitialized,
47 kNormal, 47 kNormal,
48 kFlushCodec, 48 kFlushCodec,
49 kDecodeFinished, 49 kDecodeFinished,
50 kError 50 kError
51 }; 51 };
52 52
(...skipping 30 matching lines...) Expand all
83 scoped_refptr<MemoryPool> memory_pool_; 83 scoped_refptr<MemoryPool> memory_pool_;
84 84
85 VideoFramePool frame_pool_; 85 VideoFramePool frame_pool_;
86 86
87 DISALLOW_COPY_AND_ASSIGN(VpxVideoDecoder); 87 DISALLOW_COPY_AND_ASSIGN(VpxVideoDecoder);
88 }; 88 };
89 89
90 } // namespace media 90 } // namespace media
91 91
92 #endif // MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ 92 #endif // MEDIA_FILTERS_VPX_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/video_renderer_impl.h ('k') | media/formats/common/offset_byte_queue_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698