| 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 #include "media/base/decoder_buffer.h" | 5 #include "media/base/decoder_buffer.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "media/base/buffers.h" | 8 #include "media/base/buffers.h" |
| 9 #include "media/base/decrypt_config.h" | 9 #include "media/base/decrypt_config.h" |
| 10 | 10 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 if (end_of_stream()) { | 76 if (end_of_stream()) { |
| 77 return "end of stream"; | 77 return "end of stream"; |
| 78 } | 78 } |
| 79 | 79 |
| 80 std::ostringstream s; | 80 std::ostringstream s; |
| 81 s << "timestamp: " << timestamp_.InMicroseconds() | 81 s << "timestamp: " << timestamp_.InMicroseconds() |
| 82 << " duration: " << duration_.InMicroseconds() | 82 << " duration: " << duration_.InMicroseconds() |
| 83 << " size: " << size_ | 83 << " size: " << size_ |
| 84 << " side_data_size: " << side_data_size_ | 84 << " side_data_size: " << side_data_size_ |
| 85 << " encrypted: " << (decrypt_config_ != NULL) | 85 << " encrypted: " << (decrypt_config_ != NULL) |
| 86 << " discard_padding (ms): " << discard_padding_.InMilliseconds(); | 86 << " discard_padding (ms): (" << discard_padding_.first.InMilliseconds() |
| 87 << ", " << discard_padding_.second.InMilliseconds() << ")"; |
| 87 return s.str(); | 88 return s.str(); |
| 88 } | 89 } |
| 89 | 90 |
| 90 } // namespace media | 91 } // namespace media |
| OLD | NEW |