| Index: ppapi/api/dev/pp_video_dev.idl
|
| ===================================================================
|
| --- ppapi/api/dev/pp_video_dev.idl (revision 113907)
|
| +++ ppapi/api/dev/pp_video_dev.idl (working copy)
|
| @@ -4,7 +4,8 @@
|
| */
|
|
|
| /**
|
| - * NOTE: these must be kept in sync with the versions in media/!
|
| + * NOTE: these must be kept in sync with the versions in
|
| + * media/video/video_decode_accelerator.h!
|
| */
|
|
|
|
|
| @@ -14,11 +15,9 @@
|
| * 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.
|
| - * Note: Keep these in sync with media::VideoCodecProfile.
|
| */
|
| [assert_size(4)]
|
| enum PP_VideoDecoder_Profile {
|
| - PP_VIDEODECODER_PROFILE_UNKNOWN = -1,
|
| PP_VIDEODECODER_H264PROFILE_NONE = 0,
|
| PP_VIDEODECODER_H264PROFILE_BASELINE = 1,
|
| PP_VIDEODECODER_H264PROFILE_MAIN = 2,
|
| @@ -30,8 +29,7 @@
|
| PP_VIDEODECODER_H264PROFILE_SCALABLEBASELINE = 8,
|
| PP_VIDEODECODER_H264PROFILE_SCALABLEHIGH = 9,
|
| PP_VIDEODECODER_H264PROFILE_STEREOHIGH = 10,
|
| - PP_VIDEODECODER_H264PROFILE_MULTIVIEWHIGH = 11,
|
| - PP_VIDEODECODER_PROFILE_MAX = PP_VIDEODECODER_H264PROFILE_MULTIVIEWHIGH
|
| + PP_VIDEODECODER_H264PROFILE_MULTIVIEWHIGH = 11
|
| };
|
|
|
| /**
|
|
|
| Property changes on: ppapi/api/dev/pp_video_dev.idl
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|