Chromium Code Reviews| Index: media/base/decoder_buffer.cc |
| diff --git a/media/base/decoder_buffer.cc b/media/base/decoder_buffer.cc |
| index 9eaa128ceb2ce66a8778666a680bf04d45c37d72..030233742d8d9596aaeff714314b270e95ee6321 100644 |
| --- a/media/base/decoder_buffer.cc |
| +++ b/media/base/decoder_buffer.cc |
| @@ -11,14 +11,16 @@ namespace media { |
| DecoderBuffer::DecoderBuffer(int size) |
| : size_(size), |
| - side_data_size_(0) { |
| + side_data_size_(0), |
| + discard_padding_(base::TimeDelta()) { |
|
acolwell GONE FROM CHROMIUM
2013/09/03 20:14:01
nit: not needed.
vignesh
2013/09/03 22:43:03
Done.
|
| Initialize(); |
| } |
| DecoderBuffer::DecoderBuffer(const uint8* data, int size, |
| const uint8* side_data, int side_data_size) |
| : size_(size), |
| - side_data_size_(side_data_size) { |
| + side_data_size_(side_data_size), |
| + discard_padding_(base::TimeDelta()) { |
|
acolwell GONE FROM CHROMIUM
2013/09/03 20:14:01
ditto
vignesh
2013/09/03 22:43:03
Done.
|
| if (!data) { |
| CHECK_EQ(size_, 0); |
| CHECK(!side_data); |
| @@ -80,7 +82,8 @@ std::string DecoderBuffer::AsHumanReadableString() { |
| << " duration: " << duration_.InMicroseconds() |
| << " size: " << size_ |
| << " side_data_size: " << side_data_size_ |
| - << " encrypted: " << (decrypt_config_ != NULL); |
| + << " encrypted: " << (decrypt_config_ != NULL) |
| + << " discard_padding (ms): " << discard_padding_.InMilliseconds(); |
| return s.str(); |
| } |