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

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: fixes 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/filters/ffmpeg_video_decoder_unittest.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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/task.h" 10 #include "base/task.h"
11 #include "media/base/demuxer_stream.h" 11 #include "media/base/demuxer_stream.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/video_frame.h" 14 #include "media/base/video_frame.h"
15 #include "media/ffmpeg/ffmpeg_common.h" 15 #include "media/ffmpeg/ffmpeg_common.h"
16 #include "media/video/ffmpeg_video_decode_engine.h" 16 #include "media/video/ffmpeg_video_decode_engine.h"
17 #include "media/video/video_decode_context.h"
18 17
19 namespace media { 18 namespace media {
20 19
21 FFmpegVideoDecoder::FFmpegVideoDecoder(MessageLoop* message_loop, 20 FFmpegVideoDecoder::FFmpegVideoDecoder(MessageLoop* message_loop)
22 VideoDecodeContext* decode_context)
23 : message_loop_(message_loop), 21 : message_loop_(message_loop),
24 state_(kUnInitialized), 22 state_(kUnInitialized),
25 decode_engine_(new FFmpegVideoDecodeEngine()), 23 decode_engine_(new FFmpegVideoDecodeEngine()) {
26 decode_context_(decode_context) {
27 } 24 }
28 25
29 FFmpegVideoDecoder::~FFmpegVideoDecoder() {} 26 FFmpegVideoDecoder::~FFmpegVideoDecoder() {}
30 27
31 void FFmpegVideoDecoder::Initialize(DemuxerStream* demuxer_stream, 28 void FFmpegVideoDecoder::Initialize(DemuxerStream* demuxer_stream,
32 const base::Closure& callback, 29 const base::Closure& callback,
33 const StatisticsCallback& stats_callback) { 30 const StatisticsCallback& stats_callback) {
34 if (MessageLoop::current() != message_loop_) { 31 if (MessageLoop::current() != message_loop_) {
35 message_loop_->PostTask( 32 message_loop_->PostTask(
36 FROM_HERE, 33 FROM_HERE,
(...skipping 23 matching lines...) Expand all
60 57
61 natural_size_ = config.natural_size(); 58 natural_size_ = config.natural_size();
62 if (natural_size_.width() > Limits::kMaxDimension || 59 if (natural_size_.width() > Limits::kMaxDimension ||
63 natural_size_.height() > Limits::kMaxDimension || 60 natural_size_.height() > Limits::kMaxDimension ||
64 natural_size_.GetArea() > Limits::kMaxCanvas) { 61 natural_size_.GetArea() > Limits::kMaxCanvas) {
65 OnInitializeComplete(false); 62 OnInitializeComplete(false);
66 return; 63 return;
67 } 64 }
68 65
69 state_ = kInitializing; 66 state_ = kInitializing;
70 decode_engine_->Initialize(message_loop_, this, NULL, config); 67 decode_engine_->Initialize(this, config);
71 } 68 }
72 69
73 void FFmpegVideoDecoder::OnInitializeComplete(bool success) { 70 void FFmpegVideoDecoder::OnInitializeComplete(bool success) {
74 DCHECK_EQ(MessageLoop::current(), message_loop_); 71 DCHECK_EQ(MessageLoop::current(), message_loop_);
75 DCHECK(!initialize_callback_.is_null()); 72 DCHECK(!initialize_callback_.is_null());
76 73
77 if (success) { 74 if (success) {
78 state_ = kNormal; 75 state_ = kNormal;
79 } else { 76 } else {
80 host()->SetError(PIPELINE_ERROR_DECODE); 77 host()->SetError(PIPELINE_ERROR_DECODE);
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 decode_engine_->ProduceVideoFrame(video_frame); 311 decode_engine_->ProduceVideoFrame(video_frame);
315 } 312 }
316 } 313 }
317 314
318 void FFmpegVideoDecoder::SetVideoDecodeEngineForTest( 315 void FFmpegVideoDecoder::SetVideoDecodeEngineForTest(
319 VideoDecodeEngine* engine) { 316 VideoDecodeEngine* engine) {
320 decode_engine_.reset(engine); 317 decode_engine_.reset(engine);
321 } 318 }
322 319
323 } // namespace media 320 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_video_decoder.h ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698