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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 51 H264PROFILE_HIGH = 3, | 51 H264PROFILE_HIGH = 3, |
| 52 H264PROFILE_HIGH10PROFILE = 4, | 52 H264PROFILE_HIGH10PROFILE = 4, |
| 53 H264PROFILE_HIGH422PROFILE = 5, | 53 H264PROFILE_HIGH422PROFILE = 5, |
| 54 H264PROFILE_HIGH444PREDICTIVEPROFILE = 6, | 54 H264PROFILE_HIGH444PREDICTIVEPROFILE = 6, |
| 55 H264PROFILE_SCALABLEBASELINE = 7, | 55 H264PROFILE_SCALABLEBASELINE = 7, |
| 56 H264PROFILE_SCALABLEHIGH = 8, | 56 H264PROFILE_SCALABLEHIGH = 8, |
| 57 H264PROFILE_STEREOHIGH = 9, | 57 H264PROFILE_STEREOHIGH = 9, |
| 58 H264PROFILE_MULTIVIEWHIGH = 10, | 58 H264PROFILE_MULTIVIEWHIGH = 10, |
| 59 H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH, | 59 H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH, |
| 60 VP8PROFILE_MIN = 11, | 60 VP8PROFILE_MIN = 11, |
| 61 VP8PROFILE_MAIN = VP8PROFILE_MIN, | 61 VP8PROFILE_NOT_NEEDED = VP8PROFILE_MIN, |
| 62 VP8PROFILE_MAIN = VP8PROFILE_NOT_NEEDED, | |
| 62 VP8PROFILE_MAX = VP8PROFILE_MAIN, | 63 VP8PROFILE_MAX = VP8PROFILE_MAIN, |
| 63 VP9PROFILE_MIN = 12, | 64 VP9PROFILE_MIN = 12, |
|
xhwang
2014/07/30 21:21:41
We don't need VP8PROFILE_MAIN, VP8PROFILE_MAX and
amogh.bihani
2014/07/31 05:07:40
Done.
xhwang
2014/07/31 17:12:44
Can we drop VP8PROFILE_MIN and VP8PROFILE_MAX also
| |
| 64 VP9PROFILE_MAIN = VP9PROFILE_MIN, | 65 VP9PROFILE_NOT_NEEDED = VP9PROFILE_MIN, |
| 66 VP9PROFILE_MAIN = VP9PROFILE_NOT_NEEDED, | |
| 65 VP9PROFILE_MAX = VP9PROFILE_MAIN, | 67 VP9PROFILE_MAX = VP9PROFILE_MAIN, |
|
xhwang
2014/07/30 21:21:41
ditto
amogh.bihani
2014/07/31 05:07:40
Done.
xhwang
2014/07/31 17:12:44
ditto
| |
| 66 VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX, | 68 VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX, |
| 67 }; | 69 }; |
| 68 | 70 |
| 69 class MEDIA_EXPORT VideoDecoderConfig { | 71 class MEDIA_EXPORT VideoDecoderConfig { |
| 70 public: | 72 public: |
| 71 // Constructs an uninitialized object. Clients should call Initialize() with | 73 // Constructs an uninitialized object. Clients should call Initialize() with |
| 72 // appropriate values before using. | 74 // appropriate values before using. |
| 73 VideoDecoderConfig(); | 75 VideoDecoderConfig(); |
| 74 | 76 |
| 75 // 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 |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 150 bool is_encrypted_; | 152 bool is_encrypted_; |
| 151 | 153 |
| 152 // 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 |
| 153 // generated copy constructor and assignment operator. Since the extra data is | 155 // generated copy constructor and assignment operator. Since the extra data is |
| 154 // typically small, the performance impact is minimal. | 156 // typically small, the performance impact is minimal. |
| 155 }; | 157 }; |
| 156 | 158 |
| 157 } // namespace media | 159 } // namespace media |
| 158 | 160 |
| 159 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ | 161 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ |
| OLD | NEW |