OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef MEDIA_BASE_DECODER_BUFFER_H_ | 5 #ifndef MEDIA_BASE_DECODER_BUFFER_H_ |
6 #define MEDIA_BASE_DECODER_BUFFER_H_ | 6 #define MEDIA_BASE_DECODER_BUFFER_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
179 // will be padded and aligned as necessary. If |data| is NULL then |data_| is | 179 // will be padded and aligned as necessary. If |data| is NULL then |data_| is |
180 // set to NULL and |buffer_size_| to 0. |is_key_frame_| will default to | 180 // set to NULL and |buffer_size_| to 0. |is_key_frame_| will default to |
181 // false. | 181 // false. |
182 DecoderBuffer(const uint8* data, int size, | 182 DecoderBuffer(const uint8* data, int size, |
183 const uint8* side_data, int side_data_size); | 183 const uint8* side_data, int side_data_size); |
184 virtual ~DecoderBuffer(); | 184 virtual ~DecoderBuffer(); |
185 | 185 |
186 private: | 186 private: |
187 base::TimeDelta timestamp_; | 187 base::TimeDelta timestamp_; |
188 base::TimeDelta duration_; | 188 base::TimeDelta duration_; |
189 bool is_duration_estimated_; | |
wolenetz
2015/04/15 02:55:23
Please remove this (the member is now in StreamPar
chcunningham
2015/04/16 18:04:16
Done.
| |
189 | 190 |
190 int size_; | 191 int size_; |
191 scoped_ptr<uint8, base::AlignedFreeDeleter> data_; | 192 scoped_ptr<uint8, base::AlignedFreeDeleter> data_; |
192 int side_data_size_; | 193 int side_data_size_; |
193 scoped_ptr<uint8, base::AlignedFreeDeleter> side_data_; | 194 scoped_ptr<uint8, base::AlignedFreeDeleter> side_data_; |
194 scoped_ptr<DecryptConfig> decrypt_config_; | 195 scoped_ptr<DecryptConfig> decrypt_config_; |
195 DiscardPadding discard_padding_; | 196 DiscardPadding discard_padding_; |
196 base::TimeDelta splice_timestamp_; | 197 base::TimeDelta splice_timestamp_; |
197 bool is_key_frame_; | 198 bool is_key_frame_; |
198 | 199 |
199 // Constructor helper method for memory allocations. | 200 // Constructor helper method for memory allocations. |
200 void Initialize(); | 201 void Initialize(); |
201 | 202 |
202 DISALLOW_COPY_AND_ASSIGN(DecoderBuffer); | 203 DISALLOW_COPY_AND_ASSIGN(DecoderBuffer); |
203 }; | 204 }; |
204 | 205 |
205 } // namespace media | 206 } // namespace media |
206 | 207 |
207 #endif // MEDIA_BASE_DECODER_BUFFER_H_ | 208 #endif // MEDIA_BASE_DECODER_BUFFER_H_ |
OLD | NEW |