| 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_DEMUXER_H_ | 5 #ifndef MEDIA_BASE_DEMUXER_H_ |
| 6 #define MEDIA_BASE_DEMUXER_H_ | 6 #define MEDIA_BASE_DEMUXER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/time/time.h" | 14 #include "base/time/time.h" |
| 14 #include "media/base/data_source.h" | 15 #include "media/base/data_source.h" |
| 15 #include "media/base/demuxer_stream.h" | 16 #include "media/base/demuxer_stream.h" |
| 16 #include "media/base/demuxer_stream_provider.h" | 17 #include "media/base/demuxer_stream_provider.h" |
| 17 #include "media/base/eme_constants.h" | 18 #include "media/base/eme_constants.h" |
| 18 #include "media/base/media_export.h" | 19 #include "media/base/media_export.h" |
| 19 #include "media/base/pipeline_status.h" | 20 #include "media/base/pipeline_status.h" |
| 20 #include "media/base/ranges.h" | 21 #include "media/base/ranges.h" |
| 21 | 22 |
| 22 namespace media { | 23 namespace media { |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 // Returns the memory usage in bytes for the demuxer. | 134 // Returns the memory usage in bytes for the demuxer. |
| 134 virtual int64_t GetMemoryUsage() const = 0; | 135 virtual int64_t GetMemoryUsage() const = 0; |
| 135 | 136 |
| 136 private: | 137 private: |
| 137 DISALLOW_COPY_AND_ASSIGN(Demuxer); | 138 DISALLOW_COPY_AND_ASSIGN(Demuxer); |
| 138 }; | 139 }; |
| 139 | 140 |
| 140 } // namespace media | 141 } // namespace media |
| 141 | 142 |
| 142 #endif // MEDIA_BASE_DEMUXER_H_ | 143 #endif // MEDIA_BASE_DEMUXER_H_ |
| OLD | NEW |