diff options
| author | lionel.g.landwerlin <lionel.g.landwerlin@intel.com> | 2015-07-15 07:53:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-15 14:53:52 +0000 |
| commit | c48e99636b7b70f4a7446e8d8f6f84f8ef60dbdb (patch) | |
| tree | 7c152e5499b3bfb58f8e7bfee954777c10574288 /ppapi | |
| parent | edefec8e457e96dcfa7251f7fadfa24605f8a9fb (diff) | |
| download | chromium_src-c48e99636b7b70f4a7446e8d8f6f84f8ef60dbdb.zip chromium_src-c48e99636b7b70f4a7446e8d8f6f84f8ef60dbdb.tar.gz chromium_src-c48e99636b7b70f4a7446e8d8f6f84f8ef60dbdb.tar.bz2 | |
ppapi: Stabilize PPB_VideoEncoder 0.2
BUG=510432
Review URL: https://codereview.chromium.org/1235163009
Cr-Commit-Position: refs/heads/master@{#338857}
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/api/ppb_video_encoder.idl | 2 | ||||
| -rw-r--r-- | ppapi/c/ppb_video_encoder.h | 10 | ||||
| -rw-r--r-- | ppapi/thunk/interfaces_ppb_public_dev_channel.h | 1 | ||||
| -rw-r--r-- | ppapi/thunk/interfaces_ppb_public_stable.h | 1 |
4 files changed, 9 insertions, 5 deletions
diff --git a/ppapi/api/ppb_video_encoder.idl b/ppapi/api/ppb_video_encoder.idl index 68a7f6d..de96b69 100644 --- a/ppapi/api/ppb_video_encoder.idl +++ b/ppapi/api/ppb_video_encoder.idl @@ -11,7 +11,7 @@ label Chrome { [channel=dev] M42 = 0.1, - [channel=dev] M44 = 0.2 + M44 = 0.2 }; /** diff --git a/ppapi/c/ppb_video_encoder.h b/ppapi/c/ppb_video_encoder.h index 0b3ceb0..6c28a4c 100644 --- a/ppapi/c/ppb_video_encoder.h +++ b/ppapi/c/ppb_video_encoder.h @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -/* From ppb_video_encoder.idl modified Tue May 5 23:37:20 2015. */ +/* From ppb_video_encoder.idl modified Wed Jul 15 11:34:20 2015. */ #ifndef PPAPI_C_PPB_VIDEO_ENCODER_H_ #define PPAPI_C_PPB_VIDEO_ENCODER_H_ @@ -20,7 +20,9 @@ #include "ppapi/c/ppb_video_frame.h" #define PPB_VIDEOENCODER_INTERFACE_0_1 "PPB_VideoEncoder;0.1" /* dev */ -#define PPB_VIDEOENCODER_INTERFACE_0_2 "PPB_VideoEncoder;0.2" /* dev */ +#define PPB_VIDEOENCODER_INTERFACE_0_2 "PPB_VideoEncoder;0.2" +#define PPB_VIDEOENCODER_INTERFACE PPB_VIDEOENCODER_INTERFACE_0_2 + /** * @file * This file defines the <code>PPB_VideoEncoder</code> interface. @@ -54,7 +56,7 @@ * All: vp8 (software). * ChromeOS, depending on your device: h264 (hardware), vp8 (hardware) */ -struct PPB_VideoEncoder_0_2 { /* dev */ +struct PPB_VideoEncoder_0_2 { /** * Creates a new video encoder resource. * @@ -236,6 +238,8 @@ struct PPB_VideoEncoder_0_2 { /* dev */ void (*Close)(PP_Resource video_encoder); }; +typedef struct PPB_VideoEncoder_0_2 PPB_VideoEncoder; + struct PPB_VideoEncoder_0_1 { /* dev */ PP_Resource (*Create)(PP_Instance instance); PP_Bool (*IsVideoEncoder)(PP_Resource resource); diff --git a/ppapi/thunk/interfaces_ppb_public_dev_channel.h b/ppapi/thunk/interfaces_ppb_public_dev_channel.h index 5c5f30a..7e0f91c 100644 --- a/ppapi/thunk/interfaces_ppb_public_dev_channel.h +++ b/ppapi/thunk/interfaces_ppb_public_dev_channel.h @@ -13,7 +13,6 @@ PROXIED_IFACE(PPB_COMPOSITORLAYER_INTERFACE_0_1, PPB_CompositorLayer_0_1) PROXIED_IFACE(PPB_COMPOSITORLAYER_INTERFACE_0_2, PPB_CompositorLayer_0_2) PROXIED_IFACE(PPB_VIDEODECODER_INTERFACE_0_1, PPB_VideoDecoder_0_1) PROXIED_IFACE(PPB_VIDEOENCODER_INTERFACE_0_1, PPB_VideoEncoder_0_1) -PROXIED_IFACE(PPB_VIDEOENCODER_INTERFACE_0_2, PPB_VideoEncoder_0_2) // Note, PPB_TraceEvent is special. We don't want to actually make it stable, // but we want developers to be able to leverage it when running Chrome Dev or diff --git a/ppapi/thunk/interfaces_ppb_public_stable.h b/ppapi/thunk/interfaces_ppb_public_stable.h index 14cd8ed..ffabf6b 100644 --- a/ppapi/thunk/interfaces_ppb_public_stable.h +++ b/ppapi/thunk/interfaces_ppb_public_stable.h @@ -99,6 +99,7 @@ PROXIED_IFACE(PPB_VAR_ARRAY_INTERFACE_1_0, PPB_VarArray_1_0) PROXIED_IFACE(PPB_VAR_DICTIONARY_INTERFACE_1_0, PPB_VarDictionary_1_0) PROXIED_IFACE(PPB_VIDEODECODER_INTERFACE_1_0, PPB_VideoDecoder_1_0) PROXIED_IFACE(PPB_VIDEODECODER_INTERFACE_0_2, PPB_VideoDecoder_0_2) +PROXIED_IFACE(PPB_VIDEOENCODER_INTERFACE_0_2, PPB_VideoEncoder_0_2) PROXIED_IFACE(PPB_VIDEOFRAME_INTERFACE_0_1, PPB_VideoFrame_0_1) PROXIED_IFACE(PPB_WEBSOCKET_INTERFACE_1_0, PPB_WebSocket_1_0) |