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

Unified Diff: media/base/video_frame.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/video_frame.h ('k') | media/filters/gpu_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/video_frame.cc
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index 294edb5c7dc5a42571914ce5e2ad4ba881231cb0..fc977364417280706f5dadd95ad58d47b299408e 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -61,6 +61,7 @@ bool VideoFrame::IsValidConfig(
// static
scoped_refptr<VideoFrame> VideoFrame::WrapNativeTexture(
uint32 texture_id,
+ uint32 texture_target,
size_t width,
size_t height,
base::TimeDelta timestamp,
@@ -69,6 +70,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapNativeTexture(
scoped_refptr<VideoFrame> frame(
new VideoFrame(NATIVE_TEXTURE, width, height, timestamp, duration));
frame->texture_id_ = texture_id;
+ frame->texture_target_ = texture_target;
frame->texture_no_longer_needed_ = no_longer_needed;
return frame;
}
@@ -150,7 +152,8 @@ VideoFrame::VideoFrame(VideoFrame::Format format,
: format_(format),
width_(width),
height_(height),
- texture_id_(0) {
+ texture_id_(0),
+ texture_target_(0) {
SetTimestamp(timestamp);
SetDuration(duration);
memset(&strides_, 0, sizeof(strides_));
@@ -260,6 +263,11 @@ uint32 VideoFrame::texture_id() const {
return texture_id_;
}
+uint32 VideoFrame::texture_target() const {
+ DCHECK_EQ(format_, NATIVE_TEXTURE);
+ return texture_target_;
+}
+
bool VideoFrame::IsEndOfStream() const {
return format_ == VideoFrame::EMPTY;
}
« no previous file with comments | « media/base/video_frame.h ('k') | media/filters/gpu_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698