| 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/omx_video_decoder.h" | 5 #include "media/filters/omx_video_decoder.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "media/base/callback.h" | 9 #include "media/base/callback.h" |
| 10 #include "media/base/filter_host.h" | 10 #include "media/base/filter_host.h" |
| 11 #include "media/base/limits.h" | 11 #include "media/base/limits.h" |
| 12 #include "media/ffmpeg/ffmpeg_common.h" | |
| 13 #include "media/filters/ffmpeg_interfaces.h" | 12 #include "media/filters/ffmpeg_interfaces.h" |
| 14 #include "media/video/omx_video_decode_engine.h" | 13 #include "media/video/omx_video_decode_engine.h" |
| 15 | 14 |
| 16 namespace media { | 15 namespace media { |
| 17 | 16 |
| 18 OmxVideoDecoder::OmxVideoDecoder( | 17 OmxVideoDecoder::OmxVideoDecoder( |
| 19 VideoDecodeContext* context) | 18 VideoDecodeContext* context) |
| 20 : decode_engine_(new OmxVideoDecodeEngine()), | 19 : decode_engine_(new OmxVideoDecodeEngine()), |
| 21 decode_context_(context), | 20 decode_context_(context), |
| 22 width_(0), height_(0) { | 21 width_(0), height_(0) { |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 FROM_HERE, | 227 FROM_HERE, |
| 229 NewRunnableMethod(decode_engine_.get(), | 228 NewRunnableMethod(decode_engine_.get(), |
| 230 &VideoDecodeEngine::ConsumeVideoSample, ref_buffer)); | 229 &VideoDecodeEngine::ConsumeVideoSample, ref_buffer)); |
| 231 } | 230 } |
| 232 | 231 |
| 233 } // namespace media | 232 } // namespace media |
| 234 | 233 |
| 235 // Disable refcounting for the decode engine because it only lives on the | 234 // Disable refcounting for the decode engine because it only lives on the |
| 236 // video decoder thread. | 235 // video decoder thread. |
| 237 DISABLE_RUNNABLE_METHOD_REFCOUNT(media::VideoDecodeEngine); | 236 DISABLE_RUNNABLE_METHOD_REFCOUNT(media::VideoDecodeEngine); |
| OLD | NEW |