| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_CDM_CDM_HELPERS_H_ | 5 #ifndef MEDIA_CDM_CDM_HELPERS_H_ |
| 6 #define MEDIA_CDM_CDM_HELPERS_H_ | 6 #define MEDIA_CDM_CDM_HELPERS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include "base/macros.h" | 10 #include "base/macros.h" |
| 9 #include "media/cdm/api/content_decryption_module.h" | 11 #include "media/cdm/api/content_decryption_module.h" |
| 10 | 12 |
| 11 namespace media { | 13 namespace media { |
| 12 | 14 |
| 13 class DecryptedBlockImpl : public cdm::DecryptedBlock { | 15 class DecryptedBlockImpl : public cdm::DecryptedBlock { |
| 14 public: | 16 public: |
| 15 DecryptedBlockImpl(); | 17 DecryptedBlockImpl(); |
| 16 ~DecryptedBlockImpl() final; | 18 ~DecryptedBlockImpl() final; |
| 17 | 19 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 private: | 89 private: |
| 88 cdm::Buffer* buffer_; | 90 cdm::Buffer* buffer_; |
| 89 cdm::AudioFormat format_; | 91 cdm::AudioFormat format_; |
| 90 | 92 |
| 91 DISALLOW_COPY_AND_ASSIGN(AudioFramesImpl); | 93 DISALLOW_COPY_AND_ASSIGN(AudioFramesImpl); |
| 92 }; | 94 }; |
| 93 | 95 |
| 94 } // namespace media | 96 } // namespace media |
| 95 | 97 |
| 96 #endif // MEDIA_CDM_CDM_HELPERS_H_ | 98 #endif // MEDIA_CDM_CDM_HELPERS_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