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

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

Issue 6979017: Revert 86681 - Updated OMX decoder for recent PPAPI changes, and added to the build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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
Property Changes:
Added: svn:mergeinfo
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/gpu/omx_video_decode_accelerator.h" 5 #include "content/gpu/omx_video_decode_accelerator.h"
6 6
7 #include "content/common/gpu/gpu_channel.h" 7 #include "content/common/gpu/gpu_channel.h"
8 #include "content/common/gpu_messages.h" 8 #include "content/common/gpu_messages.h"
9 #include "content/gpu/gles2_texture_to_egl_image_translator.h" 9 #include "content/gpu/gles2_texture_to_egl_image_translator.h"
10 #include "media/base/bitstream_buffer.h" 10 #include "media/base/bitstream_buffer.h"
(...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 OMX_ERRORTYPE result = OMX_SendCommand(component_handle_, 880 OMX_ERRORTYPE result = OMX_SendCommand(component_handle_,
881 cmd, port_index, 0); 881 cmd, port_index, 0);
882 if (result != OMX_ErrorNone) { 882 if (result != OMX_ErrorNone) {
883 LOG(ERROR) << "SendCommand(OMX_CommandPortDisable) failed"; 883 LOG(ERROR) << "SendCommand(OMX_CommandPortDisable) failed";
884 StopOnError(); 884 StopOnError();
885 return; 885 return;
886 } 886 }
887 } 887 }
888 888
889 DISABLE_RUNNABLE_METHOD_REFCOUNT(OmxVideoDecodeAccelerator); 889 DISABLE_RUNNABLE_METHOD_REFCOUNT(OmxVideoDecodeAccelerator);
OLDNEW
« no previous file with comments | « content/gpu/omx_video_decode_accelerator.h ('k') | content/renderer/gpu_video_decode_accelerator_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698