summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorvmr@chromium.org <vmr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-03 19:33:39 +0000
committervmr@chromium.org <vmr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-03 19:33:39 +0000
commit8d2f82798c1798f9fd85c425b188944564852658 (patch)
tree4f9f43157edcec20bd50a35cf91f694a03157897 /webkit
parentb37dc5ab810852a3055addad6d6cd9cc45080ed1 (diff)
downloadchromium_src-8d2f82798c1798f9fd85c425b188944564852658.zip
chromium_src-8d2f82798c1798f9fd85c425b188944564852658.tar.gz
chromium_src-8d2f82798c1798f9fd85c425b188944564852658.tar.bz2
Implementation for Pepper C++ Video Decoder API (wrapper on top of C API).
BUG= TEST= Review URL: http://codereview.chromium.org/7085030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87831 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/ppb_video_decoder_impl.cc20
-rw-r--r--webkit/plugins/ppapi/ppb_video_decoder_impl.h11
2 files changed, 16 insertions, 15 deletions
diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
index cb9acb4..6448192 100644
--- a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
+++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
@@ -27,7 +27,7 @@ namespace ppapi {
namespace {
PP_Bool GetConfigs(PP_Instance instance_id,
- PP_VideoConfigElement* proto_config,
+ const PP_VideoConfigElement* proto_config,
PP_VideoConfigElement* matching_configs,
uint32_t matching_configs_size,
uint32_t* num_of_matching_configs) {
@@ -45,7 +45,7 @@ PP_Bool GetConfigs(PP_Instance instance_id,
}
PP_Resource Create(PP_Instance instance_id,
- PP_VideoConfigElement* decoder_config,
+ const PP_VideoConfigElement* decoder_config,
PP_CompletionCallback callback) {
PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
if (!instance)
@@ -67,7 +67,7 @@ PP_Bool IsVideoDecoder(PP_Resource resource) {
}
PP_Bool Decode(PP_Resource decoder_id,
- PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
+ const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
PP_CompletionCallback callback) {
scoped_refptr<PPB_VideoDecoder_Impl> decoder(
Resource::GetAs<PPB_VideoDecoder_Impl>(decoder_id));
@@ -79,7 +79,7 @@ PP_Bool Decode(PP_Resource decoder_id,
void AssignGLESBuffers(PP_Resource video_decoder,
uint32_t no_of_buffers,
- PP_GLESBuffer_Dev* buffers) {
+ const PP_GLESBuffer_Dev* buffers) {
scoped_refptr<PPB_VideoDecoder_Impl> decoder(
Resource::GetAs<PPB_VideoDecoder_Impl>(video_decoder));
if (!decoder)
@@ -90,7 +90,7 @@ void AssignGLESBuffers(PP_Resource video_decoder,
void AssignSysmemBuffers(PP_Resource video_decoder,
uint32_t no_of_buffers,
- PP_SysmemBuffer_Dev* buffers) {
+ const PP_SysmemBuffer_Dev* buffers) {
scoped_refptr<PPB_VideoDecoder_Impl> decoder(
Resource::GetAs<PPB_VideoDecoder_Impl>(video_decoder));
if (!decoder)
@@ -192,7 +192,7 @@ PPB_VideoDecoder_Impl* PPB_VideoDecoder_Impl::AsPPB_VideoDecoder_Impl() {
}
bool PPB_VideoDecoder_Impl::GetConfigs(
- PP_VideoConfigElement* requested_configs,
+ const PP_VideoConfigElement* requested_configs,
PP_VideoConfigElement* matching_configs,
uint32_t matching_configs_size,
uint32_t* num_of_matching_configs) {
@@ -216,7 +216,7 @@ bool PPB_VideoDecoder_Impl::GetConfigs(
return true;
}
-bool PPB_VideoDecoder_Impl::Init(PP_VideoConfigElement* decoder_config,
+bool PPB_VideoDecoder_Impl::Init(const PP_VideoConfigElement* decoder_config,
PP_CompletionCallback callback) {
if (!instance())
return false;
@@ -235,7 +235,7 @@ bool PPB_VideoDecoder_Impl::Init(PP_VideoConfigElement* decoder_config,
}
bool PPB_VideoDecoder_Impl::Decode(
- PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
+ const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
PP_CompletionCallback callback) {
if (!platform_video_decoder_.get())
return false;
@@ -259,7 +259,7 @@ bool PPB_VideoDecoder_Impl::Decode(
void PPB_VideoDecoder_Impl::AssignGLESBuffers(
uint32_t no_of_buffers,
- PP_GLESBuffer_Dev* buffers) {
+ const PP_GLESBuffer_Dev* buffers) {
if (!platform_video_decoder_.get())
return;
@@ -274,7 +274,7 @@ void PPB_VideoDecoder_Impl::AssignGLESBuffers(
void PPB_VideoDecoder_Impl::AssignSysmemBuffers(
uint32_t no_of_buffers,
- PP_SysmemBuffer_Dev* buffers) {
+ const PP_SysmemBuffer_Dev* buffers) {
if (!platform_video_decoder_.get())
return;
diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.h b/webkit/plugins/ppapi/ppb_video_decoder_impl.h
index 3bc2690..9e4b176 100644
--- a/webkit/plugins/ppapi/ppb_video_decoder_impl.h
+++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.h
@@ -42,17 +42,18 @@ class PPB_VideoDecoder_Impl : public Resource,
virtual PPB_VideoDecoder_Impl* AsPPB_VideoDecoder_Impl();
// PPB_VideoDecoder implementation.
- bool GetConfigs(PP_VideoConfigElement* requested_configs,
+ bool GetConfigs(const PP_VideoConfigElement* requested_configs,
PP_VideoConfigElement* matching_configs,
uint32_t matching_configs_size,
uint32_t* num_of_matching_configs);
- bool Init(PP_VideoConfigElement* dec_config, PP_CompletionCallback callback);
- bool Decode(PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
+ bool Init(const PP_VideoConfigElement* dec_config,
+ PP_CompletionCallback callback);
+ bool Decode(const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
PP_CompletionCallback callback);
void AssignGLESBuffers(uint32_t no_of_buffers,
- PP_GLESBuffer_Dev* buffers);
+ const PP_GLESBuffer_Dev* buffers);
void AssignSysmemBuffers(uint32_t no_of_buffers,
- PP_SysmemBuffer_Dev* buffers);
+ const PP_SysmemBuffer_Dev* buffers);
void ReusePictureBuffer(int32_t picture_buffer_id);
bool Flush(PP_CompletionCallback callback);
bool Abort(PP_CompletionCallback callback);