diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 21:47:17 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 21:47:17 +0000 |
| commit | 3bb08606c22e357896714764731a7af21e04377d (patch) | |
| tree | 9d459e951749c408fad9e490d547d2da352c20cb /webkit/glue/webvideoframe_impl.cc | |
| parent | e570464a01253a25520171f967fa3e7a97c70cb6 (diff) | |
| download | chromium_src-3bb08606c22e357896714764731a7af21e04377d.zip chromium_src-3bb08606c22e357896714764731a7af21e04377d.tar.gz chromium_src-3bb08606c22e357896714764731a7af21e04377d.tar.bz2 | |
Make FakeGlVideoDecodeEngine works in the hardware video decoding architecture
Add Preroll IPC message for finishing the initialiation of FakeGlVideoDecodeEngine.
Also defined methods in WebVideoFrameImpl to access video frame textures.
This change depend on a WebKit change to succesfully display the textures.
BUG=53714
TEST=Tree is green. This still needs WebKit changes to work.
Review URL: http://codereview.chromium.org/3472016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webvideoframe_impl.cc')
| -rw-r--r-- | webkit/glue/webvideoframe_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webvideoframe_impl.cc b/webkit/glue/webvideoframe_impl.cc index f50eded..4d1cd72 100644 --- a/webkit/glue/webvideoframe_impl.cc +++ b/webkit/glue/webvideoframe_impl.cc @@ -90,7 +90,7 @@ const void* WebVideoFrameImpl::data(unsigned plane) const { unsigned WebVideoFrameImpl::texture(unsigned plane) const { if (video_frame_.get()) return video_frame_->gl_texture(plane); - return NULL; + return 0; } } // namespace webkit_glue |