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

Side by Side Diff: media/video/omx_video_decode_engine.h

Issue 7065060: Revert 87790 - Removing defunct OpenMAX code. (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
« no previous file with comments | « media/tools/player_x11/player_x11.cc ('k') | media/video/omx_video_decode_engine.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef MEDIA_VIDEO_OMX_VIDEO_DECODE_ENGINE_H_ 5 #ifndef MEDIA_VIDEO_OMX_VIDEO_DECODE_ENGINE_H_
6 #define MEDIA_VIDEO_OMX_VIDEO_DECODE_ENGINE_H_ 6 #define MEDIA_VIDEO_OMX_VIDEO_DECODE_ENGINE_H_
7 7
8 #include <queue> 8 #include <queue>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 bool need_setup_output_port_; 237 bool need_setup_output_port_;
238 OmxIlPortState output_port_state_; 238 OmxIlPortState output_port_state_;
239 VideoDecodeEngine::EventHandler* event_handler_; 239 VideoDecodeEngine::EventHandler* event_handler_;
240 240
241 DISALLOW_COPY_AND_ASSIGN(OmxVideoDecodeEngine); 241 DISALLOW_COPY_AND_ASSIGN(OmxVideoDecodeEngine);
242 }; 242 };
243 243
244 } // namespace media 244 } // namespace media
245 245
246 #endif // MEDIA_VIDEO_OMX_VIDEO_DECODE_ENGINE_H_ 246 #endif // MEDIA_VIDEO_OMX_VIDEO_DECODE_ENGINE_H_
OLDNEW
« no previous file with comments | « media/tools/player_x11/player_x11.cc ('k') | media/video/omx_video_decode_engine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698