| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_AUDIO_CODECS_H_ | 5 #ifndef MEDIA_BASE_AUDIO_CODECS_H_ |
| 6 #define MEDIA_BASE_AUDIO_CODECS_H_ | 6 #define MEDIA_BASE_AUDIO_CODECS_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include "media/base/media_export.h" | 9 #include "media/base/media_export.h" |
| 10 | 10 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 // | 36 // |
| 37 // The only acceptable time to add a new codec is if there is production code | 37 // The only acceptable time to add a new codec is if there is production code |
| 38 // that uses said codec in the same CL. | 38 // that uses said codec in the same CL. |
| 39 | 39 |
| 40 // Must always be equal to the largest entry ever logged. | 40 // Must always be equal to the largest entry ever logged. |
| 41 kAudioCodecMax = kCodecAC3, | 41 kAudioCodecMax = kCodecAC3, |
| 42 }; | 42 }; |
| 43 | 43 |
| 44 std::string MEDIA_EXPORT GetCodecName(AudioCodec codec); | 44 std::string MEDIA_EXPORT GetCodecName(AudioCodec codec); |
| 45 | 45 |
| 46 MEDIA_EXPORT AudioCodec StringToAudioCodec(const std::string& codec_id); |
| 47 |
| 46 } // namespace media | 48 } // namespace media |
| 47 | 49 |
| 48 #endif // MEDIA_BASE_AUDIO_CODECS_H_ | 50 #endif // MEDIA_BASE_AUDIO_CODECS_H_ |
| OLD | NEW |