| Index: content/common/gpu/media/omx_video_decode_accelerator.cc
|
| diff --git a/content/common/gpu/media/omx_video_decode_accelerator.cc b/content/common/gpu/media/omx_video_decode_accelerator.cc
|
| index 5d05668f582a66481c49d023354d067eee853eef..d091c47d560c165021d494eaac06e9b2e6ba1e6f 100644
|
| --- a/content/common/gpu/media/omx_video_decode_accelerator.cc
|
| +++ b/content/common/gpu/media/omx_video_decode_accelerator.cc
|
| @@ -619,8 +619,6 @@ bool OmxVideoDecodeAccelerator::AllocateOutputBuffers() {
|
| DCHECK_EQ(message_loop_, MessageLoop::current());
|
|
|
| DCHECK(!pictures_.empty());
|
| - gfx::Size decoded_pixel_size(pictures_.begin()->second.gles_buffer.size());
|
| - gfx::Size visible_pixel_size(pictures_.begin()->second.gles_buffer.size());
|
| for (OutputPictureById::iterator it = pictures_.begin();
|
| it != pictures_.end(); ++it) {
|
| media::GLESBuffer& gles_buffer = it->second.gles_buffer;
|
| @@ -635,8 +633,7 @@ bool OmxVideoDecodeAccelerator::AllocateOutputBuffers() {
|
| // passing to PictureReady.
|
| int garbage_bitstream_buffer_id = -1;
|
| (*omx_buffer)->pAppPrivate =
|
| - new media::Picture(gles_buffer.id(), garbage_bitstream_buffer_id,
|
| - decoded_pixel_size, visible_pixel_size);
|
| + new media::Picture(gles_buffer.id(), garbage_bitstream_buffer_id);
|
| }
|
| return true;
|
| }
|
| @@ -698,8 +695,7 @@ void OmxVideoDecodeAccelerator::OnOutputPortDisabled() {
|
| if (client_) {
|
| client_->ProvidePictureBuffers(
|
| kNumPictureBuffers,
|
| - gfx::Size(vformat.nFrameWidth, vformat.nFrameHeight),
|
| - PICTUREBUFFER_MEMORYTYPE_GL_TEXTURE);
|
| + gfx::Size(vformat.nFrameWidth, vformat.nFrameHeight));
|
| }
|
| }
|
|
|
|
|