| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_VIDEO_DECODER_CONFIG_H_ | 5 #ifndef MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ |
| 6 #define MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ | 6 #define MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH, | 60 H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH, |
| 61 VP8PROFILE_MIN = 11, | 61 VP8PROFILE_MIN = 11, |
| 62 VP8PROFILE_ANY = VP8PROFILE_MIN, | 62 VP8PROFILE_ANY = VP8PROFILE_MIN, |
| 63 VP8PROFILE_MAX = VP8PROFILE_ANY, | 63 VP8PROFILE_MAX = VP8PROFILE_ANY, |
| 64 VP9PROFILE_MIN = 12, | 64 VP9PROFILE_MIN = 12, |
| 65 VP9PROFILE_ANY = VP9PROFILE_MIN, | 65 VP9PROFILE_ANY = VP9PROFILE_MIN, |
| 66 VP9PROFILE_MAX = VP9PROFILE_ANY, | 66 VP9PROFILE_MAX = VP9PROFILE_ANY, |
| 67 VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX, | 67 VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX, |
| 68 }; | 68 }; |
| 69 | 69 |
| 70 MEDIA_EXPORT VideoCodec |
| 71 VideoCodecProfileToVideoCodec(VideoCodecProfile profile); |
| 72 |
| 70 class MEDIA_EXPORT VideoDecoderConfig { | 73 class MEDIA_EXPORT VideoDecoderConfig { |
| 71 public: | 74 public: |
| 72 // Constructs an uninitialized object. Clients should call Initialize() with | 75 // Constructs an uninitialized object. Clients should call Initialize() with |
| 73 // appropriate values before using. | 76 // appropriate values before using. |
| 74 VideoDecoderConfig(); | 77 VideoDecoderConfig(); |
| 75 | 78 |
| 76 // Constructs an initialized object. It is acceptable to pass in NULL for | 79 // Constructs an initialized object. It is acceptable to pass in NULL for |
| 77 // |extra_data|, otherwise the memory is copied. | 80 // |extra_data|, otherwise the memory is copied. |
| 78 VideoDecoderConfig(VideoCodec codec, | 81 VideoDecoderConfig(VideoCodec codec, |
| 79 VideoCodecProfile profile, | 82 VideoCodecProfile profile, |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 bool is_encrypted_; | 166 bool is_encrypted_; |
| 164 | 167 |
| 165 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler | 168 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler |
| 166 // generated copy constructor and assignment operator. Since the extra data is | 169 // generated copy constructor and assignment operator. Since the extra data is |
| 167 // typically small, the performance impact is minimal. | 170 // typically small, the performance impact is minimal. |
| 168 }; | 171 }; |
| 169 | 172 |
| 170 } // namespace media | 173 } // namespace media |
| 171 | 174 |
| 172 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ | 175 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ |
| OLD | NEW |