| 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_BASE_UTIL_H_ | 5 #ifndef MEDIA_BASE_MEDIA_UTIL_H_ | 
| 6 #define MEDIA_BASE_UTIL_H_ | 6 #define MEDIA_BASE_MEDIA_UTIL_H_ | 
| 7 | 7 | 
| 8 #include <stdint.h> | 8 #include <stdint.h> | 
| 9 #include <vector> | 9 #include <vector> | 
| 10 | 10 | 
| 11 #include "media/base/encryption_scheme.h" | 11 #include "media/base/encryption_scheme.h" | 
| 12 #include "media/base/media_export.h" | 12 #include "media/base/media_export.h" | 
| 13 | 13 | 
| 14 namespace media { | 14 namespace media { | 
| 15 | 15 | 
| 16 // Simply returns an empty vector. {Audio|Video}DecoderConfig are often | 16 // Simply returns an empty vector. {Audio|Video}DecoderConfig are often | 
| 17 // constructed with empty extra data. | 17 // constructed with empty extra data. | 
| 18 MEDIA_EXPORT std::vector<uint8_t> EmptyExtraData(); | 18 MEDIA_EXPORT std::vector<uint8_t> EmptyExtraData(); | 
| 19 | 19 | 
| 20 // The following helper functions return new instances of EncryptionScheme that | 20 // The following helper functions return new instances of EncryptionScheme that | 
| 21 // indicate widely used settings. | 21 // indicate widely used settings. | 
| 22 MEDIA_EXPORT EncryptionScheme Unencrypted(); | 22 MEDIA_EXPORT EncryptionScheme Unencrypted(); | 
| 23 MEDIA_EXPORT EncryptionScheme AesCtrEncryptionScheme(); | 23 MEDIA_EXPORT EncryptionScheme AesCtrEncryptionScheme(); | 
| 24 | 24 | 
| 25 }  // namespace media | 25 }  // namespace media | 
| 26 | 26 | 
| 27 #endif  // MEDIA_BASE_UTIL_H_ | 27 #endif  // MEDIA_BASE_MEDIA_UTIL_H_ | 
| OLD | NEW | 
|---|