chromium/src
0
Fork 0
Code Activity

Promote PPB_VideoDecoder 1.1 to Stable

Browse Source 
Works just fine in ARC.

BUG=520323

Review URL: https://codereview.chromium.org/1369203003

Cr-Commit-Position: refs/heads/master@{#355667}
This commit is contained in:
lpique
2015-10-22 16:20:42 -07:00
committed by Commit bot
parent 2c9d4a474b
commit 636e3cf3cc
5 changed files with 9 additions and 18 deletions

9
content/renderer/pepper/pepper_video_decoder_host.cc

@ -137,15 +137,6 @@ int32_t PepperVideoDecoderHost::OnHostMsgInitialize(
profile_ = PepperToMediaVideoProfile(profile);
software_fallback_allowed_ = (acceleration != PP_HARDWAREACCELERATION_ONLY);
// Check for Dev API use
// TODO(lpique): remove check when PPB_VideoDecoder_1_1 reaches beta/stable.
// https://crbug.com/520323
if (min_picture_count != 0) {
ContentRendererClient* client = GetContentClient()->renderer();
bool allowed = client->IsPluginAllowedToUseDevChannelAPIs();
if (!allowed)
return PP_ERROR_NOTSUPPORTED;
}
min_picture_count_ = min_picture_count;
if (acceleration != PP_HARDWAREACCELERATION_NONE) {

2
ppapi/api/ppb_video_decoder.idl

@ -14,7 +14,7 @@ label Chrome {
M36 = 0.1,
M39 = 0.2,
M40 = 1.0,
[channel=dev] M46 = 1.1
M46 = 1.1
};
/**

12
ppapi/c/ppb_video_decoder.h

@ -3,7 +3,7 @@
* found in the LICENSE file.
*/
/* From ppb_video_decoder.idl modified Thu Aug 6 14:15:48 2015. */
/* From ppb_video_decoder.idl modified Mon Sep 28 15:23:30 2015. */
#ifndef PPAPI_C_PPB_VIDEO_DECODER_H_
#define PPAPI_C_PPB_VIDEO_DECODER_H_
@ -22,8 +22,8 @@
#define PPB_VIDEODECODER_INTERFACE_0_1 "PPB_VideoDecoder;0.1"
#define PPB_VIDEODECODER_INTERFACE_0_2 "PPB_VideoDecoder;0.2"
#define PPB_VIDEODECODER_INTERFACE_1_0 "PPB_VideoDecoder;1.0"
#define PPB_VIDEODECODER_INTERFACE_1_1 "PPB_VideoDecoder;1.1" /* dev */
#define PPB_VIDEODECODER_INTERFACE PPB_VIDEODECODER_INTERFACE_1_0
#define PPB_VIDEODECODER_INTERFACE_1_1 "PPB_VideoDecoder;1.1"
#define PPB_VIDEODECODER_INTERFACE PPB_VIDEODECODER_INTERFACE_1_1
/**
* @file
@ -58,7 +58,7 @@
* Chrome and ChromeOS: aac, h264.
* ChromeOS: mpeg4.
*/
struct PPB_VideoDecoder_1_1 { /* dev */
struct PPB_VideoDecoder_1_1 {
/**
* Creates a new video decoder resource.
*
@ -230,6 +230,8 @@ struct PPB_VideoDecoder_1_1 { /* dev */
struct PP_CompletionCallback callback);
};
typedef struct PPB_VideoDecoder_1_1 PPB_VideoDecoder;
struct PPB_VideoDecoder_0_1 {
PP_Resource (*Create)(PP_Instance instance);
PP_Bool (*IsVideoDecoder)(PP_Resource resource);
@ -301,8 +303,6 @@ struct PPB_VideoDecoder_1_0 {
int32_t (*Reset)(PP_Resource video_decoder,
struct PP_CompletionCallback callback);
};
typedef struct PPB_VideoDecoder_1_0 PPB_VideoDecoder;
/**
* @}
*/

1
ppapi/thunk/interfaces_ppb_public_dev_channel.h

@ -13,7 +13,6 @@ PROXIED_IFACE(PPB_COMPOSITOR_INTERFACE_0_1, PPB_Compositor_0_1)
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_VIDEODECODER_INTERFACE_1_1, PPB_VideoDecoder_1_1)
PROXIED_IFACE(PPB_VIDEOENCODER_INTERFACE_0_1, PPB_VideoEncoder_0_1)
// Note, PPB_TraceEvent is special. We don't want to actually make it stable,

3
ppapi/thunk/interfaces_ppb_public_stable.h

@ -97,8 +97,9 @@ PROXIED_IFACE(PPB_URLREQUESTINFO_INTERFACE_1_0, PPB_URLRequestInfo_1_0)
PROXIED_IFACE(PPB_URLRESPONSEINFO_INTERFACE_1_0, PPB_URLResponseInfo_1_0)
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_VIDEODECODER_INTERFACE_1_0, PPB_VideoDecoder_1_0)
PROXIED_IFACE(PPB_VIDEODECODER_INTERFACE_1_1, PPB_VideoDecoder_1_1)
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)