OLD | NEW |
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 <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 #include <utility> |
9 | 10 |
10 #include "base/logging.h" | 11 #include "base/logging.h" |
11 #include "base/macros.h" | 12 #include "base/macros.h" |
12 #include "chromecast/media/cma/base/cast_decrypt_config_impl.h" | 13 #include "chromecast/media/cma/base/cast_decrypt_config_impl.h" |
13 #include "chromecast/media/cma/base/decoder_buffer_base.h" | 14 #include "chromecast/media/cma/base/decoder_buffer_base.h" |
14 #include "chromecast/media/cma/ipc/media_message.h" | 15 #include "chromecast/media/cma/ipc/media_message.h" |
15 #include "chromecast/media/cma/ipc/media_message_type.h" | 16 #include "chromecast/media/cma/ipc/media_message_type.h" |
16 #include "chromecast/media/cma/ipc_streamer/decrypt_config_marshaller.h" | 17 #include "chromecast/media/cma/ipc_streamer/decrypt_config_marshaller.h" |
17 #include "chromecast/public/media/cast_decrypt_config.h" | 18 #include "chromecast/public/media/cast_decrypt_config.h" |
18 #include "media/base/decoder_buffer.h" | 19 #include "media/base/decoder_buffer.h" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 // Size of the frame. | 60 // Size of the frame. |
60 size_t data_size_; | 61 size_t data_size_; |
61 | 62 |
62 // Keeps the message since frame data is not copied. | 63 // Keeps the message since frame data is not copied. |
63 scoped_ptr<MediaMessage> msg_; | 64 scoped_ptr<MediaMessage> msg_; |
64 uint8_t* data_; | 65 uint8_t* data_; |
65 | 66 |
66 DISALLOW_COPY_AND_ASSIGN(DecoderBufferFromMsg); | 67 DISALLOW_COPY_AND_ASSIGN(DecoderBufferFromMsg); |
67 }; | 68 }; |
68 | 69 |
69 DecoderBufferFromMsg::DecoderBufferFromMsg( | 70 DecoderBufferFromMsg::DecoderBufferFromMsg(scoped_ptr<MediaMessage> msg) |
70 scoped_ptr<MediaMessage> msg) | 71 : is_eos_(true), stream_id_(kPrimary), msg_(std::move(msg)), data_(NULL) { |
71 : is_eos_(true), | |
72 stream_id_(kPrimary), | |
73 msg_(msg.Pass()), | |
74 data_(NULL) { | |
75 CHECK(msg_); | 72 CHECK(msg_); |
76 } | 73 } |
77 | 74 |
78 DecoderBufferFromMsg::~DecoderBufferFromMsg() { | 75 DecoderBufferFromMsg::~DecoderBufferFromMsg() { |
79 } | 76 } |
80 | 77 |
81 void DecoderBufferFromMsg::Initialize() { | 78 void DecoderBufferFromMsg::Initialize() { |
82 CHECK_EQ(msg_->type(), FrameMediaMsg); | 79 CHECK_EQ(msg_->type(), FrameMediaMsg); |
83 | 80 |
84 CHECK(msg_->ReadPod(&is_eos_)); | 81 CHECK(msg_->ReadPod(&is_eos_)); |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 } | 193 } |
197 | 194 |
198 CHECK(msg->WritePod(buffer->data_size())); | 195 CHECK(msg->WritePod(buffer->data_size())); |
199 CHECK(msg->WriteBuffer(buffer->data(), buffer->data_size())); | 196 CHECK(msg->WriteBuffer(buffer->data(), buffer->data_size())); |
200 } | 197 } |
201 | 198 |
202 // static | 199 // static |
203 scoped_refptr<DecoderBufferBase> DecoderBufferBaseMarshaller::Read( | 200 scoped_refptr<DecoderBufferBase> DecoderBufferBaseMarshaller::Read( |
204 scoped_ptr<MediaMessage> msg) { | 201 scoped_ptr<MediaMessage> msg) { |
205 scoped_refptr<DecoderBufferFromMsg> buffer( | 202 scoped_refptr<DecoderBufferFromMsg> buffer( |
206 new DecoderBufferFromMsg(msg.Pass())); | 203 new DecoderBufferFromMsg(std::move(msg))); |
207 buffer->Initialize(); | 204 buffer->Initialize(); |
208 return buffer; | 205 return buffer; |
209 } | 206 } |
210 | 207 |
211 } // namespace media | 208 } // namespace media |
212 } // namespace chromecast | 209 } // namespace chromecast |
OLD | NEW |