OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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> | 7 #include <deque> |
8 | 8 |
9 #include "base/task.h" | 9 #include "base/task.h" |
10 #include "media/base/callback.h" | 10 #include "media/base/callback.h" |
11 #include "media/base/filters.h" | 11 #include "media/base/filters.h" |
12 #include "media/base/filter_host.h" | 12 #include "media/base/filter_host.h" |
13 #include "media/base/limits.h" | 13 #include "media/base/limits.h" |
14 #include "media/base/media_format.h" | 14 #include "media/base/media_format.h" |
15 #include "media/base/video_frame.h" | 15 #include "media/base/video_frame.h" |
16 #include "media/ffmpeg/ffmpeg_common.h" | 16 #include "media/ffmpeg/ffmpeg_common.h" |
17 #include "media/ffmpeg/ffmpeg_util.h" | 17 #include "media/ffmpeg/ffmpeg_util.h" |
18 #include "media/filters/ffmpeg_interfaces.h" | 18 #include "media/filters/ffmpeg_interfaces.h" |
19 #include "media/video/ffmpeg_video_decode_engine.h" | 19 #include "media/video/ffmpeg_video_decode_engine.h" |
20 #include "media/video/video_decode_context.h" | 20 #include "media/video/video_decode_context.h" |
21 | 21 |
22 namespace media { | 22 namespace media { |
23 | 23 |
24 FFmpegVideoDecoder::FFmpegVideoDecoder(VideoDecodeContext* decode_context) | 24 FFmpegVideoDecoder::FFmpegVideoDecoder(MessageLoop* message_loop, |
25 : width_(0), | 25 VideoDecodeContext* decode_context) |
| 26 : message_loop_(message_loop), |
| 27 width_(0), |
26 height_(0), | 28 height_(0), |
27 time_base_(new AVRational()), | 29 time_base_(new AVRational()), |
28 state_(kUnInitialized), | 30 state_(kUnInitialized), |
29 decode_engine_(new FFmpegVideoDecodeEngine()), | 31 decode_engine_(new FFmpegVideoDecodeEngine()), |
30 decode_context_(decode_context) { | 32 decode_context_(decode_context) { |
31 memset(&info_, 0, sizeof(info_)); | 33 memset(&info_, 0, sizeof(info_)); |
32 } | 34 } |
33 | 35 |
34 FFmpegVideoDecoder::~FFmpegVideoDecoder() { | 36 FFmpegVideoDecoder::~FFmpegVideoDecoder() { |
35 } | 37 } |
(...skipping 403 matching lines...) Loading... |
439 else | 441 else |
440 VideoFrameReady(video_frame); | 442 VideoFrameReady(video_frame); |
441 } | 443 } |
442 } | 444 } |
443 | 445 |
444 void FFmpegVideoDecoder::SetVideoDecodeEngineForTest( | 446 void FFmpegVideoDecoder::SetVideoDecodeEngineForTest( |
445 VideoDecodeEngine* engine) { | 447 VideoDecodeEngine* engine) { |
446 decode_engine_.reset(engine); | 448 decode_engine_.reset(engine); |
447 } | 449 } |
448 | 450 |
| 451 MessageLoop* FFmpegVideoDecoder::message_loop() { |
| 452 return message_loop_; |
| 453 } |
| 454 |
449 } // namespace media | 455 } // namespace media |
OLD | NEW |