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

Side by Side Diff: media/filters/ffmpeg_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/ffmpeg_demuxer.h ('k') | media/filters/file_data_source.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 (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_FFMPEG_VIDEO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
6 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 6 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 18 matching lines...) Expand all
29 public: 29 public:
30 explicit FFmpegVideoDecoder( 30 explicit FFmpegVideoDecoder(
31 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); 31 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
32 virtual ~FFmpegVideoDecoder(); 32 virtual ~FFmpegVideoDecoder();
33 33
34 // Allow decoding of individual NALU. Entire frames are required by default. 34 // Allow decoding of individual NALU. Entire frames are required by default.
35 // Disables low-latency mode. Must be called before Initialize(). 35 // Disables low-latency mode. Must be called before Initialize().
36 void set_decode_nalus(bool decode_nalus) { decode_nalus_ = decode_nalus; } 36 void set_decode_nalus(bool decode_nalus) { decode_nalus_ = decode_nalus; }
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 47
48 // Callback called from within FFmpeg to allocate a buffer based on 48 // Callback called from within FFmpeg to allocate a buffer based on
49 // the dimensions of |codec_context|. See AVCodecContext.get_buffer2 49 // the dimensions of |codec_context|. See AVCodecContext.get_buffer2
50 // documentation inside FFmpeg. 50 // documentation inside FFmpeg.
51 int GetVideoBuffer(struct AVCodecContext* codec_context, 51 int GetVideoBuffer(struct AVCodecContext* codec_context,
52 AVFrame* frame, 52 AVFrame* frame,
53 int flags); 53 int flags);
54 54
55 private: 55 private:
56 enum DecoderState { 56 enum DecoderState {
(...skipping 30 matching lines...) Expand all
87 VideoFramePool frame_pool_; 87 VideoFramePool frame_pool_;
88 88
89 bool decode_nalus_; 89 bool decode_nalus_;
90 90
91 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder); 91 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
92 }; 92 };
93 93
94 } // namespace media 94 } // namespace media
95 95
96 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 96 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_demuxer.h ('k') | media/filters/file_data_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698