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

Side by Side Diff: webkit/media/webvideoframe_impl.cc

Issue 9416087: Add texture target field to video frame (for use by native textures). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: (c) 2011 -> (c) 2012 Created 8 years, 10 months 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 | « webkit/media/webvideoframe_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "webkit/media/webvideoframe_impl.h" 5 #include "webkit/media/webvideoframe_impl.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/base/video_frame.h" 8 #include "media/base/video_frame.h"
9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h" 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
10 10
11 using WebKit::WebVideoFrame; 11 using WebKit::WebVideoFrame;
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 return NULL; 101 return NULL;
102 return static_cast<const void*>(video_frame_->data(plane)); 102 return static_cast<const void*>(video_frame_->data(plane));
103 } 103 }
104 104
105 unsigned WebVideoFrameImpl::textureId() const { 105 unsigned WebVideoFrameImpl::textureId() const {
106 if (!video_frame_.get() || format() != FormatNativeTexture) 106 if (!video_frame_.get() || format() != FormatNativeTexture)
107 return 0; 107 return 0;
108 return video_frame_->texture_id(); 108 return video_frame_->texture_id();
109 } 109 }
110 110
111 unsigned WebVideoFrameImpl::textureTarget() const {
112 if (!video_frame_.get() || format() != FormatNativeTexture)
113 return 0;
114 return video_frame_->texture_target();
115 }
116
111 } // namespace webkit_media 117 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/webvideoframe_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698