OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "media/base/bitstream_buffer.h" | 5 #include "media/base/bitstream_buffer.h" |
6 | 6 |
7 namespace media { | 7 namespace media { |
8 | 8 |
9 BitstreamBuffer::BitstreamBuffer() | 9 BitstreamBuffer::BitstreamBuffer() |
10 : id_(-1), size_(0), presentation_timestamp_(kNoTimestamp()) {} | 10 : BitstreamBuffer(-1, base::SharedMemoryHandle(), 0, 0, kNoTimestamp()) {} |
dcheng
2016/03/01 01:48:43
Since you have default args on the constructor...
Owen Lin
2016/03/02 02:50:53
Done.
| |
11 | |
12 BitstreamBuffer::BitstreamBuffer(int32_t id, | |
13 base::SharedMemoryHandle handle, | |
14 size_t size) | |
15 : id_(id), | |
16 handle_(handle), | |
17 size_(size), | |
18 presentation_timestamp_(kNoTimestamp()) {} | |
19 | 11 |
20 BitstreamBuffer::BitstreamBuffer(int32_t id, | 12 BitstreamBuffer::BitstreamBuffer(int32_t id, |
21 base::SharedMemoryHandle handle, | 13 base::SharedMemoryHandle handle, |
22 size_t size, | 14 size_t size, |
15 off_t offset, | |
23 base::TimeDelta presentation_timestamp) | 16 base::TimeDelta presentation_timestamp) |
24 : id_(id), | 17 : id_(id), |
25 handle_(handle), | 18 handle_(handle), |
26 size_(size), | 19 size_(size), |
20 offset_(offset), | |
27 presentation_timestamp_(presentation_timestamp) {} | 21 presentation_timestamp_(presentation_timestamp) {} |
28 | 22 |
29 BitstreamBuffer::~BitstreamBuffer() {} | 23 BitstreamBuffer::~BitstreamBuffer() {} |
30 | 24 |
31 void BitstreamBuffer::SetDecryptConfig(const DecryptConfig& decrypt_config) { | 25 void BitstreamBuffer::SetDecryptConfig(const DecryptConfig& decrypt_config) { |
32 key_id_ = decrypt_config.key_id(); | 26 key_id_ = decrypt_config.key_id(); |
33 iv_ = decrypt_config.iv(); | 27 iv_ = decrypt_config.iv(); |
34 subsamples_ = decrypt_config.subsamples(); | 28 subsamples_ = decrypt_config.subsamples(); |
35 } | 29 } |
36 | 30 |
37 } // namespace media | 31 } // namespace media |
OLD | NEW |