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_H_ | 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ |
6 #define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ | 6 #define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
| 10 #include "base/macros.h" |
10 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
11 #include "media/base/media_export.h" | 12 #include "media/base/media_export.h" |
12 | 13 |
13 namespace media { | 14 namespace media { |
14 | 15 |
15 class MEDIA_EXPORT ContentEncoding { | 16 class MEDIA_EXPORT ContentEncoding { |
16 public: | 17 public: |
17 // The following enum definitions are based on the ContentEncoding element | 18 // The following enum definitions are based on the ContentEncoding element |
18 // specified in the Matroska spec. | 19 // specified in the Matroska spec. |
19 | 20 |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 EncryptionAlgo encryption_algo_; | 79 EncryptionAlgo encryption_algo_; |
79 std::string encryption_key_id_; | 80 std::string encryption_key_id_; |
80 CipherMode cipher_mode_; | 81 CipherMode cipher_mode_; |
81 | 82 |
82 DISALLOW_COPY_AND_ASSIGN(ContentEncoding); | 83 DISALLOW_COPY_AND_ASSIGN(ContentEncoding); |
83 }; | 84 }; |
84 | 85 |
85 } // namespace media | 86 } // namespace media |
86 | 87 |
87 #endif // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ | 88 #endif // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ |
OLD | NEW |