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

Side by Side Diff: chromecast/media/cma/base/decoder_buffer_adapter.cc

Issue 1149263002: Chromecast: Add stream id interface in DecoderBufferBase class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/base/decoder_buffer_adapter.h" 5 #include "chromecast/media/cma/base/decoder_buffer_adapter.h"
6 6
7 #include "media/base/decoder_buffer.h" 7 #include "media/base/decoder_buffer.h"
8 8
9 namespace chromecast { 9 namespace chromecast {
10 namespace media { 10 namespace media {
11 11
12 DecoderBufferAdapter::DecoderBufferAdapter( 12 DecoderBufferAdapter::DecoderBufferAdapter(
13 const scoped_refptr< ::media::DecoderBuffer>& buffer) 13 const scoped_refptr< ::media::DecoderBuffer>& buffer)
14 : buffer_(buffer) { 14 : DecoderBufferAdapter(-1, buffer) {
15 }
16
17 DecoderBufferAdapter::DecoderBufferAdapter(
18 int stream_id, const scoped_refptr< ::media::DecoderBuffer>& buffer)
gunsch 2015/05/21 21:06:34 style nit (post C++11 migration): "< ::" --> "<::"
erickung1 2015/05/21 21:38:34 Done.
19 : stream_id_(stream_id),
20 buffer_(buffer) {
15 } 21 }
16 22
17 DecoderBufferAdapter::~DecoderBufferAdapter() { 23 DecoderBufferAdapter::~DecoderBufferAdapter() {
18 } 24 }
19 25
26 int DecoderBufferAdapter::stream_id() const {
27 return stream_id_;
28 }
29
20 base::TimeDelta DecoderBufferAdapter::timestamp() const { 30 base::TimeDelta DecoderBufferAdapter::timestamp() const {
21 return buffer_->timestamp(); 31 return buffer_->timestamp();
22 } 32 }
23 33
24 const uint8* DecoderBufferAdapter::data() const { 34 const uint8* DecoderBufferAdapter::data() const {
25 return buffer_->data(); 35 return buffer_->data();
26 } 36 }
27 37
28 uint8* DecoderBufferAdapter::writable_data() const { 38 uint8* DecoderBufferAdapter::writable_data() const {
29 return buffer_->writable_data(); 39 return buffer_->writable_data();
30 } 40 }
31 41
32 size_t DecoderBufferAdapter::data_size() const { 42 size_t DecoderBufferAdapter::data_size() const {
33 return buffer_->data_size(); 43 return buffer_->data_size();
34 } 44 }
35 45
36 const ::media::DecryptConfig* DecoderBufferAdapter::decrypt_config() const { 46 const ::media::DecryptConfig* DecoderBufferAdapter::decrypt_config() const {
37 return buffer_->decrypt_config(); 47 return buffer_->decrypt_config();
38 } 48 }
39 49
40 bool DecoderBufferAdapter::end_of_stream() const { 50 bool DecoderBufferAdapter::end_of_stream() const {
41 return buffer_->end_of_stream(); 51 return buffer_->end_of_stream();
42 } 52 }
43 53
44 } // namespace media 54 } // namespace media
45 } // namespace chromecast 55 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698