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

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

Issue 8417016: Remove media::VideoDecodeContext as it has no implementation and is unused. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix players 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
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> 7 #include <deque>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/task.h" 12 #include "base/task.h"
13 #include "media/base/demuxer_stream.h" 13 #include "media/base/demuxer_stream.h"
14 #include "media/base/filters.h" 14 #include "media/base/filters.h"
15 #include "media/base/filter_host.h" 15 #include "media/base/filter_host.h"
16 #include "media/base/limits.h" 16 #include "media/base/limits.h"
17 #include "media/base/video_frame.h" 17 #include "media/base/video_frame.h"
18 #include "media/ffmpeg/ffmpeg_common.h" 18 #include "media/ffmpeg/ffmpeg_common.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"
21 #include "ui/gfx/rect.h" 20 #include "ui/gfx/rect.h"
22 21
23 namespace media { 22 namespace media {
24 23
25 FFmpegVideoDecoder::FFmpegVideoDecoder(MessageLoop* message_loop, 24 FFmpegVideoDecoder::FFmpegVideoDecoder(MessageLoop* message_loop)
26 VideoDecodeContext* decode_context)
27 : message_loop_(message_loop), 25 : message_loop_(message_loop),
28 state_(kUnInitialized), 26 state_(kUnInitialized),
29 decode_engine_(new FFmpegVideoDecodeEngine()), 27 decode_engine_(new FFmpegVideoDecodeEngine()) {
30 decode_context_(decode_context) {
31 } 28 }
32 29
33 FFmpegVideoDecoder::~FFmpegVideoDecoder() {} 30 FFmpegVideoDecoder::~FFmpegVideoDecoder() {}
34 31
35 void FFmpegVideoDecoder::Initialize(DemuxerStream* demuxer_stream, 32 void FFmpegVideoDecoder::Initialize(DemuxerStream* demuxer_stream,
36 const base::Closure& callback, 33 const base::Closure& callback,
37 const StatisticsCallback& stats_callback) { 34 const StatisticsCallback& stats_callback) {
38 if (MessageLoop::current() != message_loop_) { 35 if (MessageLoop::current() != message_loop_) {
39 message_loop_->PostTask( 36 message_loop_->PostTask(
40 FROM_HERE, 37 FROM_HERE,
(...skipping 23 matching lines...) Expand all
64 61
65 natural_size_ = config.natural_size(); 62 natural_size_ = config.natural_size();
66 if (natural_size_.width() > Limits::kMaxDimension || 63 if (natural_size_.width() > Limits::kMaxDimension ||
67 natural_size_.height() > Limits::kMaxDimension || 64 natural_size_.height() > Limits::kMaxDimension ||
68 natural_size_.GetArea() > Limits::kMaxCanvas) { 65 natural_size_.GetArea() > Limits::kMaxCanvas) {
69 OnInitializeComplete(false); 66 OnInitializeComplete(false);
70 return; 67 return;
71 } 68 }
72 69
73 state_ = kInitializing; 70 state_ = kInitializing;
74 decode_engine_->Initialize(message_loop_, this, NULL, config); 71 decode_engine_->Initialize(this, config);
75 } 72 }
76 73
77 void FFmpegVideoDecoder::OnInitializeComplete(bool success) { 74 void FFmpegVideoDecoder::OnInitializeComplete(bool success) {
78 DCHECK_EQ(MessageLoop::current(), message_loop_); 75 DCHECK_EQ(MessageLoop::current(), message_loop_);
79 DCHECK(!initialize_callback_.is_null()); 76 DCHECK(!initialize_callback_.is_null());
80 77
81 if (success) { 78 if (success) {
82 state_ = kNormal; 79 state_ = kNormal;
83 } else { 80 } else {
84 host()->SetError(PIPELINE_ERROR_DECODE); 81 host()->SetError(PIPELINE_ERROR_DECODE);
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 decode_engine_->ProduceVideoFrame(video_frame); 315 decode_engine_->ProduceVideoFrame(video_frame);
319 } 316 }
320 } 317 }
321 318
322 void FFmpegVideoDecoder::SetVideoDecodeEngineForTest( 319 void FFmpegVideoDecoder::SetVideoDecodeEngineForTest(
323 VideoDecodeEngine* engine) { 320 VideoDecodeEngine* engine) {
324 decode_engine_.reset(engine); 321 decode_engine_.reset(engine);
325 } 322 }
326 323
327 } // namespace media 324 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698