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

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: Pass through tex target from higher above (texture creation time) 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
Index: media/base/video_frame.cc
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index 7e7e60c1f3b56a66de39e702e16c499aa03547c7..e28fee48adda4eb70535dc56125c0c1406242407 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -49,6 +49,7 @@ scoped_refptr<VideoFrame> VideoFrame::CreateFrame(
// static
scoped_refptr<VideoFrame> VideoFrame::WrapNativeTexture(
uint32 texture_id,
+ uint32 texture_target,
size_t width,
size_t height,
base::TimeDelta timestamp,
@@ -57,6 +58,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;
}
@@ -138,7 +140,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_));
@@ -248,6 +251,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;
}

Powered by Google App Engine
This is Rietveld 408576698