content/gpu/omx_video_decode_accelerator.h - Issue 6979017: Revert 86681 - Updated OMX decoder for recent PPAPI changes, and added to the build.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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, 7 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

OLD	NEW
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 #ifndef CONTENT_GPU_OMX_VIDEO_DECODE_ACCELERATOR_H_	5 #ifndef CONTENT_GPU_OMX_VIDEO_DECODE_ACCELERATOR_H_

6 #define CONTENT_GPU_OMX_VIDEO_DECODE_ACCELERATOR_H_	6 #define CONTENT_GPU_OMX_VIDEO_DECODE_ACCELERATOR_H_

7	7

8 #include <dlfcn.h>	8 #include <dlfcn.h>

9 #include <map>	9 #include <map>

10 #include <queue>	10 #include <queue>

(...skipping 145 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
156 OMX_PTR event_data);	156 OMX_PTR event_data);

157 static OMX_ERRORTYPE EmptyBufferCallback(OMX_HANDLETYPE component,	157 static OMX_ERRORTYPE EmptyBufferCallback(OMX_HANDLETYPE component,

158 OMX_PTR priv_data,	158 OMX_PTR priv_data,

159 OMX_BUFFERHEADERTYPE* buffer);	159 OMX_BUFFERHEADERTYPE* buffer);

160 static OMX_ERRORTYPE FillBufferCallback(OMX_HANDLETYPE component,	160 static OMX_ERRORTYPE FillBufferCallback(OMX_HANDLETYPE component,

161 OMX_PTR priv_data,	161 OMX_PTR priv_data,

162 OMX_BUFFERHEADERTYPE* buffer);	162 OMX_BUFFERHEADERTYPE* buffer);

163 };	163 };

164	164

165 #endif // CONTENT_GPU_OMX_VIDEO_DECODE_ACCELERATOR_H_	165 #endif // CONTENT_GPU_OMX_VIDEO_DECODE_ACCELERATOR_H_

OLD	NEW

« no previous file with comments | « content/gpu/gles2_texture_to_egl_image_translator.cc ('k') | content/gpu/omx_video_decode_accelerator.cc » ('j') | no next file with comments »