| Index: media/base/video_frame.cc
|
| diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
|
| index 66bbe38d5f5492bc55545252b5c6ad44f4637ae9..bc5e8e779a7052afab5503dbe7e02d00a87a6682 100644
|
| --- a/media/base/video_frame.cc
|
| +++ b/media/base/video_frame.cc
|
| @@ -188,27 +188,6 @@ scoped_refptr<VideoFrame> VideoFrame::WrapNativeTextures(
|
| }
|
|
|
| // static
|
| -scoped_refptr<VideoFrame> VideoFrame::WrapGpuMemoryBufferBackedNativeTextures(
|
| - VideoPixelFormat format,
|
| - const gpu::MailboxHolder (&mailbox_holders)[kMaxPlanes],
|
| - const gfx::GpuMemoryBufferId (&gpu_memory_buffer_ids)[kMaxPlanes],
|
| - const ReleaseMailboxCB& mailbox_holder_release_cb,
|
| - const gfx::Size& coded_size,
|
| - const gfx::Rect& visible_rect,
|
| - const gfx::Size& natural_size,
|
| - base::TimeDelta timestamp) {
|
| - scoped_refptr<VideoFrame> frame =
|
| - WrapNativeTextures(format, mailbox_holders, mailbox_holder_release_cb,
|
| - coded_size, visible_rect, natural_size, timestamp);
|
| - if (frame) {
|
| - frame->storage_type_ = STORAGE_GPU_MEMORY_BUFFERS;
|
| - for (size_t i = 0; i < kMaxPlanes; ++i)
|
| - frame->texture_gpu_memory_buffer_ids_[i] = gpu_memory_buffer_ids[i];
|
| - }
|
| - return frame;
|
| -}
|
| -
|
| -// static
|
| scoped_refptr<VideoFrame> VideoFrame::WrapExternalData(
|
| VideoPixelFormat format,
|
| const gfx::Size& coded_size,
|
| @@ -686,13 +665,6 @@ VideoFrame::mailbox_holder(size_t texture_index) const {
|
| return mailbox_holders_[texture_index];
|
| }
|
|
|
| -const gfx::GpuMemoryBufferId& VideoFrame::texture_gpu_memory_buffer_id(
|
| - size_t texture_index) const {
|
| - DCHECK(HasTextures());
|
| - DCHECK(IsValidPlane(texture_index, format_));
|
| - return texture_gpu_memory_buffer_ids_[texture_index];
|
| -}
|
| -
|
| base::SharedMemoryHandle VideoFrame::shared_memory_handle() const {
|
| DCHECK_EQ(storage_type_, STORAGE_SHMEM);
|
| DCHECK(shared_memory_handle_ != base::SharedMemory::NULLHandle());
|
|
|