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

Side by Side Diff: content/common/gpu/media/omx_video_decode_accelerator.cc

Issue 7342047: Cleanup base/stl_util (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed unneeded include + rebase Created 9 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/gpu/media/omx_video_decode_accelerator.h" 5 #include "content/common/gpu/media/omx_video_decode_accelerator.h"
6 6
7 #include "base/stl_util-inl.h" 7 #include "base/stl_util.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "content/common/gpu/gpu_channel.h" 9 #include "content/common/gpu/gpu_channel.h"
10 #include "content/common/gpu/media/gles2_texture_to_egl_image_translator.h" 10 #include "content/common/gpu/media/gles2_texture_to_egl_image_translator.h"
11 #include "media/base/bitstream_buffer.h" 11 #include "media/base/bitstream_buffer.h"
12 #include "media/video/picture.h" 12 #include "media/video/picture.h"
13 13
14 // Helper typedef for input buffers. This is used as the pAppPrivate field of 14 // Helper typedef for input buffers. This is used as the pAppPrivate field of
15 // OMX_BUFFERHEADERTYPEs of input buffers, to point to the data associated with 15 // OMX_BUFFERHEADERTYPEs of input buffers, to point to the data associated with
16 // them. 16 // them.
17 typedef std::pair<scoped_ptr<base::SharedMemory>, int32> SharedMemoryAndId; 17 typedef std::pair<scoped_ptr<base::SharedMemory>, int32> SharedMemoryAndId;
(...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after
982 982
983 bool OmxVideoDecodeAccelerator::SendCommandToPort( 983 bool OmxVideoDecodeAccelerator::SendCommandToPort(
984 OMX_COMMANDTYPE cmd, int port_index) { 984 OMX_COMMANDTYPE cmd, int port_index) {
985 DCHECK_EQ(message_loop_, MessageLoop::current()); 985 DCHECK_EQ(message_loop_, MessageLoop::current());
986 OMX_ERRORTYPE result = OMX_SendCommand(component_handle_, 986 OMX_ERRORTYPE result = OMX_SendCommand(component_handle_,
987 cmd, port_index, 0); 987 cmd, port_index, 0);
988 RETURN_ON_OMX_FAILURE(result, "SendCommand() failed" << cmd, 988 RETURN_ON_OMX_FAILURE(result, "SendCommand() failed" << cmd,
989 VIDEODECODERERROR_INVALIDINPUT, false); 989 VIDEODECODERERROR_INVALIDINPUT, false);
990 return true; 990 return true;
991 } 991 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698