diff options
Diffstat (limited to 'media/base/video_frame.cc')
| -rw-r--r-- | media/base/video_frame.cc | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc index 6d6b7f4..9a53090 100644 --- a/media/base/video_frame.cc +++ b/media/base/video_frame.cc @@ -106,15 +106,11 @@ void VideoFrame::CreateFrameGlTexture(Format format, size_t width, size_t height, GlTexture const textures[kMaxPlanes], - base::TimeDelta timestamp, - base::TimeDelta duration, scoped_refptr<VideoFrame>* frame_out) { DCHECK(frame_out); scoped_refptr<VideoFrame> frame = new VideoFrame(TYPE_GL_TEXTURE, format, width, height); if (frame) { - frame->SetTimestamp(timestamp); - frame->SetDuration(duration); frame->external_memory_ = true; frame->planes_ = GetNumberOfPlanes(format); for (size_t i = 0; i < kMaxPlanes; ++i) { @@ -125,29 +121,6 @@ void VideoFrame::CreateFrameGlTexture(Format format, } // static -void VideoFrame::CreateFrameD3dTexture(Format format, - size_t width, - size_t height, - D3dTexture const textures[kMaxPlanes], - base::TimeDelta timestamp, - base::TimeDelta duration, - scoped_refptr<VideoFrame>* frame_out) { - DCHECK(frame_out); - scoped_refptr<VideoFrame> frame = - new VideoFrame(TYPE_D3D_TEXTURE, format, width, height); - if (frame) { - frame->SetTimestamp(timestamp); - frame->SetDuration(duration); - frame->external_memory_ = true; - frame->planes_ = GetNumberOfPlanes(format); - for (size_t i = 0; i < kMaxPlanes; ++i) { - frame->d3d_textures_[i] = textures[i]; - } - } - *frame_out = frame; -} - -// static void VideoFrame::CreateEmptyFrame(scoped_refptr<VideoFrame>* frame_out) { *frame_out = new VideoFrame(VideoFrame::TYPE_SYSTEM_MEMORY, VideoFrame::EMPTY, 0, 0); @@ -260,7 +233,6 @@ VideoFrame::VideoFrame(VideoFrame::SurfaceType type, memset(&strides_, 0, sizeof(strides_)); memset(&data_, 0, sizeof(data_)); memset(&gl_textures_, 0, sizeof(gl_textures_)); - memset(&d3d_textures_, 0, sizeof(d3d_textures_)); external_memory_ = false; private_buffer_ = NULL; } |