| OLD | NEW |
| 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> | 7 #include <deque> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/task.h" | 10 #include "base/task.h" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 width, height, | 76 width, height, |
| 77 av_stream->r_frame_rate.num, | 77 av_stream->r_frame_rate.num, |
| 78 av_stream->r_frame_rate.den, | 78 av_stream->r_frame_rate.den, |
| 79 av_stream->codec->extradata, | 79 av_stream->codec->extradata, |
| 80 av_stream->codec->extradata_size); | 80 av_stream->codec->extradata_size); |
| 81 state_ = kInitializing; | 81 state_ = kInitializing; |
| 82 decode_engine_->Initialize(message_loop_, this, NULL, config); | 82 decode_engine_->Initialize(message_loop_, this, NULL, config); |
| 83 } | 83 } |
| 84 | 84 |
| 85 void FFmpegVideoDecoder::OnInitializeComplete(const VideoCodecInfo& info) { | 85 void FFmpegVideoDecoder::OnInitializeComplete(const VideoCodecInfo& info) { |
| 86 // TODO(scherkus): Dedup this from OmxVideoDecoder::OnInitializeComplete. | |
| 87 DCHECK_EQ(MessageLoop::current(), message_loop_); | 86 DCHECK_EQ(MessageLoop::current(), message_loop_); |
| 88 DCHECK(initialize_callback_.get()); | 87 DCHECK(initialize_callback_.get()); |
| 89 | 88 |
| 90 info_ = info; | 89 info_ = info; |
| 91 AutoCallbackRunner done_runner(initialize_callback_.release()); | 90 AutoCallbackRunner done_runner(initialize_callback_.release()); |
| 92 | 91 |
| 93 if (info.success) { | 92 if (info.success) { |
| 94 media_format_.SetAsInteger(MediaFormat::kWidth, | 93 media_format_.SetAsInteger(MediaFormat::kWidth, |
| 95 info.stream_info.surface_width); | 94 info.stream_info.surface_width); |
| 96 media_format_.SetAsInteger(MediaFormat::kHeight, | 95 media_format_.SetAsInteger(MediaFormat::kHeight, |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 369 VideoFrameReady(video_frame); | 368 VideoFrameReady(video_frame); |
| 370 } | 369 } |
| 371 } | 370 } |
| 372 | 371 |
| 373 void FFmpegVideoDecoder::SetVideoDecodeEngineForTest( | 372 void FFmpegVideoDecoder::SetVideoDecodeEngineForTest( |
| 374 VideoDecodeEngine* engine) { | 373 VideoDecodeEngine* engine) { |
| 375 decode_engine_.reset(engine); | 374 decode_engine_.reset(engine); |
| 376 } | 375 } |
| 377 | 376 |
| 378 } // namespace media | 377 } // namespace media |
| OLD | NEW |