Chromium Code Reviews| Index: media/video/video_decode_accelerator.h |
| diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h |
| index 9a31bfdcfe9fdb430f7bfebc70ca8fb327debe55..620347f0e7f7d33de35ff439408b26a83288beb6 100644 |
| --- a/media/video/video_decode_accelerator.h |
| +++ b/media/video/video_decode_accelerator.h |
| @@ -10,6 +10,7 @@ |
| #include "base/basictypes.h" |
| #include "base/callback_old.h" |
| #include "media/base/bitstream_buffer.h" |
| +#include "media/base/video_decoder_config.h" |
| #include "media/video/picture.h" |
| #include "ui/gfx/size.h" |
| @@ -24,25 +25,7 @@ namespace media { |
| class MEDIA_EXPORT VideoDecodeAccelerator |
| : public base::RefCountedThreadSafe<VideoDecodeAccelerator> { |
| public: |
| - // Video stream profile. This *must* match PP_VideoDecoder_Profile. |
| - enum Profile { |
| - // Keep the values in this enum unique, as they imply format (h.264 vs. VP8, |
| - // for example), and keep the values for a particular format grouped |
| - // together for clarity. |
| - H264PROFILE_MIN = 0, |
| - H264PROFILE_BASELINE = H264PROFILE_MIN, |
| - H264PROFILE_MAIN, |
| - H264PROFILE_EXTENDED, |
| - H264PROFILE_HIGH, |
| - H264PROFILE_HIGH10PROFILE, |
| - H264PROFILE_HIGH422PROFILE, |
| - H264PROFILE_HIGH444PREDICTIVEPROFILE, |
| - H264PROFILE_SCALABLEBASELINE, |
| - H264PROFILE_SCALABLEHIGH, |
| - H264PROFILE_STEREOHIGH, |
| - H264PROFILE_MULTIVIEWHIGH, |
| - H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH, |
| - }; |
| + typedef VideoCodecProfile Profile; |
|
scherkus (not reviewing)
2011/12/06 00:27:44
why not use VCP?
Ami GONE FROM CHROMIUM
2011/12/07 00:03:04
A bunch of places already refer to the inner type
|
| // Enumeration of potential errors generated by the API. |
| // Note: Keep these in sync with PP_VideoDecodeError_Dev. |