| 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..ab5d1fb2707b8ca31e477eaa2e200ef5d3c4436e 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,8 @@ 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,
|
| - };
|
| + // TODO(fischman): fix foreign references to this and get rid of this typedef.
|
| + typedef VideoCodecProfile Profile;
|
|
|
| // Enumeration of potential errors generated by the API.
|
| // Note: Keep these in sync with PP_VideoDecodeError_Dev.
|
| @@ -64,7 +48,7 @@ class MEDIA_EXPORT VideoDecodeAccelerator
|
| // This interface is extended by the various layers that relay messages back
|
| // to the plugin, through the PPP_VideoDecode_Dev interface the plugin
|
| // implements.
|
| - class Client {
|
| + class MEDIA_EXPORT Client {
|
| public:
|
| virtual ~Client() {}
|
|
|
|
|