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

Side by Side Diff: chromecast/media/cma/filters/demuxer_stream_adapter.cc

Issue 630663003: replace OVERRIDE and FINAL with override and final in chromecast/ (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 #include "chromecast/media/cma/filters/demuxer_stream_adapter.h" 5 #include "chromecast/media/cma/filters/demuxer_stream_adapter.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "chromecast/media/cma/base/balanced_media_task_runner_factory.h" 10 #include "chromecast/media/cma/base/balanced_media_task_runner_factory.h"
(...skipping 12 matching lines...) Expand all
23 23
24 class DummyMediaTaskRunner : public MediaTaskRunner { 24 class DummyMediaTaskRunner : public MediaTaskRunner {
25 public: 25 public:
26 DummyMediaTaskRunner( 26 DummyMediaTaskRunner(
27 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); 27 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
28 28
29 // MediaTaskRunner implementation. 29 // MediaTaskRunner implementation.
30 virtual bool PostMediaTask( 30 virtual bool PostMediaTask(
31 const tracked_objects::Location& from_here, 31 const tracked_objects::Location& from_here,
32 const base::Closure& task, 32 const base::Closure& task,
33 base::TimeDelta timestamp) OVERRIDE; 33 base::TimeDelta timestamp) override;
34 34
35 private: 35 private:
36 virtual ~DummyMediaTaskRunner(); 36 virtual ~DummyMediaTaskRunner();
37 37
38 scoped_refptr<base::SingleThreadTaskRunner> const task_runner_; 38 scoped_refptr<base::SingleThreadTaskRunner> const task_runner_;
39 39
40 DISALLOW_COPY_AND_ASSIGN(DummyMediaTaskRunner); 40 DISALLOW_COPY_AND_ASSIGN(DummyMediaTaskRunner);
41 }; 41 };
42 42
43 DummyMediaTaskRunner::DummyMediaTaskRunner( 43 DummyMediaTaskRunner::DummyMediaTaskRunner(
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 // Back to the default audio/video config: 198 // Back to the default audio/video config:
199 // an invalid audio/video config means there is no config update. 199 // an invalid audio/video config means there is no config update.
200 if (audio_config_.IsValidConfig()) 200 if (audio_config_.IsValidConfig())
201 audio_config_ = ::media::AudioDecoderConfig(); 201 audio_config_ = ::media::AudioDecoderConfig();
202 if (video_config_.IsValidConfig()) 202 if (video_config_.IsValidConfig())
203 video_config_ = ::media::VideoDecoderConfig(); 203 video_config_ = ::media::VideoDecoderConfig();
204 } 204 }
205 205
206 } // namespace media 206 } // namespace media
207 } // namespace chromecast 207 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/cma/filters/demuxer_stream_adapter.h ('k') | chromecast/media/cma/filters/demuxer_stream_adapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698