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

Side by Side Diff: media/filters/omx_video_decoder.cc

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/filters/omx_video_decoder.h ('k') | media/media.gyp » ('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 #include "media/filters/omx_video_decoder.h" 5 #include "media/filters/omx_video_decoder.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "media/base/callback.h" 10 #include "media/base/callback.h"
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 if (buffer.get()) 246 if (buffer.get())
247 pts_stream_.EnqueuePts(buffer.get()); 247 pts_stream_.EnqueuePts(buffer.get());
248 decode_engine_->ConsumeVideoSample(buffer); 248 decode_engine_->ConsumeVideoSample(buffer);
249 } 249 }
250 250
251 } // namespace media 251 } // namespace media
252 252
253 // Disable refcounting for the decode engine because it only lives on the 253 // Disable refcounting for the decode engine because it only lives on the
254 // video decoder thread. 254 // video decoder thread.
255 DISABLE_RUNNABLE_METHOD_REFCOUNT(media::VideoDecodeEngine); 255 DISABLE_RUNNABLE_METHOD_REFCOUNT(media::VideoDecodeEngine);
OLDNEW
« no previous file with comments | « media/filters/omx_video_decoder.h ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698