| 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_FILTERS_CHUNK_DEMUXER_H_ | 5 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_ |
| 6 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_ | 6 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_ |
| 7 | 7 |
| 8 #include <stddef.h> |
| 9 #include <stdint.h> |
| 10 |
| 8 #include <deque> | 11 #include <deque> |
| 9 #include <map> | 12 #include <map> |
| 10 #include <string> | 13 #include <string> |
| 11 #include <utility> | 14 #include <utility> |
| 12 #include <vector> | 15 #include <vector> |
| 13 | 16 |
| 14 #include "base/macros.h" | 17 #include "base/macros.h" |
| 15 #include "base/synchronization/lock.h" | 18 #include "base/synchronization/lock.h" |
| 16 #include "media/base/byte_queue.h" | 19 #include "media/base/byte_queue.h" |
| 17 #include "media/base/demuxer.h" | 20 #include "media/base/demuxer.h" |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 | 422 |
| 420 // Indicates that splice frame generation is enabled. | 423 // Indicates that splice frame generation is enabled. |
| 421 const bool splice_frames_enabled_; | 424 const bool splice_frames_enabled_; |
| 422 | 425 |
| 423 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); | 426 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); |
| 424 }; | 427 }; |
| 425 | 428 |
| 426 } // namespace media | 429 } // namespace media |
| 427 | 430 |
| 428 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ | 431 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1542013004:
Switch to standard integer types in media/, take 2. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master