OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_ | 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_ |
6 #define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_ | 6 #define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/macros.h" |
12 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
13 #include "media/base/media_export.h" | 14 #include "media/base/media_export.h" |
14 #include "media/base/media_log.h" | 15 #include "media/base/media_log.h" |
15 #include "media/formats/webm/webm_content_encodings.h" | 16 #include "media/formats/webm/webm_content_encodings.h" |
16 #include "media/formats/webm/webm_parser.h" | 17 #include "media/formats/webm/webm_parser.h" |
17 | 18 |
18 namespace media { | 19 namespace media { |
19 | 20 |
20 typedef std::vector<ContentEncoding*> ContentEncodings; | 21 typedef std::vector<ContentEncoding*> ContentEncodings; |
21 | 22 |
(...skipping 19 matching lines...) Expand all Loading... |
41 | 42 |
42 // |content_encodings_| is ready. For debugging purpose. | 43 // |content_encodings_| is ready. For debugging purpose. |
43 bool content_encodings_ready_; | 44 bool content_encodings_ready_; |
44 | 45 |
45 DISALLOW_COPY_AND_ASSIGN(WebMContentEncodingsClient); | 46 DISALLOW_COPY_AND_ASSIGN(WebMContentEncodingsClient); |
46 }; | 47 }; |
47 | 48 |
48 } // namespace media | 49 } // namespace media |
49 | 50 |
50 #endif // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_ | 51 #endif // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_ |
OLD | NEW |