| 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;
|
| }
|
|
|