| OLD | NEW |
| 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 Loading... |
| 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 |
| OLD | NEW |