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

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

Issue 1257013003: Load CMA backend from shared library (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 4 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 "chromecast/media/cma/base/cast_decrypt_config_impl.h"
8 #include "chromecast/public/media/cast_decrypt_config.h"
7 #include "media/base/decoder_buffer.h" 9 #include "media/base/decoder_buffer.h"
8 10
9 namespace chromecast { 11 namespace chromecast {
10 namespace media { 12 namespace media {
11 13
12 DecoderBufferAdapter::DecoderBufferAdapter( 14 DecoderBufferAdapter::DecoderBufferAdapter(
13 const scoped_refptr<::media::DecoderBuffer>& buffer) 15 const scoped_refptr<::media::DecoderBuffer>& buffer)
14 : DecoderBufferAdapter(kPrimary, buffer) { 16 : DecoderBufferAdapter(kPrimary, buffer) {
15 } 17 }
16 18
17 DecoderBufferAdapter::DecoderBufferAdapter( 19 DecoderBufferAdapter::DecoderBufferAdapter(
18 StreamId stream_id, const scoped_refptr<::media::DecoderBuffer>& buffer) 20 StreamId stream_id, const scoped_refptr<::media::DecoderBuffer>& buffer)
19 : stream_id_(stream_id), 21 : stream_id_(stream_id),
20 buffer_(buffer) { 22 buffer_(buffer) {
21 } 23 }
22 24
23 DecoderBufferAdapter::~DecoderBufferAdapter() { 25 DecoderBufferAdapter::~DecoderBufferAdapter() {
24 } 26 }
25 27
26 StreamId DecoderBufferAdapter::stream_id() const { 28 StreamId DecoderBufferAdapter::stream_id() const {
27 return stream_id_; 29 return stream_id_;
28 } 30 }
29 31
30 base::TimeDelta DecoderBufferAdapter::timestamp() const { 32 base::TimeDelta DecoderBufferAdapter::timestamp() const {
31 return buffer_->timestamp(); 33 return buffer_->timestamp();
32 } 34 }
33 35
34 void DecoderBufferAdapter::set_timestamp(const base::TimeDelta& timestamp) { 36 void DecoderBufferAdapter::set_timestamp(base::TimeDelta timestamp) {
35 buffer_->set_timestamp(timestamp); 37 buffer_->set_timestamp(timestamp);
36 } 38 }
37 39
38 const uint8* DecoderBufferAdapter::data() const { 40 const uint8* DecoderBufferAdapter::data() const {
39 return buffer_->data(); 41 return buffer_->data();
40 } 42 }
41 43
42 uint8* DecoderBufferAdapter::writable_data() const { 44 uint8* DecoderBufferAdapter::writable_data() const {
43 return buffer_->writable_data(); 45 return buffer_->writable_data();
44 } 46 }
45 47
46 size_t DecoderBufferAdapter::data_size() const { 48 size_t DecoderBufferAdapter::data_size() const {
47 return buffer_->data_size(); 49 return buffer_->data_size();
48 } 50 }
49 51
50 const ::media::DecryptConfig* DecoderBufferAdapter::decrypt_config() const { 52 const CastDecryptConfig* DecoderBufferAdapter::decrypt_config() const {
51 return buffer_->decrypt_config(); 53 if (buffer_->decrypt_config() && !decrypt_config_) {
54 const ::media::DecryptConfig* config = buffer_->decrypt_config();
55 decrypt_config_.reset(new CastDecryptConfigImpl(*config));
56 }
57
58 return decrypt_config_.get();
52 } 59 }
53 60
54 bool DecoderBufferAdapter::end_of_stream() const { 61 bool DecoderBufferAdapter::end_of_stream() const {
55 return buffer_->end_of_stream(); 62 return buffer_->end_of_stream();
56 } 63 }
57 64
58 } // namespace media 65 } // namespace media
59 } // namespace chromecast 66 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698