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_DECRYPTING_DEMUXER_STREAM_H_ | 5 #ifndef MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_ |
6 #define MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_ | 6 #define MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_ |
7 | 7 |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/macros.h" |
9 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
10 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
11 #include "media/base/audio_decoder_config.h" | 12 #include "media/base/audio_decoder_config.h" |
12 #include "media/base/cdm_context.h" | 13 #include "media/base/cdm_context.h" |
13 #include "media/base/decryptor.h" | 14 #include "media/base/decryptor.h" |
14 #include "media/base/demuxer_stream.h" | 15 #include "media/base/demuxer_stream.h" |
15 #include "media/base/pipeline_status.h" | 16 #include "media/base/pipeline_status.h" |
16 #include "media/base/video_decoder_config.h" | 17 #include "media/base/video_decoder_config.h" |
17 | 18 |
18 namespace base { | 19 namespace base { |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 | 137 |
137 base::WeakPtr<DecryptingDemuxerStream> weak_this_; | 138 base::WeakPtr<DecryptingDemuxerStream> weak_this_; |
138 base::WeakPtrFactory<DecryptingDemuxerStream> weak_factory_; | 139 base::WeakPtrFactory<DecryptingDemuxerStream> weak_factory_; |
139 | 140 |
140 DISALLOW_COPY_AND_ASSIGN(DecryptingDemuxerStream); | 141 DISALLOW_COPY_AND_ASSIGN(DecryptingDemuxerStream); |
141 }; | 142 }; |
142 | 143 |
143 } // namespace media | 144 } // namespace media |
144 | 145 |
145 #endif // MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_ | 146 #endif // MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_ |
OLD | NEW |