Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Side by Side Diff: ppapi/c/dev/pp_video_dev.h

Issue 8897022: Revert 113895 - <video> decode in hardware! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/api/dev/pp_video_dev.idl ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 /* Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 /* Copyright (c) 2011 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 5
6 /* From dev/pp_video_dev.idl modified Wed Nov 23 13:51:18 2011. */ 6 /* From dev/pp_video_dev.idl modified Fri Nov 11 20:20:20 2011. */
7 7
8 #ifndef PPAPI_C_DEV_PP_VIDEO_DEV_H_ 8 #ifndef PPAPI_C_DEV_PP_VIDEO_DEV_H_
9 #define PPAPI_C_DEV_PP_VIDEO_DEV_H_ 9 #define PPAPI_C_DEV_PP_VIDEO_DEV_H_
10 10
11 #include "ppapi/c/pp_macros.h" 11 #include "ppapi/c/pp_macros.h"
12 #include "ppapi/c/pp_resource.h" 12 #include "ppapi/c/pp_resource.h"
13 #include "ppapi/c/pp_size.h" 13 #include "ppapi/c/pp_size.h"
14 #include "ppapi/c/pp_stdint.h" 14 #include "ppapi/c/pp_stdint.h"
15 15
16 /** 16 /**
17 * @file 17 * @file
18 * NOTE: these must be kept in sync with the versions in media/! 18 * NOTE: these must be kept in sync with the versions in
19 * media/video/video_decode_accelerator.h!
19 */ 20 */
20 21
21 22
22 /** 23 /**
23 * @addtogroup Enums 24 * @addtogroup Enums
24 * @{ 25 * @{
25 */ 26 */
26 /** 27 /**
27 * Video format. 28 * Video format.
28 * 29 *
29 * Keep the values in this enum unique, as they imply format (h.264 vs. VP8, 30 * Keep the values in this enum unique, as they imply format (h.264 vs. VP8,
30 * for example), and keep the values for a particular format grouped together 31 * for example), and keep the values for a particular format grouped together
31 * for clarity. 32 * for clarity.
32 * Note: Keep these in sync with media::VideoCodecProfile.
33 */ 33 */
34 typedef enum { 34 typedef enum {
35 PP_VIDEODECODER_PROFILE_UNKNOWN = -1,
36 PP_VIDEODECODER_H264PROFILE_NONE = 0, 35 PP_VIDEODECODER_H264PROFILE_NONE = 0,
37 PP_VIDEODECODER_H264PROFILE_BASELINE = 1, 36 PP_VIDEODECODER_H264PROFILE_BASELINE = 1,
38 PP_VIDEODECODER_H264PROFILE_MAIN = 2, 37 PP_VIDEODECODER_H264PROFILE_MAIN = 2,
39 PP_VIDEODECODER_H264PROFILE_EXTENDED = 3, 38 PP_VIDEODECODER_H264PROFILE_EXTENDED = 3,
40 PP_VIDEODECODER_H264PROFILE_HIGH = 4, 39 PP_VIDEODECODER_H264PROFILE_HIGH = 4,
41 PP_VIDEODECODER_H264PROFILE_HIGH10PROFILE = 5, 40 PP_VIDEODECODER_H264PROFILE_HIGH10PROFILE = 5,
42 PP_VIDEODECODER_H264PROFILE_HIGH422PROFILE = 6, 41 PP_VIDEODECODER_H264PROFILE_HIGH422PROFILE = 6,
43 PP_VIDEODECODER_H264PROFILE_HIGH444PREDICTIVEPROFILE = 7, 42 PP_VIDEODECODER_H264PROFILE_HIGH444PREDICTIVEPROFILE = 7,
44 PP_VIDEODECODER_H264PROFILE_SCALABLEBASELINE = 8, 43 PP_VIDEODECODER_H264PROFILE_SCALABLEBASELINE = 8,
45 PP_VIDEODECODER_H264PROFILE_SCALABLEHIGH = 9, 44 PP_VIDEODECODER_H264PROFILE_SCALABLEHIGH = 9,
46 PP_VIDEODECODER_H264PROFILE_STEREOHIGH = 10, 45 PP_VIDEODECODER_H264PROFILE_STEREOHIGH = 10,
47 PP_VIDEODECODER_H264PROFILE_MULTIVIEWHIGH = 11, 46 PP_VIDEODECODER_H264PROFILE_MULTIVIEWHIGH = 11
48 PP_VIDEODECODER_PROFILE_MAX = PP_VIDEODECODER_H264PROFILE_MULTIVIEWHIGH
49 } PP_VideoDecoder_Profile; 47 } PP_VideoDecoder_Profile;
50 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoDecoder_Profile, 4); 48 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoDecoder_Profile, 4);
51 /** 49 /**
52 * @} 50 * @}
53 */ 51 */
54 52
55 /** 53 /**
56 * @addtogroup Structs 54 * @addtogroup Structs
57 * @{ 55 * @{
58 */ 56 */
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 */ 142 */
145 PP_VIDEODECODERERROR_PLATFORM_FAILURE = 4 143 PP_VIDEODECODERERROR_PLATFORM_FAILURE = 4
146 } PP_VideoDecodeError_Dev; 144 } PP_VideoDecodeError_Dev;
147 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoDecodeError_Dev, 4); 145 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoDecodeError_Dev, 4);
148 /** 146 /**
149 * @} 147 * @}
150 */ 148 */
151 149
152 #endif /* PPAPI_C_DEV_PP_VIDEO_DEV_H_ */ 150 #endif /* PPAPI_C_DEV_PP_VIDEO_DEV_H_ */
153 151
OLDNEW
« no previous file with comments | « ppapi/api/dev/pp_video_dev.idl ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698