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

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

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 #ifndef CHROMECAST_MEDIA_CMA_FILTERS_DEMUXER_STREAM_ADAPTER_H_ 5 #ifndef CHROMECAST_MEDIA_CMA_FILTERS_DEMUXER_STREAM_ADAPTER_H_
6 #define CHROMECAST_MEDIA_CMA_FILTERS_DEMUXER_STREAM_ADAPTER_H_ 6 #define CHROMECAST_MEDIA_CMA_FILTERS_DEMUXER_STREAM_ADAPTER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 21 matching lines...) Expand all
32 class DemuxerStreamAdapter : public CodedFrameProvider { 32 class DemuxerStreamAdapter : public CodedFrameProvider {
33 public: 33 public:
34 DemuxerStreamAdapter( 34 DemuxerStreamAdapter(
35 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 35 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
36 const scoped_refptr<BalancedMediaTaskRunnerFactory>& 36 const scoped_refptr<BalancedMediaTaskRunnerFactory>&
37 media_task_runner_factory, 37 media_task_runner_factory,
38 ::media::DemuxerStream* demuxer_stream); 38 ::media::DemuxerStream* demuxer_stream);
39 virtual ~DemuxerStreamAdapter(); 39 virtual ~DemuxerStreamAdapter();
40 40
41 // CodedFrameProvider implementation. 41 // CodedFrameProvider implementation.
42 virtual void Read(const ReadCB& read_cb) OVERRIDE; 42 virtual void Read(const ReadCB& read_cb) override;
43 virtual void Flush(const base::Closure& flush_cb) OVERRIDE; 43 virtual void Flush(const base::Closure& flush_cb) override;
44 44
45 private: 45 private:
46 void ResetMediaTaskRunner(); 46 void ResetMediaTaskRunner();
47 47
48 void ReadInternal(const ReadCB& read_cb); 48 void ReadInternal(const ReadCB& read_cb);
49 void RequestBuffer(const ReadCB& read_cb); 49 void RequestBuffer(const ReadCB& read_cb);
50 50
51 // Callback invoked from the demuxer stream to signal a buffer is ready. 51 // Callback invoked from the demuxer stream to signal a buffer is ready.
52 void OnNewBuffer(const ReadCB& read_cb, 52 void OnNewBuffer(const ReadCB& read_cb,
53 ::media::DemuxerStream::Status status, 53 ::media::DemuxerStream::Status status,
(...skipping 30 matching lines...) Expand all
84 base::WeakPtr<DemuxerStreamAdapter> weak_this_; 84 base::WeakPtr<DemuxerStreamAdapter> weak_this_;
85 base::WeakPtrFactory<DemuxerStreamAdapter> weak_factory_; 85 base::WeakPtrFactory<DemuxerStreamAdapter> weak_factory_;
86 86
87 DISALLOW_COPY_AND_ASSIGN(DemuxerStreamAdapter); 87 DISALLOW_COPY_AND_ASSIGN(DemuxerStreamAdapter);
88 }; 88 };
89 89
90 } // namespace media 90 } // namespace media
91 } // namespace chromecast 91 } // namespace chromecast
92 92
93 #endif // CHROMECAST_MEDIA_CMA_FILTERS_DEMUXER_STREAM_ADAPTER_H_ 93 #endif // CHROMECAST_MEDIA_CMA_FILTERS_DEMUXER_STREAM_ADAPTER_H_
OLDNEW
« no previous file with comments | « chromecast/media/cma/base/decoder_buffer_adapter.h ('k') | chromecast/media/cma/filters/demuxer_stream_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698