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

Side by Side Diff: media/filters/chunk_demuxer.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/blocking_url_protocol.h ('k') | media/filters/clockless_video_frame_scheduler.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_CHUNK_DEMUXER_H_ 5 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_
6 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_ 6 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 // Returns true if the new config is accepted. 73 // Returns true if the new config is accepted.
74 // Returns false if the new config should trigger an error. 74 // Returns false if the new config should trigger an error.
75 bool UpdateAudioConfig(const AudioDecoderConfig& config, const LogCB& log_cb); 75 bool UpdateAudioConfig(const AudioDecoderConfig& config, const LogCB& log_cb);
76 bool UpdateVideoConfig(const VideoDecoderConfig& config, const LogCB& log_cb); 76 bool UpdateVideoConfig(const VideoDecoderConfig& config, const LogCB& log_cb);
77 void UpdateTextConfig(const TextTrackConfig& config, const LogCB& log_cb); 77 void UpdateTextConfig(const TextTrackConfig& config, const LogCB& log_cb);
78 78
79 void MarkEndOfStream(); 79 void MarkEndOfStream();
80 void UnmarkEndOfStream(); 80 void UnmarkEndOfStream();
81 81
82 // DemuxerStream methods. 82 // DemuxerStream methods.
83 virtual void Read(const ReadCB& read_cb) OVERRIDE; 83 virtual void Read(const ReadCB& read_cb) override;
84 virtual Type type() OVERRIDE; 84 virtual Type type() override;
85 virtual AudioDecoderConfig audio_decoder_config() OVERRIDE; 85 virtual AudioDecoderConfig audio_decoder_config() override;
86 virtual VideoDecoderConfig video_decoder_config() OVERRIDE; 86 virtual VideoDecoderConfig video_decoder_config() override;
87 virtual bool SupportsConfigChanges() OVERRIDE; 87 virtual bool SupportsConfigChanges() override;
88 virtual VideoRotation video_rotation() OVERRIDE; 88 virtual VideoRotation video_rotation() override;
89 89
90 // Returns the text track configuration. It is an error to call this method 90 // Returns the text track configuration. It is an error to call this method
91 // if type() != TEXT. 91 // if type() != TEXT.
92 TextTrackConfig text_track_config(); 92 TextTrackConfig text_track_config();
93 93
94 // Sets the memory limit, in bytes, on the SourceBufferStream. 94 // Sets the memory limit, in bytes, on the SourceBufferStream.
95 void set_memory_limit(int memory_limit) { 95 void set_memory_limit(int memory_limit) {
96 stream_->set_memory_limit(memory_limit); 96 stream_->set_memory_limit(memory_limit);
97 } 97 }
98 98
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 // splice_timestamp() field. 152 // splice_timestamp() field.
153 ChunkDemuxer(const base::Closure& open_cb, 153 ChunkDemuxer(const base::Closure& open_cb,
154 const NeedKeyCB& need_key_cb, 154 const NeedKeyCB& need_key_cb,
155 const LogCB& log_cb, 155 const LogCB& log_cb,
156 bool splice_frames_enabled); 156 bool splice_frames_enabled);
157 virtual ~ChunkDemuxer(); 157 virtual ~ChunkDemuxer();
158 158
159 // Demuxer implementation. 159 // Demuxer implementation.
160 virtual void Initialize(DemuxerHost* host, 160 virtual void Initialize(DemuxerHost* host,
161 const PipelineStatusCB& cb, 161 const PipelineStatusCB& cb,
162 bool enable_text_tracks) OVERRIDE; 162 bool enable_text_tracks) override;
163 virtual void Stop() OVERRIDE; 163 virtual void Stop() override;
164 virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE; 164 virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) override;
165 virtual base::Time GetTimelineOffset() const OVERRIDE; 165 virtual base::Time GetTimelineOffset() const override;
166 virtual DemuxerStream* GetStream(DemuxerStream::Type type) OVERRIDE; 166 virtual DemuxerStream* GetStream(DemuxerStream::Type type) override;
167 virtual base::TimeDelta GetStartTime() const OVERRIDE; 167 virtual base::TimeDelta GetStartTime() const override;
168 virtual Liveness GetLiveness() const OVERRIDE; 168 virtual Liveness GetLiveness() const override;
169 169
170 // Methods used by an external object to control this demuxer. 170 // Methods used by an external object to control this demuxer.
171 // 171 //
172 // Indicates that a new Seek() call is on its way. Any pending Reads on the 172 // Indicates that a new Seek() call is on its way. Any pending Reads on the
173 // DemuxerStream objects should be aborted immediately inside this call and 173 // DemuxerStream objects should be aborted immediately inside this call and
174 // future Read calls should return kAborted until the Seek() call occurs. 174 // future Read calls should return kAborted until the Seek() call occurs.
175 // This method MUST ALWAYS be called before Seek() is called to signal that 175 // This method MUST ALWAYS be called before Seek() is called to signal that
176 // the next Seek() call represents the seek point we actually want to return 176 // the next Seek() call represents the seek point we actually want to return
177 // data for. 177 // data for.
178 // |seek_time| - The presentation timestamp for the seek that triggered this 178 // |seek_time| - The presentation timestamp for the seek that triggered this
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 392
393 // Indicates that splice frame generation is enabled. 393 // Indicates that splice frame generation is enabled.
394 const bool splice_frames_enabled_; 394 const bool splice_frames_enabled_;
395 395
396 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 396 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
397 }; 397 };
398 398
399 } // namespace media 399 } // namespace media
400 400
401 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 401 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_
OLDNEW
« no previous file with comments | « media/filters/blocking_url_protocol.h ('k') | media/filters/clockless_video_frame_scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698