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

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

Issue 8418017: Miscellaneous header file cleanup for src/media. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add at_exit Created 9 years, 1 month 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/ffmpeg_video_decoder.h ('k') | media/test/ffmpeg_tests/ffmpeg_tests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/ffmpeg_video_decoder.h" 5 #include "media/filters/ffmpeg_video_decoder.h"
6 6
7 #include <deque>
8
9 #include "base/bind.h" 7 #include "base/bind.h"
10 #include "base/callback.h" 8 #include "base/callback.h"
11 #include "base/message_loop.h" 9 #include "base/message_loop.h"
12 #include "base/task.h" 10 #include "base/task.h"
13 #include "media/base/demuxer_stream.h" 11 #include "media/base/demuxer_stream.h"
14 #include "media/base/filters.h"
15 #include "media/base/filter_host.h" 12 #include "media/base/filter_host.h"
16 #include "media/base/limits.h" 13 #include "media/base/limits.h"
17 #include "media/base/video_frame.h" 14 #include "media/base/video_frame.h"
18 #include "media/ffmpeg/ffmpeg_common.h" 15 #include "media/ffmpeg/ffmpeg_common.h"
19 #include "media/video/ffmpeg_video_decode_engine.h" 16 #include "media/video/ffmpeg_video_decode_engine.h"
20 #include "media/video/video_decode_context.h" 17 #include "media/video/video_decode_context.h"
21 #include "ui/gfx/rect.h"
22 18
23 namespace media { 19 namespace media {
24 20
25 FFmpegVideoDecoder::FFmpegVideoDecoder(MessageLoop* message_loop, 21 FFmpegVideoDecoder::FFmpegVideoDecoder(MessageLoop* message_loop,
26 VideoDecodeContext* decode_context) 22 VideoDecodeContext* decode_context)
27 : message_loop_(message_loop), 23 : message_loop_(message_loop),
28 state_(kUnInitialized), 24 state_(kUnInitialized),
29 decode_engine_(new FFmpegVideoDecodeEngine()), 25 decode_engine_(new FFmpegVideoDecodeEngine()),
30 decode_context_(decode_context) { 26 decode_context_(decode_context) {
31 } 27 }
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 decode_engine_->ProduceVideoFrame(video_frame); 314 decode_engine_->ProduceVideoFrame(video_frame);
319 } 315 }
320 } 316 }
321 317
322 void FFmpegVideoDecoder::SetVideoDecodeEngineForTest( 318 void FFmpegVideoDecoder::SetVideoDecodeEngineForTest(
323 VideoDecodeEngine* engine) { 319 VideoDecodeEngine* engine) {
324 decode_engine_.reset(engine); 320 decode_engine_.reset(engine);
325 } 321 }
326 322
327 } // namespace media 323 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_video_decoder.h ('k') | media/test/ffmpeg_tests/ffmpeg_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698