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

Side by Side Diff: chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.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/ipc_streamer/decoder_buffer_base_marshaller.h" 5 #include "chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chromecast/media/cma/base/decoder_buffer_base.h" 8 #include "chromecast/media/cma/base/decoder_buffer_base.h"
9 #include "chromecast/media/cma/ipc/media_message.h" 9 #include "chromecast/media/cma/ipc/media_message.h"
10 #include "chromecast/media/cma/ipc/media_message_type.h" 10 #include "chromecast/media/cma/ipc/media_message_type.h"
11 #include "chromecast/media/cma/ipc_streamer/decrypt_config_marshaller.h" 11 #include "chromecast/media/cma/ipc_streamer/decrypt_config_marshaller.h"
12 #include "media/base/decrypt_config.h" 12 #include "media/base/decrypt_config.h"
13 13
14 namespace chromecast { 14 namespace chromecast {
15 namespace media { 15 namespace media {
16 16
17 namespace { 17 namespace {
18 const size_t kMaxFrameSize = 4 * 1024 * 1024; 18 const size_t kMaxFrameSize = 4 * 1024 * 1024;
19 19
20 class DecoderBufferFromMsg : public DecoderBufferBase { 20 class DecoderBufferFromMsg : public DecoderBufferBase {
21 public: 21 public:
22 explicit DecoderBufferFromMsg(scoped_ptr<MediaMessage> msg); 22 explicit DecoderBufferFromMsg(scoped_ptr<MediaMessage> msg);
23 23
24 void Initialize(); 24 void Initialize();
25 25
26 // DecoderBufferBase implementation. 26 // DecoderBufferBase implementation.
27 virtual base::TimeDelta timestamp() const OVERRIDE; 27 virtual base::TimeDelta timestamp() const override;
28 virtual const uint8* data() const OVERRIDE; 28 virtual const uint8* data() const override;
29 virtual uint8* writable_data() const OVERRIDE; 29 virtual uint8* writable_data() const override;
30 virtual int data_size() const OVERRIDE; 30 virtual int data_size() const override;
31 virtual const ::media::DecryptConfig* decrypt_config() const OVERRIDE; 31 virtual const ::media::DecryptConfig* decrypt_config() const override;
32 virtual bool end_of_stream() const OVERRIDE; 32 virtual bool end_of_stream() const override;
33 33
34 private: 34 private:
35 virtual ~DecoderBufferFromMsg(); 35 virtual ~DecoderBufferFromMsg();
36 36
37 // Indicates whether this is an end of stream frame. 37 // Indicates whether this is an end of stream frame.
38 bool is_eos_; 38 bool is_eos_;
39 39
40 // Frame timestamp. 40 // Frame timestamp.
41 base::TimeDelta pts_; 41 base::TimeDelta pts_;
42 42
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 scoped_refptr<DecoderBufferBase> DecoderBufferBaseMarshaller::Read( 152 scoped_refptr<DecoderBufferBase> DecoderBufferBaseMarshaller::Read(
153 scoped_ptr<MediaMessage> msg) { 153 scoped_ptr<MediaMessage> msg) {
154 scoped_refptr<DecoderBufferFromMsg> buffer( 154 scoped_refptr<DecoderBufferFromMsg> buffer(
155 new DecoderBufferFromMsg(msg.Pass())); 155 new DecoderBufferFromMsg(msg.Pass()));
156 buffer->Initialize(); 156 buffer->Initialize();
157 return buffer; 157 return buffer;
158 } 158 }
159 159
160 } // namespace media 160 } // namespace media
161 } // namespace chromecast 161 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/cma/ipc_streamer/coded_frame_provider_host.h ('k') | chromecast/media/cma/test/mock_frame_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698