| 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 19 matching lines...) Expand all Loading... |
| 30 kCodecVP9, | 30 kCodecVP9, |
| 31 // DO NOT ADD RANDOM VIDEO CODECS! | 31 // DO NOT ADD RANDOM VIDEO CODECS! |
| 32 // | 32 // |
| 33 // The only acceptable time to add a new codec is if there is production code | 33 // The only acceptable time to add a new codec is if there is production code |
| 34 // that uses said codec in the same CL. | 34 // that uses said codec in the same CL. |
| 35 | 35 |
| 36 kVideoCodecMax = kCodecVP9 // Must equal the last "real" codec above. | 36 kVideoCodecMax = kCodecVP9 // Must equal the last "real" codec above. |
| 37 }; | 37 }; |
| 38 | 38 |
| 39 // Video stream profile. This *must* match PP_VideoDecoder_Profile. | 39 // Video stream profile. This *must* match PP_VideoDecoder_Profile. |
| 40 // (enforced in webkit/plugins/ppapi/ppb_video_decoder_impl.cc) | 40 // (enforced in webkit/plugins/ppapi/ppb_video_decoder_impl.cc) and |
| 41 // gpu::VideoCodecProfile. |
| 41 enum VideoCodecProfile { | 42 enum VideoCodecProfile { |
| 42 // Keep the values in this enum unique, as they imply format (h.264 vs. VP8, | 43 // Keep the values in this enum unique, as they imply format (h.264 vs. VP8, |
| 43 // for example), and keep the values for a particular format grouped | 44 // for example), and keep the values for a particular format grouped |
| 44 // together for clarity. | 45 // together for clarity. |
| 45 VIDEO_CODEC_PROFILE_UNKNOWN = -1, | 46 VIDEO_CODEC_PROFILE_UNKNOWN = -1, |
| 46 VIDEO_CODEC_PROFILE_MIN = VIDEO_CODEC_PROFILE_UNKNOWN, | 47 VIDEO_CODEC_PROFILE_MIN = VIDEO_CODEC_PROFILE_UNKNOWN, |
| 47 H264PROFILE_MIN = 0, | 48 H264PROFILE_MIN = 0, |
| 48 H264PROFILE_BASELINE = H264PROFILE_MIN, | 49 H264PROFILE_BASELINE = H264PROFILE_MIN, |
| 49 H264PROFILE_MAIN = 1, | 50 H264PROFILE_MAIN = 1, |
| 50 H264PROFILE_EXTENDED = 2, | 51 H264PROFILE_EXTENDED = 2, |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 bool is_encrypted_; | 151 bool is_encrypted_; |
| 151 | 152 |
| 152 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler | 153 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler |
| 153 // generated copy constructor and assignment operator. Since the extra data is | 154 // generated copy constructor and assignment operator. Since the extra data is |
| 154 // typically small, the performance impact is minimal. | 155 // typically small, the performance impact is minimal. |
| 155 }; | 156 }; |
| 156 | 157 |
| 157 } // namespace media | 158 } // namespace media |
| 158 | 159 |
| 159 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ | 160 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ |
| OLD | NEW |