Chromium Code Reviews| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 57 H264PROFILE_SCALABLEHIGH = 8, | 57 H264PROFILE_SCALABLEHIGH = 8, |
| 58 H264PROFILE_STEREOHIGH = 9, | 58 H264PROFILE_STEREOHIGH = 9, |
| 59 H264PROFILE_MULTIVIEWHIGH = 10, | 59 H264PROFILE_MULTIVIEWHIGH = 10, |
| 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 MJPEGPROFILE = 13, |
|
wuchengli
2015/01/12 09:08:53
Let's not add a new video profile because vaapi wr
kcwu
2015/01/16 15:12:56
Done.
| |
| 68 VIDEO_CODEC_PROFILE_MAX = MJPEGPROFILE, | |
| 68 }; | 69 }; |
| 69 | 70 |
| 70 class MEDIA_EXPORT VideoDecoderConfig { | 71 class MEDIA_EXPORT VideoDecoderConfig { |
| 71 public: | 72 public: |
| 72 // Constructs an uninitialized object. Clients should call Initialize() with | 73 // Constructs an uninitialized object. Clients should call Initialize() with |
| 73 // appropriate values before using. | 74 // appropriate values before using. |
| 74 VideoDecoderConfig(); | 75 VideoDecoderConfig(); |
| 75 | 76 |
| 76 // Constructs an initialized object. It is acceptable to pass in NULL for | 77 // Constructs an initialized object. It is acceptable to pass in NULL for |
| 77 // |extra_data|, otherwise the memory is copied. | 78 // |extra_data|, otherwise the memory is copied. |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 151 bool is_encrypted_; | 152 bool is_encrypted_; |
| 152 | 153 |
| 153 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler | 154 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler |
| 154 // generated copy constructor and assignment operator. Since the extra data is | 155 // generated copy constructor and assignment operator. Since the extra data is |
| 155 // typically small, the performance impact is minimal. | 156 // typically small, the performance impact is minimal. |
| 156 }; | 157 }; |
| 157 | 158 |
| 158 } // namespace media | 159 } // namespace media |
| 159 | 160 |
| 160 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ | 161 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ |
| OLD | NEW |