OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <list> | 8 #include <list> |
9 | 9 |
10 #include "base/synchronization/lock.h" | 10 #include "base/synchronization/lock.h" |
11 #include "media/base/audio_decoder_config.h" | |
scherkus (not reviewing)
2011/10/28 16:45:02
hmmm... these are only used in .cc
Ami GONE FROM CHROMIUM
2011/10/28 16:54:22
So why not move them there?
| |
11 #include "media/base/byte_queue.h" | 12 #include "media/base/byte_queue.h" |
12 #include "media/base/demuxer.h" | 13 #include "media/base/demuxer.h" |
14 #include "media/base/video_decoder_config.h" | |
13 #include "media/webm/webm_cluster_parser.h" | 15 #include "media/webm/webm_cluster_parser.h" |
14 | 16 |
15 struct AVFormatContext; | 17 struct AVFormatContext; |
16 | 18 |
17 namespace media { | 19 namespace media { |
18 | 20 |
19 class ChunkDemuxerClient; | 21 class ChunkDemuxerClient; |
20 class ChunkDemuxerStream; | 22 class ChunkDemuxerStream; |
21 class FFmpegURLProtocol; | 23 class FFmpegURLProtocol; |
22 | 24 |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
121 bool seek_waits_for_data_; | 123 bool seek_waits_for_data_; |
122 | 124 |
123 ByteQueue byte_queue_; | 125 ByteQueue byte_queue_; |
124 | 126 |
125 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); | 127 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); |
126 }; | 128 }; |
127 | 129 |
128 } // namespace media | 130 } // namespace media |
129 | 131 |
130 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ | 132 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ |
OLD | NEW |